Roll of googleapis as of 4/7/2015.

R=kustermann@google.com, sgjesse@google.com
BUG=

Review URL: https://codereview.chromium.org//1078053002
diff --git a/generated/googleapis/CHANGELOG.md b/generated/googleapis/CHANGELOG.md
index 780e7e0..4132b87 100644
--- a/generated/googleapis/CHANGELOG.md
+++ b/generated/googleapis/CHANGELOG.md
@@ -1,3 +1,26 @@
+## 0.7.0
+
+* [apis-breaking] analytics:v3 removed dailyUploads API
+* [apis-breaking] books:v1: removed method
+* [apis-breaking] compute:v1: removed some Quota enum values, new methods and
+  schemas
+* [apis-new] androidenterprise:v1
+* [apis-new] cloudsearch:v1
+* [apis-removed] civicinfo:us_v1
+* [apis-removed] civicinfo:v1
+* [apis] admindirectory:v1: schema changes
+* [apis] bigquery:v2: schema changes
+* [apis] content:v2: method and schema changes
+* [apis] discovery:v1: schema changes
+* [apis] doubleclickbidmanager:v1 schema changes
+* [apis] dfareporting:v2.0 schema changes
+* [apis] drive:v2 method changes
+* [apis] oauth2:v2 method and schema changes
+* [apis] storage:v1 method changes
+* [apis] youtubeanalytics:v1 method changes
+* [apis] youtube:v2: method and schema changes
+
+
 ## 0.6.1
 
 * [apis] bigquery:v2: schema changes
diff --git a/generated/googleapis/README.md b/generated/googleapis/README.md
index 20e92c0..4d96ee5 100644
--- a/generated/googleapis/README.md
+++ b/generated/googleapis/README.md
@@ -122,7 +122,11 @@
 
 Official API documentation: https://developers.google.com/analytics/
 
-#### ![Logo](https://www.google.com/images/icons/product/android-16.png) Google Play Android Developer API - androidpublisher v2
+#### ![Logo](https://www.google.com/images/icons/product/android-16.png) Google Play MDM API - androidenterprise v1
+
+Allows MDMs/EMMs and enterprises to manage the deployment of apps to Android for Work users.
+
+#### ![Logo](https://www.google.com/images/icons/product/android-16.png) Google Play Developer API - androidpublisher v2
 
 Lets Android application developers access their Google Play accounts.
 
@@ -164,18 +168,6 @@
 
 Official API documentation: https://developers.google.com/google-apps/calendar/firstapp
 
-#### ![Logo](http://www.google.com/images/icons/product/search-16.gif) Google Civic Information API - civicinfo us_v1
-
-An API for accessing civic information.
-
-Official API documentation: https://developers.google.com/civic-information
-
-#### ![Logo](http://www.google.com/images/icons/product/search-16.gif) Google Civic Information API - civicinfo v1
-
-An API for accessing civic information.
-
-Official API documentation: https://developers.google.com/civic-information
-
 #### ![Logo](http://www.google.com/images/icons/product/search-16.gif) Google Civic Information API - civicinfo v2
 
 An API for accessing civic information.
@@ -342,7 +334,7 @@
 
 Lets you analyze the performance of a web page and get tailored suggestions to make that page faster.
 
-Official API documentation: https://developers.google.com/speed/docs/insights/v1/getting_started
+Official API documentation: https://developers.google.com/speed/docs/insights/v2/getting-started
 
 #### ![Logo](http://www.google.com/images/icons/product/gplus-16.png) Google+ API - plus v1
 
@@ -434,3 +426,9 @@
 
 Official API documentation: http://developers.google.com/youtube/analytics/
 
+#### ![Logo](http://www.google.com/images/icons/product/search-16.gif) Google Cloud Search API - cloudsearch v1
+
+The Google Cloud Search API defines an application interface to index documents that contain structured data and to search those indexes. It supports full text search.
+
+Official API documentation: 
+
diff --git a/generated/googleapis/lib/adexchangebuyer/v1_3.dart b/generated/googleapis/lib/adexchangebuyer/v1_3.dart
index 1a9b682..b51335e 100644
--- a/generated/googleapis/lib/adexchangebuyer/v1_3.dart
+++ b/generated/googleapis/lib/adexchangebuyer/v1_3.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.adexchangebuyer.v1_3;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client adexchangebuyer/v1.3';
 
 /**
  * Accesses your bidding-account information, submits creatives for validation,
@@ -22,7 +25,7 @@
   static const AdexchangeBuyerScope = "https://www.googleapis.com/auth/adexchange.buyer";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AccountsResourceApi get accounts => new AccountsResourceApi(_requester);
   BillingInfoResourceApi get billingInfo => new BillingInfoResourceApi(_requester);
@@ -33,15 +36,14 @@
   PretargetingConfigResourceApi get pretargetingConfig => new PretargetingConfigResourceApi(_requester);
 
   AdexchangebuyerApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "adexchangebuyer/v1.3/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class AccountsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsResourceApi(common_internal.ApiRequester client) : 
+  AccountsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -53,7 +55,7 @@
    *
    * Completes with a [Account].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -64,7 +66,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -72,7 +74,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -91,7 +93,7 @@
    *
    * Completes with a [AccountsList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -102,7 +104,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -130,7 +132,7 @@
    *
    * Completes with a [Account].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -141,7 +143,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -152,7 +154,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -175,7 +177,7 @@
    *
    * Completes with a [Account].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -186,7 +188,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -197,7 +199,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -212,11 +214,10 @@
 }
 
 
-/** Not documented yet. */
 class BillingInfoResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  BillingInfoResourceApi(common_internal.ApiRequester client) : 
+  BillingInfoResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -228,7 +229,7 @@
    *
    * Completes with a [BillingInfo].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -239,7 +240,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -247,7 +248,7 @@
     }
 
 
-    _url = 'billinginfo/' + common_internal.Escaper.ecapeVariable('$accountId');
+    _url = 'billinginfo/' + commons.Escaper.ecapeVariable('$accountId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -267,7 +268,7 @@
    *
    * Completes with a [BillingInfoList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -278,7 +279,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -298,11 +299,10 @@
 }
 
 
-/** Not documented yet. */
 class BudgetResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  BudgetResourceApi(common_internal.ApiRequester client) : 
+  BudgetResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -317,7 +317,7 @@
    *
    * Completes with a [Budget].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -328,7 +328,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -339,7 +339,7 @@
     }
 
 
-    _url = 'billinginfo/' + common_internal.Escaper.ecapeVariable('$accountId') + '/' + common_internal.Escaper.ecapeVariable('$billingId');
+    _url = 'billinginfo/' + commons.Escaper.ecapeVariable('$accountId') + '/' + commons.Escaper.ecapeVariable('$billingId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -366,7 +366,7 @@
    *
    * Completes with a [Budget].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -377,7 +377,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -391,7 +391,7 @@
     }
 
 
-    _url = 'billinginfo/' + common_internal.Escaper.ecapeVariable('$accountId') + '/' + common_internal.Escaper.ecapeVariable('$billingId');
+    _url = 'billinginfo/' + commons.Escaper.ecapeVariable('$accountId') + '/' + commons.Escaper.ecapeVariable('$billingId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -417,7 +417,7 @@
    *
    * Completes with a [Budget].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -428,7 +428,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -442,7 +442,7 @@
     }
 
 
-    _url = 'billinginfo/' + common_internal.Escaper.ecapeVariable('$accountId') + '/' + common_internal.Escaper.ecapeVariable('$billingId');
+    _url = 'billinginfo/' + commons.Escaper.ecapeVariable('$accountId') + '/' + commons.Escaper.ecapeVariable('$billingId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -457,11 +457,10 @@
 }
 
 
-/** Not documented yet. */
 class CreativesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  CreativesResourceApi(common_internal.ApiRequester client) : 
+  CreativesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -476,7 +475,7 @@
    *
    * Completes with a [Creative].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -487,7 +486,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -498,7 +497,7 @@
     }
 
 
-    _url = 'creatives/' + common_internal.Escaper.ecapeVariable('$accountId') + '/' + common_internal.Escaper.ecapeVariable('$buyerCreativeId');
+    _url = 'creatives/' + commons.Escaper.ecapeVariable('$accountId') + '/' + commons.Escaper.ecapeVariable('$buyerCreativeId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -519,7 +518,7 @@
    *
    * Completes with a [Creative].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -530,7 +529,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -579,7 +578,7 @@
    *
    * Completes with a [CreativesList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -590,7 +589,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId != null) {
@@ -625,11 +624,10 @@
 }
 
 
-/** Not documented yet. */
 class DirectDealsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  DirectDealsResourceApi(common_internal.ApiRequester client) : 
+  DirectDealsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -641,7 +639,7 @@
    *
    * Completes with a [DirectDeal].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -652,7 +650,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -660,7 +658,7 @@
     }
 
 
-    _url = 'directdeals/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'directdeals/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -679,7 +677,7 @@
    *
    * Completes with a [DirectDealsList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -690,7 +688,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -710,11 +708,10 @@
 }
 
 
-/** Not documented yet. */
 class PerformanceReportResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PerformanceReportResourceApi(common_internal.ApiRequester client) : 
+  PerformanceReportResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -740,7 +737,7 @@
    *
    * Completes with a [PerformanceReportList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -751,7 +748,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -789,11 +786,10 @@
 }
 
 
-/** Not documented yet. */
 class PretargetingConfigResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PretargetingConfigResourceApi(common_internal.ApiRequester client) : 
+  PretargetingConfigResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -805,7 +801,7 @@
    *
    * [configId] - The specific id of the configuration to delete.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -816,7 +812,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -828,7 +824,7 @@
 
     _downloadOptions = null;
 
-    _url = 'pretargetingconfigs/' + common_internal.Escaper.ecapeVariable('$accountId') + '/' + common_internal.Escaper.ecapeVariable('$configId');
+    _url = 'pretargetingconfigs/' + commons.Escaper.ecapeVariable('$accountId') + '/' + commons.Escaper.ecapeVariable('$configId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -851,7 +847,7 @@
    *
    * Completes with a [PretargetingConfig].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -862,7 +858,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -873,7 +869,7 @@
     }
 
 
-    _url = 'pretargetingconfigs/' + common_internal.Escaper.ecapeVariable('$accountId') + '/' + common_internal.Escaper.ecapeVariable('$configId');
+    _url = 'pretargetingconfigs/' + commons.Escaper.ecapeVariable('$accountId') + '/' + commons.Escaper.ecapeVariable('$configId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -896,7 +892,7 @@
    *
    * Completes with a [PretargetingConfig].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -907,7 +903,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -918,7 +914,7 @@
     }
 
 
-    _url = 'pretargetingconfigs/' + common_internal.Escaper.ecapeVariable('$accountId');
+    _url = 'pretargetingconfigs/' + commons.Escaper.ecapeVariable('$accountId');
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -939,7 +935,7 @@
    *
    * Completes with a [PretargetingConfigList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -950,7 +946,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -958,7 +954,7 @@
     }
 
 
-    _url = 'pretargetingconfigs/' + common_internal.Escaper.ecapeVariable('$accountId');
+    _url = 'pretargetingconfigs/' + commons.Escaper.ecapeVariable('$accountId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -984,7 +980,7 @@
    *
    * Completes with a [PretargetingConfig].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -995,7 +991,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1009,7 +1005,7 @@
     }
 
 
-    _url = 'pretargetingconfigs/' + common_internal.Escaper.ecapeVariable('$accountId') + '/' + common_internal.Escaper.ecapeVariable('$configId');
+    _url = 'pretargetingconfigs/' + commons.Escaper.ecapeVariable('$accountId') + '/' + commons.Escaper.ecapeVariable('$configId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1034,7 +1030,7 @@
    *
    * Completes with a [PretargetingConfig].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1045,7 +1041,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1059,7 +1055,7 @@
     }
 
 
-    _url = 'pretargetingconfigs/' + common_internal.Escaper.ecapeVariable('$accountId') + '/' + common_internal.Escaper.ecapeVariable('$configId');
+    _url = 'pretargetingconfigs/' + commons.Escaper.ecapeVariable('$accountId') + '/' + commons.Escaper.ecapeVariable('$configId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1075,7 +1071,6 @@
 
 
 
-/** Not documented yet. */
 class AccountBidderLocation {
   /** The maximum queries per second the Ad Exchange will send. */
   core.int maximumQps;
@@ -1427,7 +1422,6 @@
 }
 
 
-/** Not documented yet. */
 class CreativeCorrections {
   /** Additional details about the correction. */
   core.List<core.String> details;
@@ -1460,7 +1454,6 @@
 }
 
 
-/** Not documented yet. */
 class CreativeDisapprovalReasons {
   /** Additional details about the reason for disapproval. */
   core.List<core.String> details;
@@ -1493,7 +1486,6 @@
 }
 
 
-/** Not documented yet. */
 class CreativeFilteringReasonsReasons {
   /**
    * The number of times the creative was filtered for the status. The count is
@@ -2255,7 +2247,6 @@
 }
 
 
-/** Not documented yet. */
 class PretargetingConfigDimensions {
   /** Height in pixels. */
   core.String height;
@@ -2288,7 +2279,6 @@
 }
 
 
-/** Not documented yet. */
 class PretargetingConfigExcludedPlacements {
   /**
    * The value of the placement. Interpretation depends on the placement type,
@@ -2325,7 +2315,6 @@
 }
 
 
-/** Not documented yet. */
 class PretargetingConfigPlacements {
   /**
    * The value of the placement. Interpretation depends on the placement type,
@@ -2362,7 +2351,6 @@
 }
 
 
-/** Not documented yet. */
 class PretargetingConfig {
   /**
    * The id for billing purposes, provided for reference. Leave this field blank
@@ -2623,7 +2611,6 @@
 }
 
 
-/** Not documented yet. */
 class PretargetingConfigList {
   /** A list of pretargeting configs */
   core.List<PretargetingConfig> items;
@@ -2654,5 +2641,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/adexchangeseller/v1_1.dart b/generated/googleapis/lib/adexchangeseller/v1_1.dart
index 76ed86f..66ab5ab 100644
--- a/generated/googleapis/lib/adexchangeseller/v1_1.dart
+++ b/generated/googleapis/lib/adexchangeseller/v1_1.dart
@@ -1,17 +1,22 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.adexchangeseller.v1_1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError, Media, UploadOptions,
+    ResumableUploadOptions, DownloadOptions, PartialDownloadOptions,
+    ByteRange;
+
+const core.String USER_AGENT = 'dart-api-client adexchangeseller/v1.1';
 
 /**
  * Gives Ad Exchange seller users access to their inventory and the ability to
@@ -25,7 +30,7 @@
   static const AdexchangeSellerReadonlyScope = "https://www.googleapis.com/auth/adexchange.seller.readonly";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AccountsResourceApi get accounts => new AccountsResourceApi(_requester);
   AdclientsResourceApi get adclients => new AdclientsResourceApi(_requester);
@@ -38,15 +43,14 @@
   UrlchannelsResourceApi get urlchannels => new UrlchannelsResourceApi(_requester);
 
   AdexchangesellerApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "adexchangeseller/v1.1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class AccountsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsResourceApi(common_internal.ApiRequester client) : 
+  AccountsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -59,7 +63,7 @@
    *
    * Completes with a [Account].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -70,7 +74,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -78,7 +82,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -93,11 +97,10 @@
 }
 
 
-/** Not documented yet. */
 class AdclientsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AdclientsResourceApi(common_internal.ApiRequester client) : 
+  AdclientsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -115,7 +118,7 @@
    *
    * Completes with a [AdClients].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -126,7 +129,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (maxResults != null) {
@@ -152,13 +155,12 @@
 }
 
 
-/** Not documented yet. */
 class AdunitsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AdunitsCustomchannelsResourceApi get customchannels => new AdunitsCustomchannelsResourceApi(_requester);
 
-  AdunitsResourceApi(common_internal.ApiRequester client) : 
+  AdunitsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -172,7 +174,7 @@
    *
    * Completes with a [AdUnit].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -183,7 +185,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (adClientId == null) {
@@ -194,7 +196,7 @@
     }
 
 
-    _url = 'adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/adunits/' + common_internal.Escaper.ecapeVariable('$adUnitId');
+    _url = 'adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/adunits/' + commons.Escaper.ecapeVariable('$adUnitId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -225,7 +227,7 @@
    *
    * Completes with a [AdUnits].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -236,7 +238,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (adClientId == null) {
@@ -253,7 +255,7 @@
     }
 
 
-    _url = 'adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/adunits';
+    _url = 'adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/adunits';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -268,11 +270,10 @@
 }
 
 
-/** Not documented yet. */
 class AdunitsCustomchannelsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AdunitsCustomchannelsResourceApi(common_internal.ApiRequester client) : 
+  AdunitsCustomchannelsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -294,7 +295,7 @@
    *
    * Completes with a [CustomChannels].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -305,7 +306,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (adClientId == null) {
@@ -322,7 +323,7 @@
     }
 
 
-    _url = 'adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/adunits/' + common_internal.Escaper.ecapeVariable('$adUnitId') + '/customchannels';
+    _url = 'adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/adunits/' + commons.Escaper.ecapeVariable('$adUnitId') + '/customchannels';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -337,11 +338,10 @@
 }
 
 
-/** Not documented yet. */
 class AlertsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AlertsResourceApi(common_internal.ApiRequester client) : 
+  AlertsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -355,7 +355,7 @@
    *
    * Completes with a [Alerts].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -366,7 +366,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (locale != null) {
@@ -389,13 +389,12 @@
 }
 
 
-/** Not documented yet. */
 class CustomchannelsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   CustomchannelsAdunitsResourceApi get adunits => new CustomchannelsAdunitsResourceApi(_requester);
 
-  CustomchannelsResourceApi(common_internal.ApiRequester client) : 
+  CustomchannelsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -409,7 +408,7 @@
    *
    * Completes with a [CustomChannel].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -420,7 +419,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (adClientId == null) {
@@ -431,7 +430,7 @@
     }
 
 
-    _url = 'adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/customchannels/' + common_internal.Escaper.ecapeVariable('$customChannelId');
+    _url = 'adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/customchannels/' + commons.Escaper.ecapeVariable('$customChannelId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -461,7 +460,7 @@
    *
    * Completes with a [CustomChannels].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -472,7 +471,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (adClientId == null) {
@@ -486,7 +485,7 @@
     }
 
 
-    _url = 'adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/customchannels';
+    _url = 'adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/customchannels';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -501,11 +500,10 @@
 }
 
 
-/** Not documented yet. */
 class CustomchannelsAdunitsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  CustomchannelsAdunitsResourceApi(common_internal.ApiRequester client) : 
+  CustomchannelsAdunitsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -529,7 +527,7 @@
    *
    * Completes with a [AdUnits].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -540,7 +538,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (adClientId == null) {
@@ -560,7 +558,7 @@
     }
 
 
-    _url = 'adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/customchannels/' + common_internal.Escaper.ecapeVariable('$customChannelId') + '/adunits';
+    _url = 'adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/customchannels/' + commons.Escaper.ecapeVariable('$customChannelId') + '/adunits';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -575,23 +573,21 @@
 }
 
 
-/** Not documented yet. */
 class MetadataResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   MetadataDimensionsResourceApi get dimensions => new MetadataDimensionsResourceApi(_requester);
   MetadataMetricsResourceApi get metrics => new MetadataMetricsResourceApi(_requester);
 
-  MetadataResourceApi(common_internal.ApiRequester client) : 
+  MetadataResourceApi(commons.ApiRequester client) : 
       _requester = client;
 }
 
 
-/** Not documented yet. */
 class MetadataDimensionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  MetadataDimensionsResourceApi(common_internal.ApiRequester client) : 
+  MetadataDimensionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -601,7 +597,7 @@
    *
    * Completes with a [Metadata].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -612,7 +608,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -632,11 +628,10 @@
 }
 
 
-/** Not documented yet. */
 class MetadataMetricsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  MetadataMetricsResourceApi(common_internal.ApiRequester client) : 
+  MetadataMetricsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -646,7 +641,7 @@
    *
    * Completes with a [Metadata].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -657,7 +652,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -677,11 +672,10 @@
 }
 
 
-/** Not documented yet. */
 class PreferreddealsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PreferreddealsResourceApi(common_internal.ApiRequester client) : 
+  PreferreddealsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -693,7 +687,7 @@
    *
    * Completes with a [PreferredDeal].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -704,7 +698,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (dealId == null) {
@@ -712,7 +706,7 @@
     }
 
 
-    _url = 'preferreddeals/' + common_internal.Escaper.ecapeVariable('$dealId');
+    _url = 'preferreddeals/' + commons.Escaper.ecapeVariable('$dealId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -731,7 +725,7 @@
    *
    * Completes with a [PreferredDeals].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -742,7 +736,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -762,13 +756,12 @@
 }
 
 
-/** Not documented yet. */
 class ReportsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   ReportsSavedResourceApi get saved => new ReportsSavedResourceApi(_requester);
 
-  ReportsResourceApi(common_internal.ApiRequester client) : 
+  ReportsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -820,20 +813,20 @@
    *
    * - [Report] for Metadata downloads (see [downloadOptions]).
    *
-   * - [common.Media] for Media downloads (see [downloadOptions]).
+   * - [commons.Media] for Media downloads (see [downloadOptions]).
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future generate(core.String startDate, core.String endDate, {core.List<core.String> dimension, core.List<core.String> filter, core.String locale, core.int maxResults, core.List<core.String> metric, core.List<core.String> sort, core.int startIndex, common.DownloadOptions downloadOptions: common.DownloadOptions.Metadata}) {
+  async.Future generate(core.String startDate, core.String endDate, {core.List<core.String> dimension, core.List<core.String> filter, core.String locale, core.int maxResults, core.List<core.String> metric, core.List<core.String> sort, core.int startIndex, commons.DownloadOptions downloadOptions: commons.DownloadOptions.Metadata}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (startDate == null) {
@@ -878,7 +871,7 @@
                                        uploadMedia: _uploadMedia,
                                        downloadOptions: _downloadOptions);
     if (_downloadOptions == null ||
-        _downloadOptions == common.DownloadOptions.Metadata) {
+        _downloadOptions == commons.DownloadOptions.Metadata) {
       return _response.then((data) => new Report.fromJson(data));
     } else {
       return _response;
@@ -888,11 +881,10 @@
 }
 
 
-/** Not documented yet. */
 class ReportsSavedResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ReportsSavedResourceApi(common_internal.ApiRequester client) : 
+  ReportsSavedResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -915,7 +907,7 @@
    *
    * Completes with a [Report].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -926,7 +918,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (savedReportId == null) {
@@ -943,7 +935,7 @@
     }
 
 
-    _url = 'reports/' + common_internal.Escaper.ecapeVariable('$savedReportId');
+    _url = 'reports/' + commons.Escaper.ecapeVariable('$savedReportId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -970,7 +962,7 @@
    *
    * Completes with a [SavedReports].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -981,7 +973,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (maxResults != null) {
@@ -1007,11 +999,10 @@
 }
 
 
-/** Not documented yet. */
 class UrlchannelsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  UrlchannelsResourceApi(common_internal.ApiRequester client) : 
+  UrlchannelsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1032,7 +1023,7 @@
    *
    * Completes with a [UrlChannels].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1043,7 +1034,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (adClientId == null) {
@@ -1057,7 +1048,7 @@
     }
 
 
-    _url = 'adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/urlchannels';
+    _url = 'adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/urlchannels';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1073,7 +1064,6 @@
 
 
 
-/** Not documented yet. */
 class Account {
   /** Unique identifier of this account. */
   core.String id;
@@ -1115,7 +1105,6 @@
 }
 
 
-/** Not documented yet. */
 class AdClient {
   /** Whether this ad client is opted in to ARC. */
   core.bool arcOptIn;
@@ -1178,7 +1167,6 @@
 }
 
 
-/** Not documented yet. */
 class AdClients {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -1232,7 +1220,6 @@
 }
 
 
-/** Not documented yet. */
 class AdUnit {
   /**
    * Identity code of this ad unit, not necessarily unique across ad clients.
@@ -1307,7 +1294,6 @@
 }
 
 
-/** Not documented yet. */
 class AdUnits {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -1361,7 +1347,6 @@
 }
 
 
-/** Not documented yet. */
 class Alert {
   /**
    * Unique identifier of this alert. This should be considered an opaque
@@ -1428,7 +1413,6 @@
 }
 
 
-/** Not documented yet. */
 class Alerts {
   /** The alerts returned in this list response. */
   core.List<Alert> items;
@@ -1518,7 +1502,6 @@
 }
 
 
-/** Not documented yet. */
 class CustomChannel {
   /** Code of this custom channel, not necessarily unique across ad clients. */
   core.String code;
@@ -1582,7 +1565,6 @@
 }
 
 
-/** Not documented yet. */
 class CustomChannels {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -1636,9 +1618,7 @@
 }
 
 
-/** Not documented yet. */
 class Metadata {
-  /** Not documented yet. */
   core.List<ReportingMetadataEntry> items;
 
   /** Kind of list this is, in this case adexchangeseller#metadata. */
@@ -1669,7 +1649,6 @@
 }
 
 
-/** Not documented yet. */
 class PreferredDeal {
   /** The name of the advertiser this deal is for. */
   core.String advertiserName;
@@ -1770,7 +1749,6 @@
 }
 
 
-/** Not documented yet. */
 class PreferredDeals {
   /** The preferred deals returned in this list response. */
   core.List<PreferredDeal> items;
@@ -1803,7 +1781,6 @@
 }
 
 
-/** Not documented yet. */
 class ReportHeaders {
   /**
    * The currency of this column. Only present if the header type is
@@ -1851,7 +1828,6 @@
 }
 
 
-/** Not documented yet. */
 class Report {
   /**
    * The averages of the report. This is the same length as any other row in the
@@ -1947,7 +1923,6 @@
 }
 
 
-/** Not documented yet. */
 class ReportingMetadataEntry {
   /**
    * For metrics this is a list of dimension IDs which the metric is compatible
@@ -2051,7 +2026,6 @@
 }
 
 
-/** Not documented yet. */
 class SavedReport {
   /** Unique identifier of this saved report. */
   core.String id;
@@ -2093,7 +2067,6 @@
 }
 
 
-/** Not documented yet. */
 class SavedReports {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -2147,7 +2120,6 @@
 }
 
 
-/** Not documented yet. */
 class UrlChannel {
   /**
    * Unique identifier of this URL channel. This should be considered an opaque
@@ -2195,7 +2167,6 @@
 }
 
 
-/** Not documented yet. */
 class UrlChannels {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -2247,5 +2218,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/adexchangeseller/v2_0.dart b/generated/googleapis/lib/adexchangeseller/v2_0.dart
index e0594a1..c51fb0b 100644
--- a/generated/googleapis/lib/adexchangeseller/v2_0.dart
+++ b/generated/googleapis/lib/adexchangeseller/v2_0.dart
@@ -1,17 +1,22 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.adexchangeseller.v2_0;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError, Media, UploadOptions,
+    ResumableUploadOptions, DownloadOptions, PartialDownloadOptions,
+    ByteRange;
+
+const core.String USER_AGENT = 'dart-api-client adexchangeseller/v2.0';
 
 /**
  * Gives Ad Exchange seller users access to their inventory and the ability to
@@ -25,18 +30,17 @@
   static const AdexchangeSellerReadonlyScope = "https://www.googleapis.com/auth/adexchange.seller.readonly";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AccountsResourceApi get accounts => new AccountsResourceApi(_requester);
 
   AdexchangesellerApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "adexchangeseller/v2.0/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class AccountsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AccountsAdclientsResourceApi get adclients => new AccountsAdclientsResourceApi(_requester);
   AccountsAlertsResourceApi get alerts => new AccountsAlertsResourceApi(_requester);
@@ -46,7 +50,7 @@
   AccountsReportsResourceApi get reports => new AccountsReportsResourceApi(_requester);
   AccountsUrlchannelsResourceApi get urlchannels => new AccountsUrlchannelsResourceApi(_requester);
 
-  AccountsResourceApi(common_internal.ApiRequester client) : 
+  AccountsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -59,7 +63,7 @@
    *
    * Completes with a [Account].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -70,7 +74,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -78,7 +82,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -105,7 +109,7 @@
    *
    * Completes with a [Accounts].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -116,7 +120,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (maxResults != null) {
@@ -142,11 +146,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsAdclientsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsAdclientsResourceApi(common_internal.ApiRequester client) : 
+  AccountsAdclientsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -166,7 +169,7 @@
    *
    * Completes with a [AdClients].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -177,7 +180,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -191,7 +194,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/adclients';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/adclients';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -206,11 +209,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsAlertsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsAlertsResourceApi(common_internal.ApiRequester client) : 
+  AccountsAlertsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -226,7 +228,7 @@
    *
    * Completes with a [Alerts].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -237,7 +239,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -248,7 +250,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/alerts';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/alerts';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -263,11 +265,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsCustomchannelsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsCustomchannelsResourceApi(common_internal.ApiRequester client) : 
+  AccountsCustomchannelsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -283,7 +284,7 @@
    *
    * Completes with a [CustomChannel].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -294,7 +295,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -308,7 +309,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/customchannels/' + common_internal.Escaper.ecapeVariable('$customChannelId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/customchannels/' + commons.Escaper.ecapeVariable('$customChannelId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -340,7 +341,7 @@
    *
    * Completes with a [CustomChannels].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -351,7 +352,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -368,7 +369,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/customchannels';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/customchannels';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -383,23 +384,21 @@
 }
 
 
-/** Not documented yet. */
 class AccountsMetadataResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AccountsMetadataDimensionsResourceApi get dimensions => new AccountsMetadataDimensionsResourceApi(_requester);
   AccountsMetadataMetricsResourceApi get metrics => new AccountsMetadataMetricsResourceApi(_requester);
 
-  AccountsMetadataResourceApi(common_internal.ApiRequester client) : 
+  AccountsMetadataResourceApi(commons.ApiRequester client) : 
       _requester = client;
 }
 
 
-/** Not documented yet. */
 class AccountsMetadataDimensionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsMetadataDimensionsResourceApi(common_internal.ApiRequester client) : 
+  AccountsMetadataDimensionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -411,7 +410,7 @@
    *
    * Completes with a [Metadata].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -422,7 +421,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -430,7 +429,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/metadata/dimensions';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/metadata/dimensions';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -445,11 +444,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsMetadataMetricsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsMetadataMetricsResourceApi(common_internal.ApiRequester client) : 
+  AccountsMetadataMetricsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -461,7 +459,7 @@
    *
    * Completes with a [Metadata].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -472,7 +470,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -480,7 +478,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/metadata/metrics';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/metadata/metrics';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -495,11 +493,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsPreferreddealsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsPreferreddealsResourceApi(common_internal.ApiRequester client) : 
+  AccountsPreferreddealsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -513,7 +510,7 @@
    *
    * Completes with a [PreferredDeal].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -524,7 +521,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -535,7 +532,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/preferreddeals/' + common_internal.Escaper.ecapeVariable('$dealId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/preferreddeals/' + commons.Escaper.ecapeVariable('$dealId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -556,7 +553,7 @@
    *
    * Completes with a [PreferredDeals].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -567,7 +564,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -575,7 +572,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/preferreddeals';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/preferreddeals';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -590,13 +587,12 @@
 }
 
 
-/** Not documented yet. */
 class AccountsReportsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AccountsReportsSavedResourceApi get saved => new AccountsReportsSavedResourceApi(_requester);
 
-  AccountsReportsResourceApi(common_internal.ApiRequester client) : 
+  AccountsReportsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -650,20 +646,20 @@
    *
    * - [Report] for Metadata downloads (see [downloadOptions]).
    *
-   * - [common.Media] for Media downloads (see [downloadOptions]).
+   * - [commons.Media] for Media downloads (see [downloadOptions]).
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future generate(core.String accountId, core.String startDate, core.String endDate, {core.List<core.String> dimension, core.List<core.String> filter, core.String locale, core.int maxResults, core.List<core.String> metric, core.List<core.String> sort, core.int startIndex, common.DownloadOptions downloadOptions: common.DownloadOptions.Metadata}) {
+  async.Future generate(core.String accountId, core.String startDate, core.String endDate, {core.List<core.String> dimension, core.List<core.String> filter, core.String locale, core.int maxResults, core.List<core.String> metric, core.List<core.String> sort, core.int startIndex, commons.DownloadOptions downloadOptions: commons.DownloadOptions.Metadata}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -701,7 +697,7 @@
 
     _downloadOptions = downloadOptions;
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/reports';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/reports';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -711,7 +707,7 @@
                                        uploadMedia: _uploadMedia,
                                        downloadOptions: _downloadOptions);
     if (_downloadOptions == null ||
-        _downloadOptions == common.DownloadOptions.Metadata) {
+        _downloadOptions == commons.DownloadOptions.Metadata) {
       return _response.then((data) => new Report.fromJson(data));
     } else {
       return _response;
@@ -721,11 +717,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsReportsSavedResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsReportsSavedResourceApi(common_internal.ApiRequester client) : 
+  AccountsReportsSavedResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -750,7 +745,7 @@
    *
    * Completes with a [Report].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -761,7 +756,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -781,7 +776,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/reports/' + common_internal.Escaper.ecapeVariable('$savedReportId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/reports/' + commons.Escaper.ecapeVariable('$savedReportId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -810,7 +805,7 @@
    *
    * Completes with a [SavedReports].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -821,7 +816,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -835,7 +830,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/reports/saved';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/reports/saved';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -850,11 +845,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsUrlchannelsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsUrlchannelsResourceApi(common_internal.ApiRequester client) : 
+  AccountsUrlchannelsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -877,7 +871,7 @@
    *
    * Completes with a [UrlChannels].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -888,7 +882,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -905,7 +899,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/urlchannels';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/urlchannels';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -921,7 +915,6 @@
 
 
 
-/** Not documented yet. */
 class Account {
   /** Unique identifier of this account. */
   core.String id;
@@ -963,7 +956,6 @@
 }
 
 
-/** Not documented yet. */
 class Accounts {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -1017,7 +1009,6 @@
 }
 
 
-/** Not documented yet. */
 class AdClient {
   /** Whether this ad client is opted in to ARC. */
   core.bool arcOptIn;
@@ -1080,7 +1071,6 @@
 }
 
 
-/** Not documented yet. */
 class AdClients {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -1134,7 +1124,6 @@
 }
 
 
-/** Not documented yet. */
 class Alert {
   /**
    * Unique identifier of this alert. This should be considered an opaque
@@ -1201,7 +1190,6 @@
 }
 
 
-/** Not documented yet. */
 class Alerts {
   /** The alerts returned in this list response. */
   core.List<Alert> items;
@@ -1291,7 +1279,6 @@
 }
 
 
-/** Not documented yet. */
 class CustomChannel {
   /** Code of this custom channel, not necessarily unique across ad clients. */
   core.String code;
@@ -1355,7 +1342,6 @@
 }
 
 
-/** Not documented yet. */
 class CustomChannels {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -1409,9 +1395,7 @@
 }
 
 
-/** Not documented yet. */
 class Metadata {
-  /** Not documented yet. */
   core.List<ReportingMetadataEntry> items;
 
   /** Kind of list this is, in this case adexchangeseller#metadata. */
@@ -1442,7 +1426,6 @@
 }
 
 
-/** Not documented yet. */
 class PreferredDeal {
   /** The name of the advertiser this deal is for. */
   core.String advertiserName;
@@ -1543,7 +1526,6 @@
 }
 
 
-/** Not documented yet. */
 class PreferredDeals {
   /** The preferred deals returned in this list response. */
   core.List<PreferredDeal> items;
@@ -1576,7 +1558,6 @@
 }
 
 
-/** Not documented yet. */
 class ReportHeaders {
   /**
    * The currency of this column. Only present if the header type is
@@ -1624,7 +1605,6 @@
 }
 
 
-/** Not documented yet. */
 class Report {
   /**
    * The averages of the report. This is the same length as any other row in the
@@ -1720,7 +1700,6 @@
 }
 
 
-/** Not documented yet. */
 class ReportingMetadataEntry {
   /**
    * For metrics this is a list of dimension IDs which the metric is compatible
@@ -1824,7 +1803,6 @@
 }
 
 
-/** Not documented yet. */
 class SavedReport {
   /** Unique identifier of this saved report. */
   core.String id;
@@ -1866,7 +1844,6 @@
 }
 
 
-/** Not documented yet. */
 class SavedReports {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -1920,7 +1897,6 @@
 }
 
 
-/** Not documented yet. */
 class UrlChannel {
   /**
    * Unique identifier of this URL channel. This should be considered an opaque
@@ -1968,7 +1944,6 @@
 }
 
 
-/** Not documented yet. */
 class UrlChannels {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -2020,5 +1995,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/admin/directory_v1.dart b/generated/googleapis/lib/admin/directory_v1.dart
index 854041a..02a2b93 100644
--- a/generated/googleapis/lib/admin/directory_v1.dart
+++ b/generated/googleapis/lib/admin/directory_v1.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.admin.directory_v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client admin/directory_v1';
 
 /**
  * The Admin SDK Directory API lets you view and manage enterprise resources
@@ -77,7 +80,7 @@
   static const AdminDirectoryUserschemaReadonlyScope = "https://www.googleapis.com/auth/admin.directory.userschema.readonly";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AspsResourceApi get asps => new AspsResourceApi(_requester);
   ChannelsResourceApi get channels => new ChannelsResourceApi(_requester);
@@ -93,15 +96,14 @@
   VerificationCodesResourceApi get verificationCodes => new VerificationCodesResourceApi(_requester);
 
   AdminApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "admin/directory/v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class AspsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AspsResourceApi(common_internal.ApiRequester client) : 
+  AspsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -114,7 +116,7 @@
    *
    * [codeId] - The unique ID of the ASP to be deleted.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -125,7 +127,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userKey == null) {
@@ -137,7 +139,7 @@
 
     _downloadOptions = null;
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userKey') + '/asps/' + common_internal.Escaper.ecapeVariable('$codeId');
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userKey') + '/asps/' + commons.Escaper.ecapeVariable('$codeId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -161,7 +163,7 @@
    *
    * Completes with a [Asp].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -172,7 +174,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userKey == null) {
@@ -183,7 +185,7 @@
     }
 
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userKey') + '/asps/' + common_internal.Escaper.ecapeVariable('$codeId');
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userKey') + '/asps/' + commons.Escaper.ecapeVariable('$codeId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -205,7 +207,7 @@
    *
    * Completes with a [Asps].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -216,7 +218,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userKey == null) {
@@ -224,7 +226,7 @@
     }
 
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userKey') + '/asps';
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userKey') + '/asps';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -239,11 +241,10 @@
 }
 
 
-/** Not documented yet. */
 class ChannelsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ChannelsResourceApi(common_internal.ApiRequester client) : 
+  ChannelsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -253,7 +254,7 @@
    *
    * Request parameters:
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -264,7 +265,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -288,11 +289,10 @@
 }
 
 
-/** Not documented yet. */
 class ChromeosdevicesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ChromeosdevicesResourceApi(common_internal.ApiRequester client) : 
+  ChromeosdevicesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -312,7 +312,7 @@
    *
    * Completes with a [ChromeOsDevice].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -323,7 +323,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (customerId == null) {
@@ -337,7 +337,7 @@
     }
 
 
-    _url = 'customer/' + common_internal.Escaper.ecapeVariable('$customerId') + '/devices/chromeos/' + common_internal.Escaper.ecapeVariable('$deviceId');
+    _url = 'customer/' + commons.Escaper.ecapeVariable('$customerId') + '/devices/chromeos/' + commons.Escaper.ecapeVariable('$deviceId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -388,7 +388,7 @@
    *
    * Completes with a [ChromeOsDevices].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -399,7 +399,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (customerId == null) {
@@ -425,7 +425,7 @@
     }
 
 
-    _url = 'customer/' + common_internal.Escaper.ecapeVariable('$customerId') + '/devices/chromeos';
+    _url = 'customer/' + commons.Escaper.ecapeVariable('$customerId') + '/devices/chromeos';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -456,7 +456,7 @@
    *
    * Completes with a [ChromeOsDevice].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -467,7 +467,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -484,7 +484,7 @@
     }
 
 
-    _url = 'customer/' + common_internal.Escaper.ecapeVariable('$customerId') + '/devices/chromeos/' + common_internal.Escaper.ecapeVariable('$deviceId');
+    _url = 'customer/' + commons.Escaper.ecapeVariable('$customerId') + '/devices/chromeos/' + commons.Escaper.ecapeVariable('$deviceId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -515,7 +515,7 @@
    *
    * Completes with a [ChromeOsDevice].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -526,7 +526,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -543,7 +543,7 @@
     }
 
 
-    _url = 'customer/' + common_internal.Escaper.ecapeVariable('$customerId') + '/devices/chromeos/' + common_internal.Escaper.ecapeVariable('$deviceId');
+    _url = 'customer/' + commons.Escaper.ecapeVariable('$customerId') + '/devices/chromeos/' + commons.Escaper.ecapeVariable('$deviceId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -558,13 +558,12 @@
 }
 
 
-/** Not documented yet. */
 class GroupsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   GroupsAliasesResourceApi get aliases => new GroupsAliasesResourceApi(_requester);
 
-  GroupsResourceApi(common_internal.ApiRequester client) : 
+  GroupsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -574,7 +573,7 @@
    *
    * [groupKey] - Email or immutable Id of the group
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -585,7 +584,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (groupKey == null) {
@@ -594,7 +593,7 @@
 
     _downloadOptions = null;
 
-    _url = 'groups/' + common_internal.Escaper.ecapeVariable('$groupKey');
+    _url = 'groups/' + commons.Escaper.ecapeVariable('$groupKey');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -615,7 +614,7 @@
    *
    * Completes with a [Group].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -626,7 +625,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (groupKey == null) {
@@ -634,7 +633,7 @@
     }
 
 
-    _url = 'groups/' + common_internal.Escaper.ecapeVariable('$groupKey');
+    _url = 'groups/' + commons.Escaper.ecapeVariable('$groupKey');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -655,7 +654,7 @@
    *
    * Completes with a [Group].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -666,7 +665,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -708,7 +707,7 @@
    *
    * Completes with a [Groups].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -719,7 +718,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (customer != null) {
@@ -763,7 +762,7 @@
    *
    * Completes with a [Group].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -774,7 +773,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -785,7 +784,7 @@
     }
 
 
-    _url = 'groups/' + common_internal.Escaper.ecapeVariable('$groupKey');
+    _url = 'groups/' + commons.Escaper.ecapeVariable('$groupKey');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -809,7 +808,7 @@
    *
    * Completes with a [Group].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -820,7 +819,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -831,7 +830,7 @@
     }
 
 
-    _url = 'groups/' + common_internal.Escaper.ecapeVariable('$groupKey');
+    _url = 'groups/' + commons.Escaper.ecapeVariable('$groupKey');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -846,11 +845,10 @@
 }
 
 
-/** Not documented yet. */
 class GroupsAliasesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  GroupsAliasesResourceApi(common_internal.ApiRequester client) : 
+  GroupsAliasesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -862,7 +860,7 @@
    *
    * [alias] - The alias to be removed
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -873,7 +871,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (groupKey == null) {
@@ -885,7 +883,7 @@
 
     _downloadOptions = null;
 
-    _url = 'groups/' + common_internal.Escaper.ecapeVariable('$groupKey') + '/aliases/' + common_internal.Escaper.ecapeVariable('$alias');
+    _url = 'groups/' + commons.Escaper.ecapeVariable('$groupKey') + '/aliases/' + commons.Escaper.ecapeVariable('$alias');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -908,7 +906,7 @@
    *
    * Completes with a [Alias].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -919,7 +917,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -930,7 +928,7 @@
     }
 
 
-    _url = 'groups/' + common_internal.Escaper.ecapeVariable('$groupKey') + '/aliases';
+    _url = 'groups/' + commons.Escaper.ecapeVariable('$groupKey') + '/aliases';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -951,7 +949,7 @@
    *
    * Completes with a [Aliases].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -962,7 +960,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (groupKey == null) {
@@ -970,7 +968,7 @@
     }
 
 
-    _url = 'groups/' + common_internal.Escaper.ecapeVariable('$groupKey') + '/aliases';
+    _url = 'groups/' + commons.Escaper.ecapeVariable('$groupKey') + '/aliases';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -985,11 +983,10 @@
 }
 
 
-/** Not documented yet. */
 class MembersResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  MembersResourceApi(common_internal.ApiRequester client) : 
+  MembersResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1001,7 +998,7 @@
    *
    * [memberKey] - Email or immutable Id of the member
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1012,7 +1009,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (groupKey == null) {
@@ -1024,7 +1021,7 @@
 
     _downloadOptions = null;
 
-    _url = 'groups/' + common_internal.Escaper.ecapeVariable('$groupKey') + '/members/' + common_internal.Escaper.ecapeVariable('$memberKey');
+    _url = 'groups/' + commons.Escaper.ecapeVariable('$groupKey') + '/members/' + commons.Escaper.ecapeVariable('$memberKey');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1047,7 +1044,7 @@
    *
    * Completes with a [Member].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1058,7 +1055,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (groupKey == null) {
@@ -1069,7 +1066,7 @@
     }
 
 
-    _url = 'groups/' + common_internal.Escaper.ecapeVariable('$groupKey') + '/members/' + common_internal.Escaper.ecapeVariable('$memberKey');
+    _url = 'groups/' + commons.Escaper.ecapeVariable('$groupKey') + '/members/' + commons.Escaper.ecapeVariable('$memberKey');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1092,7 +1089,7 @@
    *
    * Completes with a [Member].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1103,7 +1100,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1114,7 +1111,7 @@
     }
 
 
-    _url = 'groups/' + common_internal.Escaper.ecapeVariable('$groupKey') + '/members';
+    _url = 'groups/' + commons.Escaper.ecapeVariable('$groupKey') + '/members';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1141,7 +1138,7 @@
    *
    * Completes with a [Members].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1152,7 +1149,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (groupKey == null) {
@@ -1169,7 +1166,7 @@
     }
 
 
-    _url = 'groups/' + common_internal.Escaper.ecapeVariable('$groupKey') + '/members';
+    _url = 'groups/' + commons.Escaper.ecapeVariable('$groupKey') + '/members';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1197,7 +1194,7 @@
    *
    * Completes with a [Member].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1208,7 +1205,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1222,7 +1219,7 @@
     }
 
 
-    _url = 'groups/' + common_internal.Escaper.ecapeVariable('$groupKey') + '/members/' + common_internal.Escaper.ecapeVariable('$memberKey');
+    _url = 'groups/' + commons.Escaper.ecapeVariable('$groupKey') + '/members/' + commons.Escaper.ecapeVariable('$memberKey');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1249,7 +1246,7 @@
    *
    * Completes with a [Member].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1260,7 +1257,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1274,7 +1271,7 @@
     }
 
 
-    _url = 'groups/' + common_internal.Escaper.ecapeVariable('$groupKey') + '/members/' + common_internal.Escaper.ecapeVariable('$memberKey');
+    _url = 'groups/' + commons.Escaper.ecapeVariable('$groupKey') + '/members/' + commons.Escaper.ecapeVariable('$memberKey');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1289,11 +1286,10 @@
 }
 
 
-/** Not documented yet. */
 class MobiledevicesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  MobiledevicesResourceApi(common_internal.ApiRequester client) : 
+  MobiledevicesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1307,7 +1303,7 @@
    *
    * [resourceId] - Immutable id of Mobile Device
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1318,7 +1314,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1333,7 +1329,7 @@
 
     _downloadOptions = null;
 
-    _url = 'customer/' + common_internal.Escaper.ecapeVariable('$customerId') + '/devices/mobile/' + common_internal.Escaper.ecapeVariable('$resourceId') + '/action';
+    _url = 'customer/' + commons.Escaper.ecapeVariable('$customerId') + '/devices/mobile/' + commons.Escaper.ecapeVariable('$resourceId') + '/action';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1354,7 +1350,7 @@
    *
    * [resourceId] - Immutable id of Mobile Device
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1365,7 +1361,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (customerId == null) {
@@ -1377,7 +1373,7 @@
 
     _downloadOptions = null;
 
-    _url = 'customer/' + common_internal.Escaper.ecapeVariable('$customerId') + '/devices/mobile/' + common_internal.Escaper.ecapeVariable('$resourceId');
+    _url = 'customer/' + commons.Escaper.ecapeVariable('$customerId') + '/devices/mobile/' + commons.Escaper.ecapeVariable('$resourceId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1406,7 +1402,7 @@
    *
    * Completes with a [MobileDevice].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1417,7 +1413,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (customerId == null) {
@@ -1431,7 +1427,7 @@
     }
 
 
-    _url = 'customer/' + common_internal.Escaper.ecapeVariable('$customerId') + '/devices/mobile/' + common_internal.Escaper.ecapeVariable('$resourceId');
+    _url = 'customer/' + commons.Escaper.ecapeVariable('$customerId') + '/devices/mobile/' + commons.Escaper.ecapeVariable('$resourceId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1482,7 +1478,7 @@
    *
    * Completes with a [MobileDevices].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1493,7 +1489,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (customerId == null) {
@@ -1519,7 +1515,7 @@
     }
 
 
-    _url = 'customer/' + common_internal.Escaper.ecapeVariable('$customerId') + '/devices/mobile';
+    _url = 'customer/' + commons.Escaper.ecapeVariable('$customerId') + '/devices/mobile';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1534,11 +1530,10 @@
 }
 
 
-/** Not documented yet. */
 class NotificationsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  NotificationsResourceApi(common_internal.ApiRequester client) : 
+  NotificationsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1551,7 +1546,7 @@
    *
    * [notificationId] - The unique ID of the notification.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1562,7 +1557,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (customer == null) {
@@ -1574,7 +1569,7 @@
 
     _downloadOptions = null;
 
-    _url = 'customer/' + common_internal.Escaper.ecapeVariable('$customer') + '/notifications/' + common_internal.Escaper.ecapeVariable('$notificationId');
+    _url = 'customer/' + commons.Escaper.ecapeVariable('$customer') + '/notifications/' + commons.Escaper.ecapeVariable('$notificationId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1598,7 +1593,7 @@
    *
    * Completes with a [Notification].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1609,7 +1604,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (customer == null) {
@@ -1620,7 +1615,7 @@
     }
 
 
-    _url = 'customer/' + common_internal.Escaper.ecapeVariable('$customer') + '/notifications/' + common_internal.Escaper.ecapeVariable('$notificationId');
+    _url = 'customer/' + commons.Escaper.ecapeVariable('$customer') + '/notifications/' + commons.Escaper.ecapeVariable('$notificationId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1649,7 +1644,7 @@
    *
    * Completes with a [Notifications].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1660,7 +1655,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (customer == null) {
@@ -1677,7 +1672,7 @@
     }
 
 
-    _url = 'customer/' + common_internal.Escaper.ecapeVariable('$customer') + '/notifications';
+    _url = 'customer/' + commons.Escaper.ecapeVariable('$customer') + '/notifications';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1702,7 +1697,7 @@
    *
    * Completes with a [Notification].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1713,7 +1708,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1727,7 +1722,7 @@
     }
 
 
-    _url = 'customer/' + common_internal.Escaper.ecapeVariable('$customer') + '/notifications/' + common_internal.Escaper.ecapeVariable('$notificationId');
+    _url = 'customer/' + commons.Escaper.ecapeVariable('$customer') + '/notifications/' + commons.Escaper.ecapeVariable('$notificationId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1752,7 +1747,7 @@
    *
    * Completes with a [Notification].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1763,7 +1758,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1777,7 +1772,7 @@
     }
 
 
-    _url = 'customer/' + common_internal.Escaper.ecapeVariable('$customer') + '/notifications/' + common_internal.Escaper.ecapeVariable('$notificationId');
+    _url = 'customer/' + commons.Escaper.ecapeVariable('$customer') + '/notifications/' + commons.Escaper.ecapeVariable('$notificationId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1792,11 +1787,10 @@
 }
 
 
-/** Not documented yet. */
 class OrgunitsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  OrgunitsResourceApi(common_internal.ApiRequester client) : 
+  OrgunitsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1806,9 +1800,9 @@
    *
    * [customerId] - Immutable id of the Google Apps account
    *
-   * [orgUnitPath] - Full path of the organization unit
+   * [orgUnitPath] - Full path of the organization unit or its Id
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1819,7 +1813,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (customerId == null) {
@@ -1831,7 +1825,7 @@
 
     _downloadOptions = null;
 
-    _url = 'customer/' + common_internal.Escaper.ecapeVariable('$customerId') + '/orgunits' + '/' + (orgUnitPath).map((item) => common_internal.Escaper.ecapePathComponent(item)).join('/');
+    _url = 'customer/' + commons.Escaper.ecapeVariable('$customerId') + '/orgunits' + '/' + (orgUnitPath).map((item) => commons.Escaper.ecapePathComponent(item)).join('/');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1850,11 +1844,11 @@
    *
    * [customerId] - Immutable id of the Google Apps account
    *
-   * [orgUnitPath] - Full path of the organization unit
+   * [orgUnitPath] - Full path of the organization unit or its Id
    *
    * Completes with a [OrgUnit].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1865,7 +1859,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (customerId == null) {
@@ -1876,7 +1870,7 @@
     }
 
 
-    _url = 'customer/' + common_internal.Escaper.ecapeVariable('$customerId') + '/orgunits' + '/' + (orgUnitPath).map((item) => common_internal.Escaper.ecapePathComponent(item)).join('/');
+    _url = 'customer/' + commons.Escaper.ecapeVariable('$customerId') + '/orgunits' + '/' + (orgUnitPath).map((item) => commons.Escaper.ecapePathComponent(item)).join('/');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1899,7 +1893,7 @@
    *
    * Completes with a [OrgUnit].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1910,7 +1904,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1921,7 +1915,7 @@
     }
 
 
-    _url = 'customer/' + common_internal.Escaper.ecapeVariable('$customerId') + '/orgunits';
+    _url = 'customer/' + commons.Escaper.ecapeVariable('$customerId') + '/orgunits';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1940,7 +1934,7 @@
    *
    * [customerId] - Immutable id of the Google Apps account
    *
-   * [orgUnitPath] - the URL-encoded organization unit
+   * [orgUnitPath] - the URL-encoded organization unit's path or its Id
    *
    * [type] - Whether to return all sub-organizations or just immediate children
    * Possible string values are:
@@ -1949,7 +1943,7 @@
    *
    * Completes with a [OrgUnits].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1960,7 +1954,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (customerId == null) {
@@ -1974,7 +1968,7 @@
     }
 
 
-    _url = 'customer/' + common_internal.Escaper.ecapeVariable('$customerId') + '/orgunits';
+    _url = 'customer/' + commons.Escaper.ecapeVariable('$customerId') + '/orgunits';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1995,11 +1989,11 @@
    *
    * [customerId] - Immutable id of the Google Apps account
    *
-   * [orgUnitPath] - Full path of the organization unit
+   * [orgUnitPath] - Full path of the organization unit or its Id
    *
    * Completes with a [OrgUnit].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2010,7 +2004,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2024,7 +2018,7 @@
     }
 
 
-    _url = 'customer/' + common_internal.Escaper.ecapeVariable('$customerId') + '/orgunits' + '/' + (orgUnitPath).map((item) => common_internal.Escaper.ecapePathComponent(item)).join('/');
+    _url = 'customer/' + commons.Escaper.ecapeVariable('$customerId') + '/orgunits' + '/' + (orgUnitPath).map((item) => commons.Escaper.ecapePathComponent(item)).join('/');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -2045,11 +2039,11 @@
    *
    * [customerId] - Immutable id of the Google Apps account
    *
-   * [orgUnitPath] - Full path of the organization unit
+   * [orgUnitPath] - Full path of the organization unit or its Id
    *
    * Completes with a [OrgUnit].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2060,7 +2054,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2074,7 +2068,7 @@
     }
 
 
-    _url = 'customer/' + common_internal.Escaper.ecapeVariable('$customerId') + '/orgunits' + '/' + (orgUnitPath).map((item) => common_internal.Escaper.ecapePathComponent(item)).join('/');
+    _url = 'customer/' + commons.Escaper.ecapeVariable('$customerId') + '/orgunits' + '/' + (orgUnitPath).map((item) => commons.Escaper.ecapePathComponent(item)).join('/');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -2089,11 +2083,10 @@
 }
 
 
-/** Not documented yet. */
 class SchemasResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  SchemasResourceApi(common_internal.ApiRequester client) : 
+  SchemasResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2105,7 +2098,7 @@
    *
    * [schemaKey] - Name or immutable Id of the schema
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2116,7 +2109,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (customerId == null) {
@@ -2128,7 +2121,7 @@
 
     _downloadOptions = null;
 
-    _url = 'customer/' + common_internal.Escaper.ecapeVariable('$customerId') + '/schemas/' + common_internal.Escaper.ecapeVariable('$schemaKey');
+    _url = 'customer/' + commons.Escaper.ecapeVariable('$customerId') + '/schemas/' + commons.Escaper.ecapeVariable('$schemaKey');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -2151,7 +2144,7 @@
    *
    * Completes with a [Schema].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2162,7 +2155,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (customerId == null) {
@@ -2173,7 +2166,7 @@
     }
 
 
-    _url = 'customer/' + common_internal.Escaper.ecapeVariable('$customerId') + '/schemas/' + common_internal.Escaper.ecapeVariable('$schemaKey');
+    _url = 'customer/' + commons.Escaper.ecapeVariable('$customerId') + '/schemas/' + commons.Escaper.ecapeVariable('$schemaKey');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2196,7 +2189,7 @@
    *
    * Completes with a [Schema].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2207,7 +2200,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2218,7 +2211,7 @@
     }
 
 
-    _url = 'customer/' + common_internal.Escaper.ecapeVariable('$customerId') + '/schemas';
+    _url = 'customer/' + commons.Escaper.ecapeVariable('$customerId') + '/schemas';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2239,7 +2232,7 @@
    *
    * Completes with a [Schemas].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2250,7 +2243,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (customerId == null) {
@@ -2258,7 +2251,7 @@
     }
 
 
-    _url = 'customer/' + common_internal.Escaper.ecapeVariable('$customerId') + '/schemas';
+    _url = 'customer/' + commons.Escaper.ecapeVariable('$customerId') + '/schemas';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2283,7 +2276,7 @@
    *
    * Completes with a [Schema].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2294,7 +2287,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2308,7 +2301,7 @@
     }
 
 
-    _url = 'customer/' + common_internal.Escaper.ecapeVariable('$customerId') + '/schemas/' + common_internal.Escaper.ecapeVariable('$schemaKey');
+    _url = 'customer/' + commons.Escaper.ecapeVariable('$customerId') + '/schemas/' + commons.Escaper.ecapeVariable('$schemaKey');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -2333,7 +2326,7 @@
    *
    * Completes with a [Schema].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2344,7 +2337,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2358,7 +2351,7 @@
     }
 
 
-    _url = 'customer/' + common_internal.Escaper.ecapeVariable('$customerId') + '/schemas/' + common_internal.Escaper.ecapeVariable('$schemaKey');
+    _url = 'customer/' + commons.Escaper.ecapeVariable('$customerId') + '/schemas/' + commons.Escaper.ecapeVariable('$schemaKey');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -2373,11 +2366,10 @@
 }
 
 
-/** Not documented yet. */
 class TokensResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  TokensResourceApi(common_internal.ApiRequester client) : 
+  TokensResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2390,7 +2382,7 @@
    *
    * [clientId] - The Client ID of the application the token is issued to.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2401,7 +2393,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userKey == null) {
@@ -2413,7 +2405,7 @@
 
     _downloadOptions = null;
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userKey') + '/tokens/' + common_internal.Escaper.ecapeVariable('$clientId');
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userKey') + '/tokens/' + commons.Escaper.ecapeVariable('$clientId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -2437,7 +2429,7 @@
    *
    * Completes with a [Token].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2448,7 +2440,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userKey == null) {
@@ -2459,7 +2451,7 @@
     }
 
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userKey') + '/tokens/' + common_internal.Escaper.ecapeVariable('$clientId');
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userKey') + '/tokens/' + commons.Escaper.ecapeVariable('$clientId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2482,7 +2474,7 @@
    *
    * Completes with a [Tokens].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2493,7 +2485,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userKey == null) {
@@ -2501,7 +2493,7 @@
     }
 
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userKey') + '/tokens';
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userKey') + '/tokens';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2516,14 +2508,13 @@
 }
 
 
-/** Not documented yet. */
 class UsersResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   UsersAliasesResourceApi get aliases => new UsersAliasesResourceApi(_requester);
   UsersPhotosResourceApi get photos => new UsersPhotosResourceApi(_requester);
 
-  UsersResourceApi(common_internal.ApiRequester client) : 
+  UsersResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2533,7 +2524,7 @@
    *
    * [userKey] - Email or immutable Id of the user
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2544,7 +2535,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userKey == null) {
@@ -2553,7 +2544,7 @@
 
     _downloadOptions = null;
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userKey');
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userKey');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -2590,7 +2581,7 @@
    *
    * Completes with a [User].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2601,7 +2592,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userKey == null) {
@@ -2618,7 +2609,7 @@
     }
 
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userKey');
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userKey');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2639,7 +2630,7 @@
    *
    * Completes with a [User].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2650,7 +2641,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2732,7 +2723,7 @@
    *
    * Completes with a [Users].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2743,7 +2734,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (customFieldMask != null) {
@@ -2805,7 +2796,7 @@
    *
    * [userKey] - Email or immutable Id of the user as admin
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2816,7 +2807,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2828,7 +2819,7 @@
 
     _downloadOptions = null;
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userKey') + '/makeAdmin';
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userKey') + '/makeAdmin';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2852,7 +2843,7 @@
    *
    * Completes with a [User].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2863,7 +2854,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2874,7 +2865,7 @@
     }
 
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userKey');
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userKey');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -2895,7 +2886,7 @@
    *
    * [userKey] - The immutable id of the user
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2906,7 +2897,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2918,7 +2909,7 @@
 
     _downloadOptions = null;
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userKey') + '/undelete';
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userKey') + '/undelete';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2942,7 +2933,7 @@
    *
    * Completes with a [User].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2953,7 +2944,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2964,7 +2955,7 @@
     }
 
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userKey');
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userKey');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -3040,7 +3031,7 @@
    *
    * Completes with a [Channel].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3051,7 +3042,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3110,11 +3101,10 @@
 }
 
 
-/** Not documented yet. */
 class UsersAliasesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  UsersAliasesResourceApi(common_internal.ApiRequester client) : 
+  UsersAliasesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3126,7 +3116,7 @@
    *
    * [alias] - The alias to be removed
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3137,7 +3127,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userKey == null) {
@@ -3149,7 +3139,7 @@
 
     _downloadOptions = null;
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userKey') + '/aliases/' + common_internal.Escaper.ecapeVariable('$alias');
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userKey') + '/aliases/' + commons.Escaper.ecapeVariable('$alias');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -3172,7 +3162,7 @@
    *
    * Completes with a [Alias].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3183,7 +3173,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3194,7 +3184,7 @@
     }
 
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userKey') + '/aliases';
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userKey') + '/aliases';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -3220,7 +3210,7 @@
    *
    * Completes with a [Aliases].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3231,7 +3221,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userKey == null) {
@@ -3242,7 +3232,7 @@
     }
 
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userKey') + '/aliases';
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userKey') + '/aliases';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3270,7 +3260,7 @@
    *
    * Completes with a [Channel].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3281,7 +3271,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3295,7 +3285,7 @@
     }
 
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userKey') + '/aliases/watch';
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userKey') + '/aliases/watch';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -3310,11 +3300,10 @@
 }
 
 
-/** Not documented yet. */
 class UsersPhotosResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  UsersPhotosResourceApi(common_internal.ApiRequester client) : 
+  UsersPhotosResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3324,7 +3313,7 @@
    *
    * [userKey] - Email or immutable Id of the user
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3335,7 +3324,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userKey == null) {
@@ -3344,7 +3333,7 @@
 
     _downloadOptions = null;
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userKey') + '/photos/thumbnail';
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userKey') + '/photos/thumbnail';
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -3365,7 +3354,7 @@
    *
    * Completes with a [UserPhoto].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3376,7 +3365,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userKey == null) {
@@ -3384,7 +3373,7 @@
     }
 
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userKey') + '/photos/thumbnail';
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userKey') + '/photos/thumbnail';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3407,7 +3396,7 @@
    *
    * Completes with a [UserPhoto].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3418,7 +3407,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3429,7 +3418,7 @@
     }
 
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userKey') + '/photos/thumbnail';
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userKey') + '/photos/thumbnail';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -3452,7 +3441,7 @@
    *
    * Completes with a [UserPhoto].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3463,7 +3452,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3474,7 +3463,7 @@
     }
 
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userKey') + '/photos/thumbnail';
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userKey') + '/photos/thumbnail';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -3489,11 +3478,10 @@
 }
 
 
-/** Not documented yet. */
 class VerificationCodesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  VerificationCodesResourceApi(common_internal.ApiRequester client) : 
+  VerificationCodesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3503,7 +3491,7 @@
    *
    * [userKey] - Email or immutable Id of the user
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3514,7 +3502,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userKey == null) {
@@ -3523,7 +3511,7 @@
 
     _downloadOptions = null;
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userKey') + '/verificationCodes/generate';
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userKey') + '/verificationCodes/generate';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -3542,7 +3530,7 @@
    *
    * [userKey] - Email or immutable Id of the user
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3553,7 +3541,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userKey == null) {
@@ -3562,7 +3550,7 @@
 
     _downloadOptions = null;
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userKey') + '/verificationCodes/invalidate';
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userKey') + '/verificationCodes/invalidate';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -3585,7 +3573,7 @@
    *
    * Completes with a [VerificationCodes].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3596,7 +3584,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userKey == null) {
@@ -3604,7 +3592,7 @@
     }
 
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userKey') + '/verificationCodes';
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userKey') + '/verificationCodes';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3803,7 +3791,6 @@
 }
 
 
-/** Not documented yet. */
 class Asps {
   /** ETag of the resource. */
   core.String etag;
@@ -3962,7 +3949,6 @@
 }
 
 
-/** Not documented yet. */
 class ChromeOsDeviceActiveTimeRanges {
   /** Duration in milliseconds */
   core.int activeTime;
@@ -3995,7 +3981,6 @@
 }
 
 
-/** Not documented yet. */
 class ChromeOsDeviceRecentUsers {
   /** Email address of the user. Present only if the user type is managed */
   core.String email;
@@ -4600,7 +4585,6 @@
 }
 
 
-/** Not documented yet. */
 class MobileDeviceApplications {
   /** Display name of application */
   core.String displayName;
@@ -5015,7 +4999,6 @@
   /** The type of the resource. */
   core.String kind;
 
-  /** Not documented yet. */
   core.String notificationId;
 
   /** Time at which notification was sent (Read-only) */
@@ -5162,9 +5145,15 @@
   /** Name of OrgUnit */
   core.String name;
 
+  /** Id of OrgUnit */
+  core.String orgUnitId;
+
   /** Path of OrgUnit */
   core.String orgUnitPath;
 
+  /** Id of parent OrgUnit */
+  core.String parentOrgUnitId;
+
   /** Path of parent OrgUnit */
   core.String parentOrgUnitPath;
 
@@ -5187,9 +5176,15 @@
     if (_json.containsKey("name")) {
       name = _json["name"];
     }
+    if (_json.containsKey("orgUnitId")) {
+      orgUnitId = _json["orgUnitId"];
+    }
     if (_json.containsKey("orgUnitPath")) {
       orgUnitPath = _json["orgUnitPath"];
     }
+    if (_json.containsKey("parentOrgUnitId")) {
+      parentOrgUnitId = _json["parentOrgUnitId"];
+    }
     if (_json.containsKey("parentOrgUnitPath")) {
       parentOrgUnitPath = _json["parentOrgUnitPath"];
     }
@@ -5212,9 +5207,15 @@
     if (name != null) {
       _json["name"] = name;
     }
+    if (orgUnitId != null) {
+      _json["orgUnitId"] = orgUnitId;
+    }
     if (orgUnitPath != null) {
       _json["orgUnitPath"] = orgUnitPath;
     }
+    if (parentOrgUnitId != null) {
+      _json["parentOrgUnitId"] = parentOrgUnitId;
+    }
     if (parentOrgUnitPath != null) {
       _json["parentOrgUnitPath"] = parentOrgUnitPath;
     }
@@ -5658,7 +5659,7 @@
 /** JSON template for User object in Directory API. */
 class User {
   /**
-   * Not documented yet.
+   *
    *
    * The values for Object must be JSON objects. It can consist of `num`,
    * `String`, `bool` and `null` as well as `Map` and `List` values.
@@ -5683,11 +5684,10 @@
   /** CustomerId of User (Read-only) */
   core.String customerId;
 
-  /** Not documented yet. */
   core.DateTime deletionTime;
 
   /**
-   * Not documented yet.
+   *
    *
    * The values for Object must be JSON objects. It can consist of `num`,
    * `String`, `bool` and `null` as well as `Map` and `List` values.
@@ -5698,7 +5698,7 @@
   core.String etag;
 
   /**
-   * Not documented yet.
+   *
    *
    * The values for Object must be JSON objects. It can consist of `num`,
    * `String`, `bool` and `null` as well as `Map` and `List` values.
@@ -5712,7 +5712,7 @@
   core.String id;
 
   /**
-   * Not documented yet.
+   *
    *
    * The values for Object must be JSON objects. It can consist of `num`,
    * `String`, `bool` and `null` as well as `Map` and `List` values.
@@ -5747,7 +5747,7 @@
   core.List<core.String> nonEditableAliases;
 
   /**
-   * Not documented yet.
+   *
    *
    * The values for Object must be JSON objects. It can consist of `num`,
    * `String`, `bool` and `null` as well as `Map` and `List` values.
@@ -5758,7 +5758,7 @@
   core.String orgUnitPath;
 
   /**
-   * Not documented yet.
+   *
    *
    * The values for Object must be JSON objects. It can consist of `num`,
    * `String`, `bool` and `null` as well as `Map` and `List` values.
@@ -5769,7 +5769,7 @@
   core.String password;
 
   /**
-   * Not documented yet.
+   *
    *
    * The values for Object must be JSON objects. It can consist of `num`,
    * `String`, `bool` and `null` as well as `Map` and `List` values.
@@ -5780,7 +5780,7 @@
   core.String primaryEmail;
 
   /**
-   * Not documented yet.
+   *
    *
    * The values for Object must be JSON objects. It can consist of `num`,
    * `String`, `bool` and `null` as well as `Map` and `List` values.
@@ -5797,7 +5797,7 @@
   core.String thumbnailPhotoUrl;
 
   /**
-   * Not documented yet.
+   *
    *
    * The values for Object must be JSON objects. It can consist of `num`,
    * `String`, `bool` and `null` as well as `Map` and `List` values.
@@ -5824,7 +5824,7 @@
       creationTime = core.DateTime.parse(_json["creationTime"]);
     }
     if (_json.containsKey("customSchemas")) {
-      customSchemas = common_internal.mapMap(_json["customSchemas"], (item) => new UserCustomProperties.fromJson(item));
+      customSchemas = commons.mapMap(_json["customSchemas"], (item) => new UserCustomProperties.fromJson(item));
     }
     if (_json.containsKey("customerId")) {
       customerId = _json["customerId"];
@@ -7057,5 +7057,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/admin/email_migration_v2.dart b/generated/googleapis/lib/admin/email_migration_v2.dart
index 63e9d6c..8b86b56 100644
--- a/generated/googleapis/lib/admin/email_migration_v2.dart
+++ b/generated/googleapis/lib/admin/email_migration_v2.dart
@@ -1,17 +1,22 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.admin.email_migration_v2;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError, Media, UploadOptions,
+    ResumableUploadOptions, DownloadOptions, PartialDownloadOptions,
+    ByteRange;
+
+const core.String USER_AGENT = 'dart-api-client admin/email_migration_v2';
 
 /** Email Migration API lets you migrate emails of users to Google backends. */
 class AdminApi {
@@ -19,20 +24,19 @@
   static const EmailMigrationScope = "https://www.googleapis.com/auth/email.migration";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   MailResourceApi get mail => new MailResourceApi(_requester);
 
   AdminApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "email/v2/users/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class MailResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  MailResourceApi(common_internal.ApiRequester client) : 
+  MailResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -49,18 +53,18 @@
    * [uploadOptions] - Options for the media upload. Streaming Media without the
    * length being known ahead of time is only supported via resumable uploads.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future insert(MailItem request, core.String userKey, {common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future insert(MailItem request, core.String userKey, {commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -75,11 +79,11 @@
     _downloadOptions = null;
 
     if (_uploadMedia == null) {
-      _url = common_internal.Escaper.ecapeVariable('$userKey') + '/mail';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/email/v2/users/' + common_internal.Escaper.ecapeVariable('$userKey') + '/mail';
+      _url = commons.Escaper.ecapeVariable('$userKey') + '/mail';
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/email/v2/users/' + commons.Escaper.ecapeVariable('$userKey') + '/mail';
     } else {
-      _url = '/upload/email/v2/users/' + common_internal.Escaper.ecapeVariable('$userKey') + '/mail';
+      _url = '/upload/email/v2/users/' + commons.Escaper.ecapeVariable('$userKey') + '/mail';
     }
 
 
@@ -191,5 +195,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/admin/reports_v1.dart b/generated/googleapis/lib/admin/reports_v1.dart
index 423aa28..1f891a0 100644
--- a/generated/googleapis/lib/admin/reports_v1.dart
+++ b/generated/googleapis/lib/admin/reports_v1.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.admin.reports_v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client admin/reports_v1';
 
 /**
  * Allows the administrators of Google Apps customers to fetch reports about the
@@ -25,7 +28,7 @@
   static const AdminReportsUsageReadonlyScope = "https://www.googleapis.com/auth/admin.reports.usage.readonly";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   ActivitiesResourceApi get activities => new ActivitiesResourceApi(_requester);
   ChannelsResourceApi get channels => new ChannelsResourceApi(_requester);
@@ -33,15 +36,14 @@
   UserUsageReportResourceApi get userUsageReport => new UserUsageReportResourceApi(_requester);
 
   AdminApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "admin/reports/v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class ActivitiesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ActivitiesResourceApi(common_internal.ApiRequester client) : 
+  ActivitiesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -86,7 +88,7 @@
    *
    * Completes with a [Activities].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -97,7 +99,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userKey == null) {
@@ -132,7 +134,7 @@
     }
 
 
-    _url = 'activity/users/' + common_internal.Escaper.ecapeVariable('$userKey') + '/applications/' + common_internal.Escaper.ecapeVariable('$applicationName');
+    _url = 'activity/users/' + commons.Escaper.ecapeVariable('$userKey') + '/applications/' + commons.Escaper.ecapeVariable('$applicationName');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -188,7 +190,7 @@
    *
    * Completes with a [Channel].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -199,7 +201,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -237,7 +239,7 @@
     }
 
 
-    _url = 'activity/users/' + common_internal.Escaper.ecapeVariable('$userKey') + '/applications/' + common_internal.Escaper.ecapeVariable('$applicationName') + '/watch';
+    _url = 'activity/users/' + commons.Escaper.ecapeVariable('$userKey') + '/applications/' + commons.Escaper.ecapeVariable('$applicationName') + '/watch';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -252,11 +254,10 @@
 }
 
 
-/** Not documented yet. */
 class ChannelsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ChannelsResourceApi(common_internal.ApiRequester client) : 
+  ChannelsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -266,7 +267,7 @@
    *
    * Request parameters:
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -277,7 +278,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -301,11 +302,10 @@
 }
 
 
-/** Not documented yet. */
 class CustomerUsageReportsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  CustomerUsageReportsResourceApi(common_internal.ApiRequester client) : 
+  CustomerUsageReportsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -330,7 +330,7 @@
    *
    * Completes with a [UsageReports].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -341,7 +341,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (date == null) {
@@ -358,7 +358,7 @@
     }
 
 
-    _url = 'usage/dates/' + common_internal.Escaper.ecapeVariable('$date');
+    _url = 'usage/dates/' + commons.Escaper.ecapeVariable('$date');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -373,11 +373,10 @@
 }
 
 
-/** Not documented yet. */
 class UserUsageReportResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  UserUsageReportResourceApi(common_internal.ApiRequester client) : 
+  UserUsageReportResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -412,7 +411,7 @@
    *
    * Completes with a [UsageReports].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -423,7 +422,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userKey == null) {
@@ -449,7 +448,7 @@
     }
 
 
-    _url = 'usage/users/' + common_internal.Escaper.ecapeVariable('$userKey') + '/dates/' + common_internal.Escaper.ecapeVariable('$date');
+    _url = 'usage/users/' + commons.Escaper.ecapeVariable('$userKey') + '/dates/' + commons.Escaper.ecapeVariable('$date');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -567,7 +566,6 @@
 }
 
 
-/** Not documented yet. */
 class ActivityEventsParameters {
   /** Boolean value of the parameter. */
   core.bool boolValue;
@@ -636,7 +634,6 @@
 }
 
 
-/** Not documented yet. */
 class ActivityEvents {
   /** Name of event. */
   core.String name;
@@ -975,7 +972,6 @@
 }
 
 
-/** Not documented yet. */
 class UsageReportParameters {
   /** Boolean value of the parameter. */
   core.bool boolValue;
@@ -1109,7 +1105,6 @@
 }
 
 
-/** Not documented yet. */
 class UsageReportsWarningsData {
   /**
    * Key associated with a key-value pair to give detailed information on the
@@ -1148,7 +1143,6 @@
 }
 
 
-/** Not documented yet. */
 class UsageReportsWarnings {
   /** Machine readable code / warning type. */
   core.String code;
@@ -1248,5 +1242,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/adsense/v1_4.dart b/generated/googleapis/lib/adsense/v1_4.dart
index b12e286..23cece5 100644
--- a/generated/googleapis/lib/adsense/v1_4.dart
+++ b/generated/googleapis/lib/adsense/v1_4.dart
@@ -1,17 +1,22 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.adsense.v1_4;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError, Media, UploadOptions,
+    ResumableUploadOptions, DownloadOptions, PartialDownloadOptions,
+    ByteRange;
+
+const core.String USER_AGENT = 'dart-api-client adsense/v1.4';
 
 /**
  * Gives AdSense publishers access to their inventory and the ability to
@@ -25,7 +30,7 @@
   static const AdsenseReadonlyScope = "https://www.googleapis.com/auth/adsense.readonly";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AccountsResourceApi get accounts => new AccountsResourceApi(_requester);
   AdclientsResourceApi get adclients => new AdclientsResourceApi(_requester);
@@ -39,13 +44,12 @@
   UrlchannelsResourceApi get urlchannels => new UrlchannelsResourceApi(_requester);
 
   AdsenseApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "adsense/v1.4/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class AccountsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AccountsAdclientsResourceApi get adclients => new AccountsAdclientsResourceApi(_requester);
   AccountsAdunitsResourceApi get adunits => new AccountsAdunitsResourceApi(_requester);
@@ -56,7 +60,7 @@
   AccountsSavedadstylesResourceApi get savedadstyles => new AccountsSavedadstylesResourceApi(_requester);
   AccountsUrlchannelsResourceApi get urlchannels => new AccountsUrlchannelsResourceApi(_requester);
 
-  AccountsResourceApi(common_internal.ApiRequester client) : 
+  AccountsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -70,7 +74,7 @@
    *
    * Completes with a [Account].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -81,7 +85,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -92,7 +96,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -119,7 +123,7 @@
    *
    * Completes with a [Accounts].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -130,7 +134,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (maxResults != null) {
@@ -156,11 +160,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsAdclientsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsAdclientsResourceApi(common_internal.ApiRequester client) : 
+  AccountsAdclientsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -180,7 +183,7 @@
    *
    * Completes with a [AdClients].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -191,7 +194,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -205,7 +208,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/adclients';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/adclients';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -220,13 +223,12 @@
 }
 
 
-/** Not documented yet. */
 class AccountsAdunitsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AccountsAdunitsCustomchannelsResourceApi get customchannels => new AccountsAdunitsCustomchannelsResourceApi(_requester);
 
-  AccountsAdunitsResourceApi(common_internal.ApiRequester client) : 
+  AccountsAdunitsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -243,7 +245,7 @@
    *
    * Completes with a [AdUnit].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -254,7 +256,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -268,7 +270,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/adunits/' + common_internal.Escaper.ecapeVariable('$adUnitId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/adunits/' + commons.Escaper.ecapeVariable('$adUnitId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -293,7 +295,7 @@
    *
    * Completes with a [AdCode].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -304,7 +306,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -318,7 +320,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/adunits/' + common_internal.Escaper.ecapeVariable('$adUnitId') + '/adcode';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/adunits/' + commons.Escaper.ecapeVariable('$adUnitId') + '/adcode';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -351,7 +353,7 @@
    *
    * Completes with a [AdUnits].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -362,7 +364,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -382,7 +384,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/adunits';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/adunits';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -397,11 +399,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsAdunitsCustomchannelsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsAdunitsCustomchannelsResourceApi(common_internal.ApiRequester client) : 
+  AccountsAdunitsCustomchannelsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -425,7 +426,7 @@
    *
    * Completes with a [CustomChannels].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -436,7 +437,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -456,7 +457,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/adunits/' + common_internal.Escaper.ecapeVariable('$adUnitId') + '/customchannels';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/adunits/' + commons.Escaper.ecapeVariable('$adUnitId') + '/customchannels';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -471,11 +472,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsAlertsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsAlertsResourceApi(common_internal.ApiRequester client) : 
+  AccountsAlertsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -488,7 +488,7 @@
    *
    * [alertId] - Alert to delete.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -499,7 +499,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -511,7 +511,7 @@
 
     _downloadOptions = null;
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/alerts/' + common_internal.Escaper.ecapeVariable('$alertId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/alerts/' + commons.Escaper.ecapeVariable('$alertId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -536,7 +536,7 @@
    *
    * Completes with a [Alerts].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -547,7 +547,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -558,7 +558,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/alerts';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/alerts';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -573,13 +573,12 @@
 }
 
 
-/** Not documented yet. */
 class AccountsCustomchannelsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AccountsCustomchannelsAdunitsResourceApi get adunits => new AccountsCustomchannelsAdunitsResourceApi(_requester);
 
-  AccountsCustomchannelsResourceApi(common_internal.ApiRequester client) : 
+  AccountsCustomchannelsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -596,7 +595,7 @@
    *
    * Completes with a [CustomChannel].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -607,7 +606,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -621,7 +620,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/customchannels/' + common_internal.Escaper.ecapeVariable('$customChannelId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/customchannels/' + commons.Escaper.ecapeVariable('$customChannelId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -653,7 +652,7 @@
    *
    * Completes with a [CustomChannels].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -664,7 +663,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -681,7 +680,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/customchannels';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/customchannels';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -696,11 +695,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsCustomchannelsAdunitsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsCustomchannelsAdunitsResourceApi(common_internal.ApiRequester client) : 
+  AccountsCustomchannelsAdunitsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -726,7 +724,7 @@
    *
    * Completes with a [AdUnits].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -737,7 +735,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -760,7 +758,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/customchannels/' + common_internal.Escaper.ecapeVariable('$customChannelId') + '/adunits';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/customchannels/' + commons.Escaper.ecapeVariable('$customChannelId') + '/adunits';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -775,11 +773,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsPaymentsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsPaymentsResourceApi(common_internal.ApiRequester client) : 
+  AccountsPaymentsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -791,7 +788,7 @@
    *
    * Completes with a [Payments].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -802,7 +799,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -810,7 +807,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/payments';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/payments';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -825,13 +822,12 @@
 }
 
 
-/** Not documented yet. */
 class AccountsReportsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AccountsReportsSavedResourceApi get saved => new AccountsReportsSavedResourceApi(_requester);
 
-  AccountsReportsResourceApi(common_internal.ApiRequester client) : 
+  AccountsReportsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -894,20 +890,20 @@
    * - [AdsenseReportsGenerateResponse] for Metadata downloads (see
    * [downloadOptions]).
    *
-   * - [common.Media] for Media downloads (see [downloadOptions]).
+   * - [commons.Media] for Media downloads (see [downloadOptions]).
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future generate(core.String accountId, core.String startDate, core.String endDate, {core.String currency, core.List<core.String> dimension, core.List<core.String> filter, core.String locale, core.int maxResults, core.List<core.String> metric, core.List<core.String> sort, core.int startIndex, core.bool useTimezoneReporting, common.DownloadOptions downloadOptions: common.DownloadOptions.Metadata}) {
+  async.Future generate(core.String accountId, core.String startDate, core.String endDate, {core.String currency, core.List<core.String> dimension, core.List<core.String> filter, core.String locale, core.int maxResults, core.List<core.String> metric, core.List<core.String> sort, core.int startIndex, core.bool useTimezoneReporting, commons.DownloadOptions downloadOptions: commons.DownloadOptions.Metadata}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -951,7 +947,7 @@
 
     _downloadOptions = downloadOptions;
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/reports';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/reports';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -961,7 +957,7 @@
                                        uploadMedia: _uploadMedia,
                                        downloadOptions: _downloadOptions);
     if (_downloadOptions == null ||
-        _downloadOptions == common.DownloadOptions.Metadata) {
+        _downloadOptions == commons.DownloadOptions.Metadata) {
       return _response.then((data) => new AdsenseReportsGenerateResponse.fromJson(data));
     } else {
       return _response;
@@ -971,11 +967,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsReportsSavedResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsReportsSavedResourceApi(common_internal.ApiRequester client) : 
+  AccountsReportsSavedResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1000,7 +995,7 @@
    *
    * Completes with a [AdsenseReportsGenerateResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1011,7 +1006,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -1031,7 +1026,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/reports/' + common_internal.Escaper.ecapeVariable('$savedReportId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/reports/' + commons.Escaper.ecapeVariable('$savedReportId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1060,7 +1055,7 @@
    *
    * Completes with a [SavedReports].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1071,7 +1066,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -1085,7 +1080,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/reports/saved';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/reports/saved';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1100,11 +1095,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsSavedadstylesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsSavedadstylesResourceApi(common_internal.ApiRequester client) : 
+  AccountsSavedadstylesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1118,7 +1112,7 @@
    *
    * Completes with a [SavedAdStyle].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1129,7 +1123,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -1140,7 +1134,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/savedadstyles/' + common_internal.Escaper.ecapeVariable('$savedAdStyleId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/savedadstyles/' + commons.Escaper.ecapeVariable('$savedAdStyleId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1169,7 +1163,7 @@
    *
    * Completes with a [SavedAdStyles].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1180,7 +1174,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -1194,7 +1188,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/savedadstyles';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/savedadstyles';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1209,11 +1203,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsUrlchannelsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsUrlchannelsResourceApi(common_internal.ApiRequester client) : 
+  AccountsUrlchannelsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1235,7 +1228,7 @@
    *
    * Completes with a [UrlChannels].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1246,7 +1239,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -1263,7 +1256,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/urlchannels';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/urlchannels';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1278,11 +1271,10 @@
 }
 
 
-/** Not documented yet. */
 class AdclientsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AdclientsResourceApi(common_internal.ApiRequester client) : 
+  AdclientsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1300,7 +1292,7 @@
    *
    * Completes with a [AdClients].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1311,7 +1303,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (maxResults != null) {
@@ -1337,13 +1329,12 @@
 }
 
 
-/** Not documented yet. */
 class AdunitsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AdunitsCustomchannelsResourceApi get customchannels => new AdunitsCustomchannelsResourceApi(_requester);
 
-  AdunitsResourceApi(common_internal.ApiRequester client) : 
+  AdunitsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1357,7 +1348,7 @@
    *
    * Completes with a [AdUnit].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1368,7 +1359,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (adClientId == null) {
@@ -1379,7 +1370,7 @@
     }
 
 
-    _url = 'adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/adunits/' + common_internal.Escaper.ecapeVariable('$adUnitId');
+    _url = 'adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/adunits/' + commons.Escaper.ecapeVariable('$adUnitId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1402,7 +1393,7 @@
    *
    * Completes with a [AdCode].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1413,7 +1404,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (adClientId == null) {
@@ -1424,7 +1415,7 @@
     }
 
 
-    _url = 'adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/adunits/' + common_internal.Escaper.ecapeVariable('$adUnitId') + '/adcode';
+    _url = 'adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/adunits/' + commons.Escaper.ecapeVariable('$adUnitId') + '/adcode';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1455,7 +1446,7 @@
    *
    * Completes with a [AdUnits].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1466,7 +1457,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (adClientId == null) {
@@ -1483,7 +1474,7 @@
     }
 
 
-    _url = 'adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/adunits';
+    _url = 'adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/adunits';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1498,11 +1489,10 @@
 }
 
 
-/** Not documented yet. */
 class AdunitsCustomchannelsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AdunitsCustomchannelsResourceApi(common_internal.ApiRequester client) : 
+  AdunitsCustomchannelsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1524,7 +1514,7 @@
    *
    * Completes with a [CustomChannels].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1535,7 +1525,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (adClientId == null) {
@@ -1552,7 +1542,7 @@
     }
 
 
-    _url = 'adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/adunits/' + common_internal.Escaper.ecapeVariable('$adUnitId') + '/customchannels';
+    _url = 'adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/adunits/' + commons.Escaper.ecapeVariable('$adUnitId') + '/customchannels';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1567,11 +1557,10 @@
 }
 
 
-/** Not documented yet. */
 class AlertsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AlertsResourceApi(common_internal.ApiRequester client) : 
+  AlertsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1581,7 +1570,7 @@
    *
    * [alertId] - Alert to delete.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1592,7 +1581,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (alertId == null) {
@@ -1601,7 +1590,7 @@
 
     _downloadOptions = null;
 
-    _url = 'alerts/' + common_internal.Escaper.ecapeVariable('$alertId');
+    _url = 'alerts/' + commons.Escaper.ecapeVariable('$alertId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1624,7 +1613,7 @@
    *
    * Completes with a [Alerts].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1635,7 +1624,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (locale != null) {
@@ -1658,13 +1647,12 @@
 }
 
 
-/** Not documented yet. */
 class CustomchannelsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   CustomchannelsAdunitsResourceApi get adunits => new CustomchannelsAdunitsResourceApi(_requester);
 
-  CustomchannelsResourceApi(common_internal.ApiRequester client) : 
+  CustomchannelsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1678,7 +1666,7 @@
    *
    * Completes with a [CustomChannel].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1689,7 +1677,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (adClientId == null) {
@@ -1700,7 +1688,7 @@
     }
 
 
-    _url = 'adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/customchannels/' + common_internal.Escaper.ecapeVariable('$customChannelId');
+    _url = 'adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/customchannels/' + commons.Escaper.ecapeVariable('$customChannelId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1730,7 +1718,7 @@
    *
    * Completes with a [CustomChannels].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1741,7 +1729,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (adClientId == null) {
@@ -1755,7 +1743,7 @@
     }
 
 
-    _url = 'adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/customchannels';
+    _url = 'adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/customchannels';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1770,11 +1758,10 @@
 }
 
 
-/** Not documented yet. */
 class CustomchannelsAdunitsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  CustomchannelsAdunitsResourceApi(common_internal.ApiRequester client) : 
+  CustomchannelsAdunitsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1798,7 +1785,7 @@
    *
    * Completes with a [AdUnits].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1809,7 +1796,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (adClientId == null) {
@@ -1829,7 +1816,7 @@
     }
 
 
-    _url = 'adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/customchannels/' + common_internal.Escaper.ecapeVariable('$customChannelId') + '/adunits';
+    _url = 'adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/customchannels/' + commons.Escaper.ecapeVariable('$customChannelId') + '/adunits';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1844,23 +1831,21 @@
 }
 
 
-/** Not documented yet. */
 class MetadataResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   MetadataDimensionsResourceApi get dimensions => new MetadataDimensionsResourceApi(_requester);
   MetadataMetricsResourceApi get metrics => new MetadataMetricsResourceApi(_requester);
 
-  MetadataResourceApi(common_internal.ApiRequester client) : 
+  MetadataResourceApi(commons.ApiRequester client) : 
       _requester = client;
 }
 
 
-/** Not documented yet. */
 class MetadataDimensionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  MetadataDimensionsResourceApi(common_internal.ApiRequester client) : 
+  MetadataDimensionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1870,7 +1855,7 @@
    *
    * Completes with a [Metadata].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1881,7 +1866,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -1901,11 +1886,10 @@
 }
 
 
-/** Not documented yet. */
 class MetadataMetricsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  MetadataMetricsResourceApi(common_internal.ApiRequester client) : 
+  MetadataMetricsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1915,7 +1899,7 @@
    *
    * Completes with a [Metadata].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1926,7 +1910,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -1946,11 +1930,10 @@
 }
 
 
-/** Not documented yet. */
 class PaymentsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PaymentsResourceApi(common_internal.ApiRequester client) : 
+  PaymentsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1960,7 +1943,7 @@
    *
    * Completes with a [Payments].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1971,7 +1954,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -1991,13 +1974,12 @@
 }
 
 
-/** Not documented yet. */
 class ReportsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   ReportsSavedResourceApi get saved => new ReportsSavedResourceApi(_requester);
 
-  ReportsResourceApi(common_internal.ApiRequester client) : 
+  ReportsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2060,20 +2042,20 @@
    * - [AdsenseReportsGenerateResponse] for Metadata downloads (see
    * [downloadOptions]).
    *
-   * - [common.Media] for Media downloads (see [downloadOptions]).
+   * - [commons.Media] for Media downloads (see [downloadOptions]).
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future generate(core.String startDate, core.String endDate, {core.List<core.String> accountId, core.String currency, core.List<core.String> dimension, core.List<core.String> filter, core.String locale, core.int maxResults, core.List<core.String> metric, core.List<core.String> sort, core.int startIndex, core.bool useTimezoneReporting, common.DownloadOptions downloadOptions: common.DownloadOptions.Metadata}) {
+  async.Future generate(core.String startDate, core.String endDate, {core.List<core.String> accountId, core.String currency, core.List<core.String> dimension, core.List<core.String> filter, core.String locale, core.int maxResults, core.List<core.String> metric, core.List<core.String> sort, core.int startIndex, core.bool useTimezoneReporting, commons.DownloadOptions downloadOptions: commons.DownloadOptions.Metadata}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (startDate == null) {
@@ -2127,7 +2109,7 @@
                                        uploadMedia: _uploadMedia,
                                        downloadOptions: _downloadOptions);
     if (_downloadOptions == null ||
-        _downloadOptions == common.DownloadOptions.Metadata) {
+        _downloadOptions == commons.DownloadOptions.Metadata) {
       return _response.then((data) => new AdsenseReportsGenerateResponse.fromJson(data));
     } else {
       return _response;
@@ -2137,11 +2119,10 @@
 }
 
 
-/** Not documented yet. */
 class ReportsSavedResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ReportsSavedResourceApi(common_internal.ApiRequester client) : 
+  ReportsSavedResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2164,7 +2145,7 @@
    *
    * Completes with a [AdsenseReportsGenerateResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2175,7 +2156,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (savedReportId == null) {
@@ -2192,7 +2173,7 @@
     }
 
 
-    _url = 'reports/' + common_internal.Escaper.ecapeVariable('$savedReportId');
+    _url = 'reports/' + commons.Escaper.ecapeVariable('$savedReportId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2219,7 +2200,7 @@
    *
    * Completes with a [SavedReports].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2230,7 +2211,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (maxResults != null) {
@@ -2256,11 +2237,10 @@
 }
 
 
-/** Not documented yet. */
 class SavedadstylesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  SavedadstylesResourceApi(common_internal.ApiRequester client) : 
+  SavedadstylesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2272,7 +2252,7 @@
    *
    * Completes with a [SavedAdStyle].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2283,7 +2263,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (savedAdStyleId == null) {
@@ -2291,7 +2271,7 @@
     }
 
 
-    _url = 'savedadstyles/' + common_internal.Escaper.ecapeVariable('$savedAdStyleId');
+    _url = 'savedadstyles/' + commons.Escaper.ecapeVariable('$savedAdStyleId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2318,7 +2298,7 @@
    *
    * Completes with a [SavedAdStyles].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2329,7 +2309,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (maxResults != null) {
@@ -2355,11 +2335,10 @@
 }
 
 
-/** Not documented yet. */
 class UrlchannelsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  UrlchannelsResourceApi(common_internal.ApiRequester client) : 
+  UrlchannelsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2379,7 +2358,7 @@
    *
    * Completes with a [UrlChannels].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2390,7 +2369,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (adClientId == null) {
@@ -2404,7 +2383,7 @@
     }
 
 
-    _url = 'adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/urlchannels';
+    _url = 'adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/urlchannels';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2420,7 +2399,6 @@
 
 
 
-/** Not documented yet. */
 class Account {
   /** Unique identifier of this account. */
   core.String id;
@@ -2489,7 +2467,6 @@
 }
 
 
-/** Not documented yet. */
 class Accounts {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -2543,7 +2520,6 @@
 }
 
 
-/** Not documented yet. */
 class AdClient {
   /** Whether this ad client is opted in to ARC. */
   core.bool arcOptIn;
@@ -2618,7 +2594,6 @@
 }
 
 
-/** Not documented yet. */
 class AdClients {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -2672,7 +2647,6 @@
 }
 
 
-/** Not documented yet. */
 class AdCode {
   /** The ad code snippet. */
   core.String adCode;
@@ -2802,7 +2776,6 @@
 }
 
 
-/** Not documented yet. */
 class AdStyle {
   /**
    * The colors which are included in the style. These are represented as six
@@ -3048,7 +3021,6 @@
 }
 
 
-/** Not documented yet. */
 class AdUnit {
   /**
    * Identity code of this ad unit, not necessarily unique across ad clients.
@@ -3171,7 +3143,6 @@
 }
 
 
-/** Not documented yet. */
 class AdUnits {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -3225,7 +3196,6 @@
 }
 
 
-/** Not documented yet. */
 class AdsenseReportsGenerateResponseHeaders {
   /**
    * The currency of this column. Only present if the header type is
@@ -3273,7 +3243,6 @@
 }
 
 
-/** Not documented yet. */
 class AdsenseReportsGenerateResponse {
   /**
    * The averages of the report. This is the same length as any other row in the
@@ -3387,7 +3356,6 @@
 }
 
 
-/** Not documented yet. */
 class Alert {
   /**
    * Unique identifier of this alert. This should be considered an opaque
@@ -3463,7 +3431,6 @@
 }
 
 
-/** Not documented yet. */
 class Alerts {
   /** The alerts returned in this list response. */
   core.List<Alert> items;
@@ -3553,7 +3520,6 @@
 }
 
 
-/** Not documented yet. */
 class CustomChannel {
   /** Code of this custom channel, not necessarily unique across ad clients. */
   core.String code;
@@ -3617,7 +3583,6 @@
 }
 
 
-/** Not documented yet. */
 class CustomChannels {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -3671,9 +3636,7 @@
 }
 
 
-/** Not documented yet. */
 class Metadata {
-  /** Not documented yet. */
   core.List<ReportingMetadataEntry> items;
 
   /** Kind of list this is, in this case adsense#metadata. */
@@ -3704,7 +3667,6 @@
 }
 
 
-/** Not documented yet. */
 class Payment {
   /** Unique identifier of this Payment. */
   core.String id;
@@ -3767,7 +3729,6 @@
 }
 
 
-/** Not documented yet. */
 class Payments {
   /**
    * The list of Payments for the account. One or both of a) the account's most
@@ -3803,7 +3764,6 @@
 }
 
 
-/** Not documented yet. */
 class ReportingMetadataEntry {
   /**
    * For metrics this is a list of dimension IDs which the metric is compatible
@@ -3904,7 +3864,6 @@
 }
 
 
-/** Not documented yet. */
 class SavedAdStyle {
   /** The AdStyle itself. */
   AdStyle adStyle;
@@ -3959,7 +3918,6 @@
 }
 
 
-/** Not documented yet. */
 class SavedAdStyles {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -4013,7 +3971,6 @@
 }
 
 
-/** Not documented yet. */
 class SavedReport {
   /** Unique identifier of this saved report. */
   core.String id;
@@ -4055,7 +4012,6 @@
 }
 
 
-/** Not documented yet. */
 class SavedReports {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -4109,7 +4065,6 @@
 }
 
 
-/** Not documented yet. */
 class UrlChannel {
   /**
    * Unique identifier of this URL channel. This should be considered an opaque
@@ -4157,7 +4112,6 @@
 }
 
 
-/** Not documented yet. */
 class UrlChannels {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -4209,5 +4163,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/adsensehost/v4_1.dart b/generated/googleapis/lib/adsensehost/v4_1.dart
index 53fa300..bc55be3 100644
--- a/generated/googleapis/lib/adsensehost/v4_1.dart
+++ b/generated/googleapis/lib/adsensehost/v4_1.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.adsensehost.v4_1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client adsensehost/v4.1';
 
 /**
  * Gives AdSense Hosts access to report generation, ad code generation, and
@@ -22,7 +25,7 @@
   static const AdsensehostScope = "https://www.googleapis.com/auth/adsensehost";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AccountsResourceApi get accounts => new AccountsResourceApi(_requester);
   AdclientsResourceApi get adclients => new AdclientsResourceApi(_requester);
@@ -32,19 +35,18 @@
   UrlchannelsResourceApi get urlchannels => new UrlchannelsResourceApi(_requester);
 
   AdsensehostApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "adsensehost/v4.1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class AccountsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AccountsAdclientsResourceApi get adclients => new AccountsAdclientsResourceApi(_requester);
   AccountsAdunitsResourceApi get adunits => new AccountsAdunitsResourceApi(_requester);
   AccountsReportsResourceApi get reports => new AccountsReportsResourceApi(_requester);
 
-  AccountsResourceApi(common_internal.ApiRequester client) : 
+  AccountsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -56,7 +58,7 @@
    *
    * Completes with a [Account].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -67,7 +69,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -75,7 +77,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -96,7 +98,7 @@
    *
    * Completes with a [Accounts].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -107,7 +109,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (filterAdClientId == null || filterAdClientId.isEmpty) {
@@ -131,11 +133,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsAdclientsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsAdclientsResourceApi(common_internal.ApiRequester client) : 
+  AccountsAdclientsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -150,7 +151,7 @@
    *
    * Completes with a [AdClient].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -161,7 +162,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -172,7 +173,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/adclients/' + common_internal.Escaper.ecapeVariable('$adClientId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/adclients/' + commons.Escaper.ecapeVariable('$adClientId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -201,7 +202,7 @@
    *
    * Completes with a [AdClients].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -212,7 +213,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -226,7 +227,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/adclients';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/adclients';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -241,11 +242,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsAdunitsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsAdunitsResourceApi(common_internal.ApiRequester client) : 
+  AccountsAdunitsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -261,7 +261,7 @@
    *
    * Completes with a [AdUnit].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -272,7 +272,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -286,7 +286,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/adunits/' + common_internal.Escaper.ecapeVariable('$adUnitId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/adunits/' + commons.Escaper.ecapeVariable('$adUnitId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -311,7 +311,7 @@
    *
    * Completes with a [AdUnit].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -322,7 +322,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -336,7 +336,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/adunits/' + common_internal.Escaper.ecapeVariable('$adUnitId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/adunits/' + commons.Escaper.ecapeVariable('$adUnitId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -364,7 +364,7 @@
    *
    * Completes with a [AdCode].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -375,7 +375,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -392,7 +392,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/adunits/' + common_internal.Escaper.ecapeVariable('$adUnitId') + '/adcode';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/adunits/' + commons.Escaper.ecapeVariable('$adUnitId') + '/adcode';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -417,7 +417,7 @@
    *
    * Completes with a [AdUnit].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -428,7 +428,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -442,7 +442,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/adunits';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/adunits';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -475,7 +475,7 @@
    *
    * Completes with a [AdUnits].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -486,7 +486,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -506,7 +506,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/adunits';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/adunits';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -534,7 +534,7 @@
    *
    * Completes with a [AdUnit].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -545,7 +545,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -563,7 +563,7 @@
     _queryParams["adUnitId"] = [adUnitId];
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/adunits';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/adunits';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -588,7 +588,7 @@
    *
    * Completes with a [AdUnit].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -599,7 +599,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -613,7 +613,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/adunits';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/adunits';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -628,11 +628,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsReportsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsReportsResourceApi(common_internal.ApiRequester client) : 
+  AccountsReportsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -680,7 +679,7 @@
    *
    * Completes with a [Report].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -691,7 +690,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -728,7 +727,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/reports';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/reports';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -743,11 +742,10 @@
 }
 
 
-/** Not documented yet. */
 class AdclientsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AdclientsResourceApi(common_internal.ApiRequester client) : 
+  AdclientsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -759,7 +757,7 @@
    *
    * Completes with a [AdClient].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -770,7 +768,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (adClientId == null) {
@@ -778,7 +776,7 @@
     }
 
 
-    _url = 'adclients/' + common_internal.Escaper.ecapeVariable('$adClientId');
+    _url = 'adclients/' + commons.Escaper.ecapeVariable('$adClientId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -805,7 +803,7 @@
    *
    * Completes with a [AdClients].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -816,7 +814,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (maxResults != null) {
@@ -842,11 +840,10 @@
 }
 
 
-/** Not documented yet. */
 class AssociationsessionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AssociationsessionsResourceApi(common_internal.ApiRequester client) : 
+  AssociationsessionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -865,7 +862,7 @@
    *
    * Completes with a [AssociationSession].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -876,7 +873,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (productCode == null || productCode.isEmpty) {
@@ -917,7 +914,7 @@
    *
    * Completes with a [AssociationSession].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -928,7 +925,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (token == null) {
@@ -952,11 +949,10 @@
 }
 
 
-/** Not documented yet. */
 class CustomchannelsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  CustomchannelsResourceApi(common_internal.ApiRequester client) : 
+  CustomchannelsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -970,7 +966,7 @@
    *
    * Completes with a [CustomChannel].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -981,7 +977,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (adClientId == null) {
@@ -992,7 +988,7 @@
     }
 
 
-    _url = 'adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/customchannels/' + common_internal.Escaper.ecapeVariable('$customChannelId');
+    _url = 'adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/customchannels/' + commons.Escaper.ecapeVariable('$customChannelId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1015,7 +1011,7 @@
    *
    * Completes with a [CustomChannel].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1026,7 +1022,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (adClientId == null) {
@@ -1037,7 +1033,7 @@
     }
 
 
-    _url = 'adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/customchannels/' + common_internal.Escaper.ecapeVariable('$customChannelId');
+    _url = 'adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/customchannels/' + commons.Escaper.ecapeVariable('$customChannelId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1060,7 +1056,7 @@
    *
    * Completes with a [CustomChannel].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1071,7 +1067,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1082,7 +1078,7 @@
     }
 
 
-    _url = 'adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/customchannels';
+    _url = 'adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/customchannels';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1111,7 +1107,7 @@
    *
    * Completes with a [CustomChannels].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1122,7 +1118,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (adClientId == null) {
@@ -1136,7 +1132,7 @@
     }
 
 
-    _url = 'adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/customchannels';
+    _url = 'adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/customchannels';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1162,7 +1158,7 @@
    *
    * Completes with a [CustomChannel].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1173,7 +1169,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1188,7 +1184,7 @@
     _queryParams["customChannelId"] = [customChannelId];
 
 
-    _url = 'adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/customchannels';
+    _url = 'adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/customchannels';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1211,7 +1207,7 @@
    *
    * Completes with a [CustomChannel].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1222,7 +1218,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1233,7 +1229,7 @@
     }
 
 
-    _url = 'adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/customchannels';
+    _url = 'adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/customchannels';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1248,11 +1244,10 @@
 }
 
 
-/** Not documented yet. */
 class ReportsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ReportsResourceApi(common_internal.ApiRequester client) : 
+  ReportsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1298,7 +1293,7 @@
    *
    * Completes with a [Report].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1309,7 +1304,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (startDate == null) {
@@ -1358,11 +1353,10 @@
 }
 
 
-/** Not documented yet. */
 class UrlchannelsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  UrlchannelsResourceApi(common_internal.ApiRequester client) : 
+  UrlchannelsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1376,7 +1370,7 @@
    *
    * Completes with a [UrlChannel].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1387,7 +1381,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (adClientId == null) {
@@ -1398,7 +1392,7 @@
     }
 
 
-    _url = 'adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/urlchannels/' + common_internal.Escaper.ecapeVariable('$urlChannelId');
+    _url = 'adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/urlchannels/' + commons.Escaper.ecapeVariable('$urlChannelId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1421,7 +1415,7 @@
    *
    * Completes with a [UrlChannel].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1432,7 +1426,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1443,7 +1437,7 @@
     }
 
 
-    _url = 'adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/urlchannels';
+    _url = 'adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/urlchannels';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1472,7 +1466,7 @@
    *
    * Completes with a [UrlChannels].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1483,7 +1477,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (adClientId == null) {
@@ -1497,7 +1491,7 @@
     }
 
 
-    _url = 'adclients/' + common_internal.Escaper.ecapeVariable('$adClientId') + '/urlchannels';
+    _url = 'adclients/' + commons.Escaper.ecapeVariable('$adClientId') + '/urlchannels';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1513,7 +1507,6 @@
 
 
 
-/** Not documented yet. */
 class Account {
   /** Unique identifier of this account. */
   core.String id;
@@ -1564,7 +1557,6 @@
 }
 
 
-/** Not documented yet. */
 class Accounts {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -1606,7 +1598,6 @@
 }
 
 
-/** Not documented yet. */
 class AdClient {
   /** Whether this ad client is opted in to ARC. */
   core.bool arcOptIn;
@@ -1669,7 +1660,6 @@
 }
 
 
-/** Not documented yet. */
 class AdClients {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -1723,7 +1713,6 @@
 }
 
 
-/** Not documented yet. */
 class AdCode {
   /** The ad code snippet. */
   core.String adCode;
@@ -1858,7 +1847,6 @@
 }
 
 
-/** Not documented yet. */
 class AdStyle {
   /**
    * The colors included in the style. These are represented as six hexadecimal
@@ -2060,7 +2048,6 @@
 }
 
 
-/** Not documented yet. */
 class AdUnit {
   /**
    * Identity code of this ad unit, not necessarily unique across ad clients.
@@ -2165,7 +2152,6 @@
 }
 
 
-/** Not documented yet. */
 class AdUnits {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -2219,7 +2205,6 @@
 }
 
 
-/** Not documented yet. */
 class AssociationSession {
   /**
    * Hosted account id of the associated publisher after association. Present if
@@ -2327,7 +2312,6 @@
 }
 
 
-/** Not documented yet. */
 class CustomChannel {
   /** Code of this custom channel, not necessarily unique across ad clients. */
   core.String code;
@@ -2382,7 +2366,6 @@
 }
 
 
-/** Not documented yet. */
 class CustomChannels {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -2436,7 +2419,6 @@
 }
 
 
-/** Not documented yet. */
 class ReportHeaders {
   /**
    * The currency of this column. Only present if the header type is
@@ -2484,7 +2466,6 @@
 }
 
 
-/** Not documented yet. */
 class Report {
   /**
    * The averages of the report. This is the same length as any other row in the
@@ -2580,7 +2561,6 @@
 }
 
 
-/** Not documented yet. */
 class UrlChannel {
   /**
    * Unique identifier of this URL channel. This should be considered an opaque
@@ -2628,7 +2608,6 @@
 }
 
 
-/** Not documented yet. */
 class UrlChannels {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -2680,5 +2659,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/analytics/v3.dart b/generated/googleapis/lib/analytics/v3.dart
index 5c2ae57..0fa52a7 100644
--- a/generated/googleapis/lib/analytics/v3.dart
+++ b/generated/googleapis/lib/analytics/v3.dart
@@ -1,17 +1,22 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.analytics.v3;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError, Media, UploadOptions,
+    ResumableUploadOptions, DownloadOptions, PartialDownloadOptions,
+    ByteRange;
+
+const core.String USER_AGENT = 'dart-api-client analytics/v3';
 
 /** View and manage your Google Analytics data */
 class AnalyticsApi {
@@ -37,7 +42,7 @@
   static const AnalyticsReadonlyScope = "https://www.googleapis.com/auth/analytics.readonly";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   DataResourceApi get data => new DataResourceApi(_requester);
   ManagementResourceApi get management => new ManagementResourceApi(_requester);
@@ -45,28 +50,26 @@
   ProvisioningResourceApi get provisioning => new ProvisioningResourceApi(_requester);
 
   AnalyticsApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "analytics/v3/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class DataResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   DataGaResourceApi get ga => new DataGaResourceApi(_requester);
   DataMcfResourceApi get mcf => new DataMcfResourceApi(_requester);
   DataRealtimeResourceApi get realtime => new DataRealtimeResourceApi(_requester);
 
-  DataResourceApi(common_internal.ApiRequester client) : 
+  DataResourceApi(commons.ApiRequester client) : 
       _requester = client;
 }
 
 
-/** Not documented yet. */
 class DataGaResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  DataGaResourceApi(common_internal.ApiRequester client) : 
+  DataGaResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -129,7 +132,7 @@
    *
    * Completes with a [GaData].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -140,7 +143,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (ids == null) {
@@ -200,11 +203,10 @@
 }
 
 
-/** Not documented yet. */
 class DataMcfResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  DataMcfResourceApi(common_internal.ApiRequester client) : 
+  DataMcfResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -260,7 +262,7 @@
    *
    * Completes with a [McfData].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -271,7 +273,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (ids == null) {
@@ -325,11 +327,10 @@
 }
 
 
-/** Not documented yet. */
 class DataRealtimeResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  DataRealtimeResourceApi(common_internal.ApiRequester client) : 
+  DataRealtimeResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -361,7 +362,7 @@
    *
    * Completes with a [RealtimeData].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -372,7 +373,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (ids == null) {
@@ -412,9 +413,8 @@
 }
 
 
-/** Not documented yet. */
 class ManagementResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   ManagementAccountSummariesResourceApi get accountSummaries => new ManagementAccountSummariesResourceApi(_requester);
   ManagementAccountUserLinksResourceApi get accountUserLinks => new ManagementAccountUserLinksResourceApi(_requester);
@@ -422,7 +422,6 @@
   ManagementCustomDataSourcesResourceApi get customDataSources => new ManagementCustomDataSourcesResourceApi(_requester);
   ManagementCustomDimensionsResourceApi get customDimensions => new ManagementCustomDimensionsResourceApi(_requester);
   ManagementCustomMetricsResourceApi get customMetrics => new ManagementCustomMetricsResourceApi(_requester);
-  ManagementDailyUploadsResourceApi get dailyUploads => new ManagementDailyUploadsResourceApi(_requester);
   ManagementExperimentsResourceApi get experiments => new ManagementExperimentsResourceApi(_requester);
   ManagementFiltersResourceApi get filters => new ManagementFiltersResourceApi(_requester);
   ManagementGoalsResourceApi get goals => new ManagementGoalsResourceApi(_requester);
@@ -436,16 +435,15 @@
   ManagementWebpropertiesResourceApi get webproperties => new ManagementWebpropertiesResourceApi(_requester);
   ManagementWebpropertyUserLinksResourceApi get webpropertyUserLinks => new ManagementWebpropertyUserLinksResourceApi(_requester);
 
-  ManagementResourceApi(common_internal.ApiRequester client) : 
+  ManagementResourceApi(commons.ApiRequester client) : 
       _requester = client;
 }
 
 
-/** Not documented yet. */
 class ManagementAccountSummariesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ManagementAccountSummariesResourceApi(common_internal.ApiRequester client) : 
+  ManagementAccountSummariesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -462,7 +460,7 @@
    *
    * Completes with a [AccountSummaries].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -473,7 +471,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (max_results != null) {
@@ -499,11 +497,10 @@
 }
 
 
-/** Not documented yet. */
 class ManagementAccountUserLinksResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ManagementAccountUserLinksResourceApi(common_internal.ApiRequester client) : 
+  ManagementAccountUserLinksResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -515,7 +512,7 @@
    *
    * [linkId] - Link ID to delete the user link for.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -526,7 +523,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -538,7 +535,7 @@
 
     _downloadOptions = null;
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/entityUserLinks/' + common_internal.Escaper.ecapeVariable('$linkId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/entityUserLinks/' + commons.Escaper.ecapeVariable('$linkId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -561,7 +558,7 @@
    *
    * Completes with a [EntityUserLink].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -572,7 +569,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -583,7 +580,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/entityUserLinks';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/entityUserLinks';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -611,7 +608,7 @@
    *
    * Completes with a [EntityUserLinks].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -622,7 +619,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -636,7 +633,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/entityUserLinks';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/entityUserLinks';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -661,7 +658,7 @@
    *
    * Completes with a [EntityUserLink].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -672,7 +669,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -686,7 +683,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/entityUserLinks/' + common_internal.Escaper.ecapeVariable('$linkId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/entityUserLinks/' + commons.Escaper.ecapeVariable('$linkId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -701,11 +698,10 @@
 }
 
 
-/** Not documented yet. */
 class ManagementAccountsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ManagementAccountsResourceApi(common_internal.ApiRequester client) : 
+  ManagementAccountsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -720,7 +716,7 @@
    *
    * Completes with a [Accounts].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -731,7 +727,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (max_results != null) {
@@ -757,11 +753,10 @@
 }
 
 
-/** Not documented yet. */
 class ManagementCustomDataSourcesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ManagementCustomDataSourcesResourceApi(common_internal.ApiRequester client) : 
+  ManagementCustomDataSourcesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -784,7 +779,7 @@
    *
    * Completes with a [CustomDataSources].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -795,7 +790,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -812,7 +807,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/customDataSources';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/customDataSources';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -827,11 +822,10 @@
 }
 
 
-/** Not documented yet. */
 class ManagementCustomDimensionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ManagementCustomDimensionsResourceApi(common_internal.ApiRequester client) : 
+  ManagementCustomDimensionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -847,7 +841,7 @@
    *
    * Completes with a [CustomDimension].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -858,7 +852,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -872,7 +866,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/customDimensions/' + common_internal.Escaper.ecapeVariable('$customDimensionId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/customDimensions/' + commons.Escaper.ecapeVariable('$customDimensionId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -897,7 +891,7 @@
    *
    * Completes with a [CustomDimension].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -908,7 +902,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -922,7 +916,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/customDimensions';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/customDimensions';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -951,7 +945,7 @@
    *
    * Completes with a [CustomDimensions].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -962,7 +956,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -979,7 +973,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/customDimensions';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/customDimensions';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1011,7 +1005,7 @@
    *
    * Completes with a [CustomDimension].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1022,7 +1016,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1042,7 +1036,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/customDimensions/' + common_internal.Escaper.ecapeVariable('$customDimensionId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/customDimensions/' + commons.Escaper.ecapeVariable('$customDimensionId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1074,7 +1068,7 @@
    *
    * Completes with a [CustomDimension].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1085,7 +1079,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1105,7 +1099,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/customDimensions/' + common_internal.Escaper.ecapeVariable('$customDimensionId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/customDimensions/' + commons.Escaper.ecapeVariable('$customDimensionId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1120,11 +1114,10 @@
 }
 
 
-/** Not documented yet. */
 class ManagementCustomMetricsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ManagementCustomMetricsResourceApi(common_internal.ApiRequester client) : 
+  ManagementCustomMetricsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1140,7 +1133,7 @@
    *
    * Completes with a [CustomMetric].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1151,7 +1144,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -1165,7 +1158,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/customMetrics/' + common_internal.Escaper.ecapeVariable('$customMetricId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/customMetrics/' + commons.Escaper.ecapeVariable('$customMetricId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1190,7 +1183,7 @@
    *
    * Completes with a [CustomMetric].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1201,7 +1194,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1215,7 +1208,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/customMetrics';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/customMetrics';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1244,7 +1237,7 @@
    *
    * Completes with a [CustomMetrics].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1255,7 +1248,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -1272,7 +1265,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/customMetrics';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/customMetrics';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1303,7 +1296,7 @@
    *
    * Completes with a [CustomMetric].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1314,7 +1307,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1334,7 +1327,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/customMetrics/' + common_internal.Escaper.ecapeVariable('$customMetricId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/customMetrics/' + commons.Escaper.ecapeVariable('$customMetricId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1365,7 +1358,7 @@
    *
    * Completes with a [CustomMetric].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1376,7 +1369,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1396,7 +1389,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/customMetrics/' + common_internal.Escaper.ecapeVariable('$customMetricId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/customMetrics/' + commons.Escaper.ecapeVariable('$customMetricId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1411,263 +1404,10 @@
 }
 
 
-/** Not documented yet. */
-class ManagementDailyUploadsResourceApi {
-  final common_internal.ApiRequester _requester;
-
-  ManagementDailyUploadsResourceApi(common_internal.ApiRequester client) : 
-      _requester = client;
-
-  /**
-   * Delete uploaded data for the given date.
-   *
-   * Request parameters:
-   *
-   * [accountId] - Account Id associated with daily upload delete.
-   * Value must have pattern "[0-9]+".
-   *
-   * [webPropertyId] - Web property Id associated with daily upload delete.
-   * Value must have pattern "UA-[0-9]+-[0-9]+".
-   *
-   * [customDataSourceId] - Custom data source Id associated with daily upload
-   * delete.
-   *
-   * [date] - Date for which data is to be deleted. Date should be formatted as
-   * YYYY-MM-DD.
-   * Value must have pattern "[0-9]{4}-[0-9]{2}-[0-9]{2}".
-   *
-   * [type] - Type of data for this delete.
-   * Possible string values are:
-   * - "cost" : Value for specifying cost data upload.
-   *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
-   * error.
-   *
-   * If the used [http.Client] completes with an error when making a REST call,
-   * this method  will complete with the same error.
-   */
-  async.Future delete(core.String accountId, core.String webPropertyId, core.String customDataSourceId, core.String date, core.String type) {
-    var _url = null;
-    var _queryParams = new core.Map();
-    var _uploadMedia = null;
-    var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
-    var _body = null;
-
-    if (accountId == null) {
-      throw new core.ArgumentError("Parameter accountId is required.");
-    }
-    if (webPropertyId == null) {
-      throw new core.ArgumentError("Parameter webPropertyId is required.");
-    }
-    if (customDataSourceId == null) {
-      throw new core.ArgumentError("Parameter customDataSourceId is required.");
-    }
-    if (date == null) {
-      throw new core.ArgumentError("Parameter date is required.");
-    }
-    if (type == null) {
-      throw new core.ArgumentError("Parameter type is required.");
-    }
-    _queryParams["type"] = [type];
-
-    _downloadOptions = null;
-
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/customDataSources/' + common_internal.Escaper.ecapeVariable('$customDataSourceId') + '/dailyUploads/' + common_internal.Escaper.ecapeVariable('$date');
-
-    var _response = _requester.request(_url,
-                                       "DELETE",
-                                       body: _body,
-                                       queryParams: _queryParams,
-                                       uploadOptions: _uploadOptions,
-                                       uploadMedia: _uploadMedia,
-                                       downloadOptions: _downloadOptions);
-    return _response.then((data) => null);
-  }
-
-  /**
-   * List daily uploads to which the user has access.
-   *
-   * Request parameters:
-   *
-   * [accountId] - Account Id for the daily uploads to retrieve.
-   * Value must have pattern "\d+".
-   *
-   * [webPropertyId] - Web property Id for the daily uploads to retrieve.
-   * Value must have pattern "UA-(\d+)-(\d+)".
-   *
-   * [customDataSourceId] - Custom data source Id for daily uploads to retrieve.
-   * Value must have pattern ".{22}".
-   *
-   * [start_date] - Start date of the form YYYY-MM-DD.
-   * Value must have pattern "[0-9]{4}-[0-9]{2}-[0-9]{2}".
-   *
-   * [end_date] - End date of the form YYYY-MM-DD.
-   * Value must have pattern "[0-9]{4}-[0-9]{2}-[0-9]{2}".
-   *
-   * [max_results] - The maximum number of custom data sources to include in
-   * this response.
-   *
-   * [start_index] - A 1-based index of the first daily upload to retrieve. Use
-   * this parameter as a pagination mechanism along with the max-results
-   * parameter.
-   *
-   * Completes with a [DailyUploads].
-   *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
-   * error.
-   *
-   * If the used [http.Client] completes with an error when making a REST call,
-   * this method  will complete with the same error.
-   */
-  async.Future<DailyUploads> list(core.String accountId, core.String webPropertyId, core.String customDataSourceId, core.String start_date, core.String end_date, {core.int max_results, core.int start_index}) {
-    var _url = null;
-    var _queryParams = new core.Map();
-    var _uploadMedia = null;
-    var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
-    var _body = null;
-
-    if (accountId == null) {
-      throw new core.ArgumentError("Parameter accountId is required.");
-    }
-    if (webPropertyId == null) {
-      throw new core.ArgumentError("Parameter webPropertyId is required.");
-    }
-    if (customDataSourceId == null) {
-      throw new core.ArgumentError("Parameter customDataSourceId is required.");
-    }
-    if (start_date == null) {
-      throw new core.ArgumentError("Parameter start_date is required.");
-    }
-    _queryParams["start-date"] = [start_date];
-    if (end_date == null) {
-      throw new core.ArgumentError("Parameter end_date is required.");
-    }
-    _queryParams["end-date"] = [end_date];
-    if (max_results != null) {
-      _queryParams["max-results"] = ["${max_results}"];
-    }
-    if (start_index != null) {
-      _queryParams["start-index"] = ["${start_index}"];
-    }
-
-
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/customDataSources/' + common_internal.Escaper.ecapeVariable('$customDataSourceId') + '/dailyUploads';
-
-    var _response = _requester.request(_url,
-                                       "GET",
-                                       body: _body,
-                                       queryParams: _queryParams,
-                                       uploadOptions: _uploadOptions,
-                                       uploadMedia: _uploadMedia,
-                                       downloadOptions: _downloadOptions);
-    return _response.then((data) => new DailyUploads.fromJson(data));
-  }
-
-  /**
-   * Update/Overwrite data for a custom data source.
-   *
-   * Request parameters:
-   *
-   * [accountId] - Account Id associated with daily upload.
-   * Value must have pattern "\d+".
-   *
-   * [webPropertyId] - Web property Id associated with daily upload.
-   * Value must have pattern "UA-\d+-\d+".
-   *
-   * [customDataSourceId] - Custom data source Id to which the data being
-   * uploaded belongs.
-   *
-   * [date] - Date for which data is uploaded. Date should be formatted as
-   * YYYY-MM-DD.
-   * Value must have pattern "[0-9]{4}-[0-9]{2}-[0-9]{2}".
-   *
-   * [appendNumber] - Append number for this upload indexed from 1.
-   * Value must be between "1" and "20".
-   *
-   * [type] - Type of data for this upload.
-   * Possible string values are:
-   * - "cost" : Value for specifying cost data upload.
-   *
-   * [reset] - Reset/Overwrite all previous appends for this date and start over
-   * with this file as the first upload.
-   *
-   * [uploadMedia] - The media to upload.
-   *
-   * [uploadOptions] - Options for the media upload. Streaming Media without the
-   * length being known ahead of time is only supported via resumable uploads.
-   *
-   * Completes with a [DailyUploadAppend].
-   *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
-   * error.
-   *
-   * If the used [http.Client] completes with an error when making a REST call,
-   * this method  will complete with the same error.
-   */
-  async.Future<DailyUploadAppend> upload(core.String accountId, core.String webPropertyId, core.String customDataSourceId, core.String date, core.int appendNumber, core.String type, {core.bool reset, common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
-    var _url = null;
-    var _queryParams = new core.Map();
-    var _uploadMedia = null;
-    var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
-    var _body = null;
-
-    if (accountId == null) {
-      throw new core.ArgumentError("Parameter accountId is required.");
-    }
-    if (webPropertyId == null) {
-      throw new core.ArgumentError("Parameter webPropertyId is required.");
-    }
-    if (customDataSourceId == null) {
-      throw new core.ArgumentError("Parameter customDataSourceId is required.");
-    }
-    if (date == null) {
-      throw new core.ArgumentError("Parameter date is required.");
-    }
-    if (appendNumber == null) {
-      throw new core.ArgumentError("Parameter appendNumber is required.");
-    }
-    _queryParams["appendNumber"] = ["${appendNumber}"];
-    if (type == null) {
-      throw new core.ArgumentError("Parameter type is required.");
-    }
-    _queryParams["type"] = [type];
-    if (reset != null) {
-      _queryParams["reset"] = ["${reset}"];
-    }
-
-    _uploadMedia =  uploadMedia;
-    _uploadOptions =  uploadOptions;
-
-    if (_uploadMedia == null) {
-      _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/customDataSources/' + common_internal.Escaper.ecapeVariable('$customDataSourceId') + '/dailyUploads/' + common_internal.Escaper.ecapeVariable('$date') + '/uploads';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/analytics/v3/management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/customDataSources/' + common_internal.Escaper.ecapeVariable('$customDataSourceId') + '/dailyUploads/' + common_internal.Escaper.ecapeVariable('$date') + '/uploads';
-    } else {
-      _url = '/upload/analytics/v3/management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/customDataSources/' + common_internal.Escaper.ecapeVariable('$customDataSourceId') + '/dailyUploads/' + common_internal.Escaper.ecapeVariable('$date') + '/uploads';
-    }
-
-
-    var _response = _requester.request(_url,
-                                       "POST",
-                                       body: _body,
-                                       queryParams: _queryParams,
-                                       uploadOptions: _uploadOptions,
-                                       uploadMedia: _uploadMedia,
-                                       downloadOptions: _downloadOptions);
-    return _response.then((data) => new DailyUploadAppend.fromJson(data));
-  }
-
-}
-
-
-/** Not documented yet. */
 class ManagementExperimentsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ManagementExperimentsResourceApi(common_internal.ApiRequester client) : 
+  ManagementExperimentsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1683,7 +1423,7 @@
    *
    * [experimentId] - ID of the experiment to delete
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1694,7 +1434,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -1712,7 +1452,7 @@
 
     _downloadOptions = null;
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/experiments/' + common_internal.Escaper.ecapeVariable('$experimentId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId') + '/experiments/' + commons.Escaper.ecapeVariable('$experimentId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1739,7 +1479,7 @@
    *
    * Completes with a [Experiment].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1750,7 +1490,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -1767,7 +1507,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/experiments/' + common_internal.Escaper.ecapeVariable('$experimentId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId') + '/experiments/' + commons.Escaper.ecapeVariable('$experimentId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1794,7 +1534,7 @@
    *
    * Completes with a [Experiment].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1805,7 +1545,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1822,7 +1562,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/experiments';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId') + '/experiments';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1856,7 +1596,7 @@
    *
    * Completes with a [Experiments].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1867,7 +1607,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -1887,7 +1627,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/experiments';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId') + '/experiments';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1916,7 +1656,7 @@
    *
    * Completes with a [Experiment].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1927,7 +1667,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1947,7 +1687,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/experiments/' + common_internal.Escaper.ecapeVariable('$experimentId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId') + '/experiments/' + commons.Escaper.ecapeVariable('$experimentId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1976,7 +1716,7 @@
    *
    * Completes with a [Experiment].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1987,7 +1727,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2007,7 +1747,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/experiments/' + common_internal.Escaper.ecapeVariable('$experimentId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId') + '/experiments/' + commons.Escaper.ecapeVariable('$experimentId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -2022,11 +1762,10 @@
 }
 
 
-/** Not documented yet. */
 class ManagementFiltersResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ManagementFiltersResourceApi(common_internal.ApiRequester client) : 
+  ManagementFiltersResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2040,7 +1779,7 @@
    *
    * Completes with a [Filter].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2051,7 +1790,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -2062,7 +1801,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/filters/' + common_internal.Escaper.ecapeVariable('$filterId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/filters/' + commons.Escaper.ecapeVariable('$filterId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -2085,7 +1824,7 @@
    *
    * Completes with a [Filter].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2096,7 +1835,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -2107,7 +1846,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/filters/' + common_internal.Escaper.ecapeVariable('$filterId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/filters/' + commons.Escaper.ecapeVariable('$filterId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2130,7 +1869,7 @@
    *
    * Completes with a [Filter].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2141,7 +1880,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2152,7 +1891,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/filters';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/filters';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2179,7 +1918,7 @@
    *
    * Completes with a [Filters].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2190,7 +1929,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -2204,7 +1943,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/filters';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/filters';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2229,7 +1968,7 @@
    *
    * Completes with a [Filter].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2240,7 +1979,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2254,7 +1993,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/filters/' + common_internal.Escaper.ecapeVariable('$filterId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/filters/' + commons.Escaper.ecapeVariable('$filterId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -2279,7 +2018,7 @@
    *
    * Completes with a [Filter].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2290,7 +2029,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2304,7 +2043,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/filters/' + common_internal.Escaper.ecapeVariable('$filterId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/filters/' + commons.Escaper.ecapeVariable('$filterId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -2319,11 +2058,10 @@
 }
 
 
-/** Not documented yet. */
 class ManagementGoalsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ManagementGoalsResourceApi(common_internal.ApiRequester client) : 
+  ManagementGoalsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2341,7 +2079,7 @@
    *
    * Completes with a [Goal].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2352,7 +2090,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -2369,7 +2107,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/goals/' + common_internal.Escaper.ecapeVariable('$goalId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId') + '/goals/' + commons.Escaper.ecapeVariable('$goalId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2396,7 +2134,7 @@
    *
    * Completes with a [Goal].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2407,7 +2145,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2424,7 +2162,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/goals';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId') + '/goals';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2460,7 +2198,7 @@
    *
    * Completes with a [Goals].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2471,7 +2209,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -2491,7 +2229,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/goals';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId') + '/goals';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2520,7 +2258,7 @@
    *
    * Completes with a [Goal].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2531,7 +2269,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2551,7 +2289,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/goals/' + common_internal.Escaper.ecapeVariable('$goalId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId') + '/goals/' + commons.Escaper.ecapeVariable('$goalId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -2580,7 +2318,7 @@
    *
    * Completes with a [Goal].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2591,7 +2329,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2611,7 +2349,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/goals/' + common_internal.Escaper.ecapeVariable('$goalId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId') + '/goals/' + commons.Escaper.ecapeVariable('$goalId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -2626,11 +2364,10 @@
 }
 
 
-/** Not documented yet. */
 class ManagementProfileFilterLinksResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ManagementProfileFilterLinksResourceApi(common_internal.ApiRequester client) : 
+  ManagementProfileFilterLinksResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2650,7 +2387,7 @@
    * [linkId] - ID of the profile filter link to delete.
    * Value must have pattern "\d+:\d+".
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2661,7 +2398,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -2679,7 +2416,7 @@
 
     _downloadOptions = null;
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/profileFilterLinks/' + common_internal.Escaper.ecapeVariable('$linkId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId') + '/profileFilterLinks/' + commons.Escaper.ecapeVariable('$linkId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -2710,7 +2447,7 @@
    *
    * Completes with a [ProfileFilterLink].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2721,7 +2458,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -2738,7 +2475,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/profileFilterLinks/' + common_internal.Escaper.ecapeVariable('$linkId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId') + '/profileFilterLinks/' + commons.Escaper.ecapeVariable('$linkId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2768,7 +2505,7 @@
    *
    * Completes with a [ProfileFilterLink].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2779,7 +2516,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2796,7 +2533,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/profileFilterLinks';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId') + '/profileFilterLinks';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2832,7 +2569,7 @@
    *
    * Completes with a [ProfileFilterLinks].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2843,7 +2580,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -2863,7 +2600,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/profileFilterLinks';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId') + '/profileFilterLinks';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2897,7 +2634,7 @@
    *
    * Completes with a [ProfileFilterLink].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2908,7 +2645,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2928,7 +2665,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/profileFilterLinks/' + common_internal.Escaper.ecapeVariable('$linkId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId') + '/profileFilterLinks/' + commons.Escaper.ecapeVariable('$linkId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -2961,7 +2698,7 @@
    *
    * Completes with a [ProfileFilterLink].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2972,7 +2709,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2992,7 +2729,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/profileFilterLinks/' + common_internal.Escaper.ecapeVariable('$linkId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId') + '/profileFilterLinks/' + commons.Escaper.ecapeVariable('$linkId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -3007,11 +2744,10 @@
 }
 
 
-/** Not documented yet. */
 class ManagementProfileUserLinksResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ManagementProfileUserLinksResourceApi(common_internal.ApiRequester client) : 
+  ManagementProfileUserLinksResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3027,7 +2763,7 @@
    *
    * [linkId] - Link ID to delete the user link for.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3038,7 +2774,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -3056,7 +2792,7 @@
 
     _downloadOptions = null;
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/entityUserLinks/' + common_internal.Escaper.ecapeVariable('$linkId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId') + '/entityUserLinks/' + commons.Escaper.ecapeVariable('$linkId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -3083,7 +2819,7 @@
    *
    * Completes with a [EntityUserLink].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3094,7 +2830,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3111,7 +2847,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/entityUserLinks';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId') + '/entityUserLinks';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -3147,7 +2883,7 @@
    *
    * Completes with a [EntityUserLinks].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3158,7 +2894,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -3178,7 +2914,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/entityUserLinks';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId') + '/entityUserLinks';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3207,7 +2943,7 @@
    *
    * Completes with a [EntityUserLink].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3218,7 +2954,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3238,7 +2974,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/entityUserLinks/' + common_internal.Escaper.ecapeVariable('$linkId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId') + '/entityUserLinks/' + commons.Escaper.ecapeVariable('$linkId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -3253,11 +2989,10 @@
 }
 
 
-/** Not documented yet. */
 class ManagementProfilesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ManagementProfilesResourceApi(common_internal.ApiRequester client) : 
+  ManagementProfilesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3271,7 +3006,7 @@
    *
    * [profileId] - ID of the view (profile) to be deleted.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3282,7 +3017,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -3297,7 +3032,7 @@
 
     _downloadOptions = null;
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -3325,7 +3060,7 @@
    *
    * Completes with a [Profile].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3336,7 +3071,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -3350,7 +3085,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3375,7 +3110,7 @@
    *
    * Completes with a [Profile].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3386,7 +3121,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3400,7 +3135,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -3433,7 +3168,7 @@
    *
    * Completes with a [Profiles].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3444,7 +3179,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -3461,7 +3196,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3488,7 +3223,7 @@
    *
    * Completes with a [Profile].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3499,7 +3234,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3516,7 +3251,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -3543,7 +3278,7 @@
    *
    * Completes with a [Profile].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3554,7 +3289,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3571,7 +3306,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -3586,11 +3321,10 @@
 }
 
 
-/** Not documented yet. */
 class ManagementSegmentsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ManagementSegmentsResourceApi(common_internal.ApiRequester client) : 
+  ManagementSegmentsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3605,7 +3339,7 @@
    *
    * Completes with a [Segments].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3616,7 +3350,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (max_results != null) {
@@ -3642,11 +3376,10 @@
 }
 
 
-/** Not documented yet. */
 class ManagementUnsampledReportsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ManagementUnsampledReportsResourceApi(common_internal.ApiRequester client) : 
+  ManagementUnsampledReportsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3664,7 +3397,7 @@
    *
    * Completes with a [UnsampledReport].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3675,7 +3408,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -3692,7 +3425,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/unsampledReports/' + common_internal.Escaper.ecapeVariable('$unsampledReportId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId') + '/unsampledReports/' + commons.Escaper.ecapeVariable('$unsampledReportId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3719,7 +3452,7 @@
    *
    * Completes with a [UnsampledReport].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3730,7 +3463,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3747,7 +3480,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/unsampledReports';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId') + '/unsampledReports';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -3782,7 +3515,7 @@
    *
    * Completes with a [UnsampledReports].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3793,7 +3526,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -3813,7 +3546,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/unsampledReports';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/profiles/' + commons.Escaper.ecapeVariable('$profileId') + '/unsampledReports';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3828,11 +3561,10 @@
 }
 
 
-/** Not documented yet. */
 class ManagementUploadsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ManagementUploadsResourceApi(common_internal.ApiRequester client) : 
+  ManagementUploadsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3851,7 +3583,7 @@
    * [customDataSourceId] - Custom data source Id for the uploads to be deleted.
    * Value must have pattern ".{22}".
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3862,7 +3594,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3880,7 +3612,7 @@
 
     _downloadOptions = null;
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/customDataSources/' + common_internal.Escaper.ecapeVariable('$customDataSourceId') + '/deleteUploadData';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/customDataSources/' + commons.Escaper.ecapeVariable('$customDataSourceId') + '/deleteUploadData';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -3911,7 +3643,7 @@
    *
    * Completes with a [Upload].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3922,7 +3654,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -3939,7 +3671,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/customDataSources/' + common_internal.Escaper.ecapeVariable('$customDataSourceId') + '/uploads/' + common_internal.Escaper.ecapeVariable('$uploadId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/customDataSources/' + commons.Escaper.ecapeVariable('$customDataSourceId') + '/uploads/' + commons.Escaper.ecapeVariable('$uploadId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3972,7 +3704,7 @@
    *
    * Completes with a [Uploads].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3983,7 +3715,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -4003,7 +3735,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/customDataSources/' + common_internal.Escaper.ecapeVariable('$customDataSourceId') + '/uploads';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/customDataSources/' + commons.Escaper.ecapeVariable('$customDataSourceId') + '/uploads';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -4016,58 +3748,6 @@
   }
 
   /**
-   * Migrate custom data source and data imports to latest version.
-   *
-   * Request parameters:
-   *
-   * [accountId] - Account Id for migration.
-   * Value must have pattern "\d+".
-   *
-   * [webPropertyId] - Web property Id for migration.
-   * Value must have pattern "UA-(\d+)-(\d+)".
-   *
-   * [customDataSourceId] - Custom data source Id for migration.
-   * Value must have pattern ".{22}".
-   *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
-   * error.
-   *
-   * If the used [http.Client] completes with an error when making a REST call,
-   * this method  will complete with the same error.
-   */
-  async.Future migrateDataImport(core.String accountId, core.String webPropertyId, core.String customDataSourceId) {
-    var _url = null;
-    var _queryParams = new core.Map();
-    var _uploadMedia = null;
-    var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
-    var _body = null;
-
-    if (accountId == null) {
-      throw new core.ArgumentError("Parameter accountId is required.");
-    }
-    if (webPropertyId == null) {
-      throw new core.ArgumentError("Parameter webPropertyId is required.");
-    }
-    if (customDataSourceId == null) {
-      throw new core.ArgumentError("Parameter customDataSourceId is required.");
-    }
-
-    _downloadOptions = null;
-
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/customDataSources/' + common_internal.Escaper.ecapeVariable('$customDataSourceId') + '/migrateDataImport';
-
-    var _response = _requester.request(_url,
-                                       "POST",
-                                       body: _body,
-                                       queryParams: _queryParams,
-                                       uploadOptions: _uploadOptions,
-                                       uploadMedia: _uploadMedia,
-                                       downloadOptions: _downloadOptions);
-    return _response.then((data) => null);
-  }
-
-  /**
    * Upload data for a custom data source.
    *
    * Request parameters:
@@ -4088,18 +3768,18 @@
    *
    * Completes with a [Upload].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<Upload> uploadData(core.String accountId, core.String webPropertyId, core.String customDataSourceId, {common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<Upload> uploadData(core.String accountId, core.String webPropertyId, core.String customDataSourceId, {commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -4116,11 +3796,11 @@
     _uploadOptions =  uploadOptions;
 
     if (_uploadMedia == null) {
-      _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/customDataSources/' + common_internal.Escaper.ecapeVariable('$customDataSourceId') + '/uploads';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/analytics/v3/management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/customDataSources/' + common_internal.Escaper.ecapeVariable('$customDataSourceId') + '/uploads';
+      _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/customDataSources/' + commons.Escaper.ecapeVariable('$customDataSourceId') + '/uploads';
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/analytics/v3/management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/customDataSources/' + commons.Escaper.ecapeVariable('$customDataSourceId') + '/uploads';
     } else {
-      _url = '/upload/analytics/v3/management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/customDataSources/' + common_internal.Escaper.ecapeVariable('$customDataSourceId') + '/uploads';
+      _url = '/upload/analytics/v3/management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/customDataSources/' + commons.Escaper.ecapeVariable('$customDataSourceId') + '/uploads';
     }
 
 
@@ -4137,11 +3817,10 @@
 }
 
 
-/** Not documented yet. */
 class ManagementWebPropertyAdWordsLinksResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ManagementWebPropertyAdWordsLinksResourceApi(common_internal.ApiRequester client) : 
+  ManagementWebPropertyAdWordsLinksResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -4155,7 +3834,7 @@
    *
    * [webPropertyAdWordsLinkId] - Web property AdWords link ID.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4166,7 +3845,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -4181,7 +3860,7 @@
 
     _downloadOptions = null;
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/entityAdWordsLinks/' + common_internal.Escaper.ecapeVariable('$webPropertyAdWordsLinkId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/entityAdWordsLinks/' + commons.Escaper.ecapeVariable('$webPropertyAdWordsLinkId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -4206,7 +3885,7 @@
    *
    * Completes with a [EntityAdWordsLink].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4217,7 +3896,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -4231,7 +3910,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/entityAdWordsLinks/' + common_internal.Escaper.ecapeVariable('$webPropertyAdWordsLinkId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/entityAdWordsLinks/' + commons.Escaper.ecapeVariable('$webPropertyAdWordsLinkId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -4256,7 +3935,7 @@
    *
    * Completes with a [EntityAdWordsLink].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4267,7 +3946,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -4281,7 +3960,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/entityAdWordsLinks';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/entityAdWordsLinks';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -4312,7 +3991,7 @@
    *
    * Completes with a [EntityAdWordsLinks].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4323,7 +4002,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -4340,7 +4019,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/entityAdWordsLinks';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/entityAdWordsLinks';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -4368,7 +4047,7 @@
    *
    * Completes with a [EntityAdWordsLink].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4379,7 +4058,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -4396,7 +4075,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/entityAdWordsLinks/' + common_internal.Escaper.ecapeVariable('$webPropertyAdWordsLinkId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/entityAdWordsLinks/' + commons.Escaper.ecapeVariable('$webPropertyAdWordsLinkId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -4423,7 +4102,7 @@
    *
    * Completes with a [EntityAdWordsLink].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4434,7 +4113,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -4451,7 +4130,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/entityAdWordsLinks/' + common_internal.Escaper.ecapeVariable('$webPropertyAdWordsLinkId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/entityAdWordsLinks/' + commons.Escaper.ecapeVariable('$webPropertyAdWordsLinkId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -4466,11 +4145,10 @@
 }
 
 
-/** Not documented yet. */
 class ManagementWebpropertiesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ManagementWebpropertiesResourceApi(common_internal.ApiRequester client) : 
+  ManagementWebpropertiesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -4486,7 +4164,7 @@
    *
    * Completes with a [Webproperty].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4497,7 +4175,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -4508,7 +4186,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -4533,7 +4211,7 @@
    *
    * Completes with a [Webproperty].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4544,7 +4222,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -4555,7 +4233,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -4584,7 +4262,7 @@
    *
    * Completes with a [Webproperties].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4595,7 +4273,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -4609,7 +4287,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -4634,7 +4312,7 @@
    *
    * Completes with a [Webproperty].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4645,7 +4323,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -4659,7 +4337,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -4684,7 +4362,7 @@
    *
    * Completes with a [Webproperty].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4695,7 +4373,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -4709,7 +4387,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -4724,11 +4402,10 @@
 }
 
 
-/** Not documented yet. */
 class ManagementWebpropertyUserLinksResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ManagementWebpropertyUserLinksResourceApi(common_internal.ApiRequester client) : 
+  ManagementWebpropertyUserLinksResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -4742,7 +4419,7 @@
    *
    * [linkId] - Link ID to delete the user link for.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4753,7 +4430,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -4768,7 +4445,7 @@
 
     _downloadOptions = null;
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/entityUserLinks/' + common_internal.Escaper.ecapeVariable('$linkId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/entityUserLinks/' + commons.Escaper.ecapeVariable('$linkId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -4793,7 +4470,7 @@
    *
    * Completes with a [EntityUserLink].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4804,7 +4481,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -4818,7 +4495,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/entityUserLinks';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/entityUserLinks';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -4850,7 +4527,7 @@
    *
    * Completes with a [EntityUserLinks].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4861,7 +4538,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -4878,7 +4555,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/entityUserLinks';
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/entityUserLinks';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -4905,7 +4582,7 @@
    *
    * Completes with a [EntityUserLink].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4916,7 +4593,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -4933,7 +4610,7 @@
     }
 
 
-    _url = 'management/accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/webproperties/' + common_internal.Escaper.ecapeVariable('$webPropertyId') + '/entityUserLinks/' + common_internal.Escaper.ecapeVariable('$linkId');
+    _url = 'management/accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/webproperties/' + commons.Escaper.ecapeVariable('$webPropertyId') + '/entityUserLinks/' + commons.Escaper.ecapeVariable('$linkId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -4948,22 +4625,20 @@
 }
 
 
-/** Not documented yet. */
 class MetadataResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   MetadataColumnsResourceApi get columns => new MetadataColumnsResourceApi(_requester);
 
-  MetadataResourceApi(common_internal.ApiRequester client) : 
+  MetadataResourceApi(commons.ApiRequester client) : 
       _requester = client;
 }
 
 
-/** Not documented yet. */
 class MetadataColumnsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  MetadataColumnsResourceApi(common_internal.ApiRequester client) : 
+  MetadataColumnsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -4977,7 +4652,7 @@
    *
    * Completes with a [Columns].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4988,7 +4663,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (reportType == null) {
@@ -4996,7 +4671,7 @@
     }
 
 
-    _url = 'metadata/' + common_internal.Escaper.ecapeVariable('$reportType') + '/columns';
+    _url = 'metadata/' + commons.Escaper.ecapeVariable('$reportType') + '/columns';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -5011,11 +4686,10 @@
 }
 
 
-/** Not documented yet. */
 class ProvisioningResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ProvisioningResourceApi(common_internal.ApiRequester client) : 
+  ProvisioningResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -5027,7 +4701,7 @@
    *
    * Completes with a [AccountTicket].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5038,7 +4712,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -5775,7 +5449,6 @@
 }
 
 
-/** Not documented yet. */
 class CustomDataSourceChildLink {
   /**
    * Link to the list of daily uploads for this custom data source. Link to the
@@ -5852,7 +5525,6 @@
   /** Account ID to which this custom data source belongs. */
   core.String accountId;
 
-  /** Not documented yet. */
   CustomDataSourceChildLink childLink;
 
   /** Time this custom data source was created. */
@@ -5864,7 +5536,6 @@
   /** Custom data source ID. */
   core.String id;
 
-  /** Not documented yet. */
   core.String importBehavior;
 
   /** Resource type for Analytics custom data source. */
@@ -5891,7 +5562,6 @@
   /** Time this custom data source was last modified. */
   core.DateTime updated;
 
-  /** Not documented yet. */
   core.String uploadType;
 
   /**
@@ -6666,380 +6336,8 @@
 }
 
 
-/**
- * Parent link for a daily upload. Points to the custom data source to which
- * this daily upload belongs.
- */
-class DailyUploadParentLink {
-  /** Link to the custom data source to which this daily upload belongs. */
-  core.String href;
-
-  /** Value is "analytics#customDataSource". */
-  core.String type;
-
-
-  DailyUploadParentLink();
-
-  DailyUploadParentLink.fromJson(core.Map _json) {
-    if (_json.containsKey("href")) {
-      href = _json["href"];
-    }
-    if (_json.containsKey("type")) {
-      type = _json["type"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (href != null) {
-      _json["href"] = href;
-    }
-    if (type != null) {
-      _json["type"] = type;
-    }
-    return _json;
-  }
-}
-
-
-/** Not documented yet. */
-class DailyUploadRecentChanges {
-  /** The type of change: APPEND, RESET, or DELETE. */
-  core.String change;
-
-  /** The time when the change occurred. */
-  core.DateTime time;
-
-
-  DailyUploadRecentChanges();
-
-  DailyUploadRecentChanges.fromJson(core.Map _json) {
-    if (_json.containsKey("change")) {
-      change = _json["change"];
-    }
-    if (_json.containsKey("time")) {
-      time = core.DateTime.parse(_json["time"]);
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (change != null) {
-      _json["change"] = change;
-    }
-    if (time != null) {
-      _json["time"] = (time).toIso8601String();
-    }
-    return _json;
-  }
-}
-
-
-/** Metadata for daily upload entity. */
-class DailyUpload {
-  /** Account ID to which this daily upload belongs. */
-  core.String accountId;
-
-  /** Number of appends for this date. */
-  core.int appendCount;
-
-  /** Time this daily upload was created. */
-  core.DateTime createdTime;
-
-  /** Custom data source ID to which this daily upload belongs. */
-  core.String customDataSourceId;
-
-  /** Date associated with daily upload. */
-  core.String date;
-
-  /** Resource type for Analytics daily upload. */
-  core.String kind;
-
-  /** Time this daily upload was last modified. */
-  core.DateTime modifiedTime;
-
-  /**
-   * Parent link for a daily upload. Points to the custom data source to which
-   * this daily upload belongs.
-   */
-  DailyUploadParentLink parentLink;
-
-  /** Change log for last 10 changes in chronological order. */
-  core.List<DailyUploadRecentChanges> recentChanges;
-
-  /** Link for this daily upload. */
-  core.String selfLink;
-
-  /**
-   * Web property ID of the form UA-XXXXX-YY to which this daily upload belongs.
-   */
-  core.String webPropertyId;
-
-
-  DailyUpload();
-
-  DailyUpload.fromJson(core.Map _json) {
-    if (_json.containsKey("accountId")) {
-      accountId = _json["accountId"];
-    }
-    if (_json.containsKey("appendCount")) {
-      appendCount = _json["appendCount"];
-    }
-    if (_json.containsKey("createdTime")) {
-      createdTime = core.DateTime.parse(_json["createdTime"]);
-    }
-    if (_json.containsKey("customDataSourceId")) {
-      customDataSourceId = _json["customDataSourceId"];
-    }
-    if (_json.containsKey("date")) {
-      date = _json["date"];
-    }
-    if (_json.containsKey("kind")) {
-      kind = _json["kind"];
-    }
-    if (_json.containsKey("modifiedTime")) {
-      modifiedTime = core.DateTime.parse(_json["modifiedTime"]);
-    }
-    if (_json.containsKey("parentLink")) {
-      parentLink = new DailyUploadParentLink.fromJson(_json["parentLink"]);
-    }
-    if (_json.containsKey("recentChanges")) {
-      recentChanges = _json["recentChanges"].map((value) => new DailyUploadRecentChanges.fromJson(value)).toList();
-    }
-    if (_json.containsKey("selfLink")) {
-      selfLink = _json["selfLink"];
-    }
-    if (_json.containsKey("webPropertyId")) {
-      webPropertyId = _json["webPropertyId"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (accountId != null) {
-      _json["accountId"] = accountId;
-    }
-    if (appendCount != null) {
-      _json["appendCount"] = appendCount;
-    }
-    if (createdTime != null) {
-      _json["createdTime"] = (createdTime).toIso8601String();
-    }
-    if (customDataSourceId != null) {
-      _json["customDataSourceId"] = customDataSourceId;
-    }
-    if (date != null) {
-      _json["date"] = date;
-    }
-    if (kind != null) {
-      _json["kind"] = kind;
-    }
-    if (modifiedTime != null) {
-      _json["modifiedTime"] = (modifiedTime).toIso8601String();
-    }
-    if (parentLink != null) {
-      _json["parentLink"] = (parentLink).toJson();
-    }
-    if (recentChanges != null) {
-      _json["recentChanges"] = recentChanges.map((value) => (value).toJson()).toList();
-    }
-    if (selfLink != null) {
-      _json["selfLink"] = selfLink;
-    }
-    if (webPropertyId != null) {
-      _json["webPropertyId"] = webPropertyId;
-    }
-    return _json;
-  }
-}
-
-
-/** Metadata returned for a successful append operation. */
-class DailyUploadAppend {
-  /** Account Id to which this daily upload append belongs. */
-  core.String accountId;
-
-  /** Append number. */
-  core.int appendNumber;
-
-  /** Custom data source Id to which this daily upload append belongs. */
-  core.String customDataSourceId;
-
-  /** Date associated with daily upload append. */
-  core.String date;
-
-  /** Resource type for Analytics daily upload append. */
-  core.String kind;
-
-  /** Not documented yet. */
-  core.String nextAppendLink;
-
-  /**
-   * Web property Id of the form UA-XXXXX-YY to which this daily upload append
-   * belongs.
-   */
-  core.String webPropertyId;
-
-
-  DailyUploadAppend();
-
-  DailyUploadAppend.fromJson(core.Map _json) {
-    if (_json.containsKey("accountId")) {
-      accountId = _json["accountId"];
-    }
-    if (_json.containsKey("appendNumber")) {
-      appendNumber = _json["appendNumber"];
-    }
-    if (_json.containsKey("customDataSourceId")) {
-      customDataSourceId = _json["customDataSourceId"];
-    }
-    if (_json.containsKey("date")) {
-      date = _json["date"];
-    }
-    if (_json.containsKey("kind")) {
-      kind = _json["kind"];
-    }
-    if (_json.containsKey("nextAppendLink")) {
-      nextAppendLink = _json["nextAppendLink"];
-    }
-    if (_json.containsKey("webPropertyId")) {
-      webPropertyId = _json["webPropertyId"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (accountId != null) {
-      _json["accountId"] = accountId;
-    }
-    if (appendNumber != null) {
-      _json["appendNumber"] = appendNumber;
-    }
-    if (customDataSourceId != null) {
-      _json["customDataSourceId"] = customDataSourceId;
-    }
-    if (date != null) {
-      _json["date"] = date;
-    }
-    if (kind != null) {
-      _json["kind"] = kind;
-    }
-    if (nextAppendLink != null) {
-      _json["nextAppendLink"] = nextAppendLink;
-    }
-    if (webPropertyId != null) {
-      _json["webPropertyId"] = webPropertyId;
-    }
-    return _json;
-  }
-}
-
-
-/**
- * A daily upload collection lists Analytics daily uploads to which the user has
- * access. Each resource in the collection corresponds to a single Analytics
- * daily upload.
- */
-class DailyUploads {
-  /** A collection of daily uploads. */
-  core.List<DailyUpload> items;
-
-  /**
-   * The maximum number of resources the response can contain, regardless of the
-   * actual number of resources returned. Its value ranges from 1 to 1000 with a
-   * value of 1000 by default, or otherwise specified by the max-results query
-   * parameter.
-   */
-  core.int itemsPerPage;
-
-  /** Collection type. Value is analytics#dailyUploads. */
-  core.String kind;
-
-  /** Link to next page for this daily upload collection. */
-  core.String nextLink;
-
-  /** Link to previous page for this daily upload collection. */
-  core.String previousLink;
-
-  /**
-   * The starting index of the resources, which is 1 by default or otherwise
-   * specified by the start-index query parameter.
-   */
-  core.int startIndex;
-
-  /**
-   * The total number of results for the query, regardless of the number of
-   * results in the response.
-   */
-  core.int totalResults;
-
-  /** Email ID of the authenticated user */
-  core.String username;
-
-
-  DailyUploads();
-
-  DailyUploads.fromJson(core.Map _json) {
-    if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new DailyUpload.fromJson(value)).toList();
-    }
-    if (_json.containsKey("itemsPerPage")) {
-      itemsPerPage = _json["itemsPerPage"];
-    }
-    if (_json.containsKey("kind")) {
-      kind = _json["kind"];
-    }
-    if (_json.containsKey("nextLink")) {
-      nextLink = _json["nextLink"];
-    }
-    if (_json.containsKey("previousLink")) {
-      previousLink = _json["previousLink"];
-    }
-    if (_json.containsKey("startIndex")) {
-      startIndex = _json["startIndex"];
-    }
-    if (_json.containsKey("totalResults")) {
-      totalResults = _json["totalResults"];
-    }
-    if (_json.containsKey("username")) {
-      username = _json["username"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (items != null) {
-      _json["items"] = items.map((value) => (value).toJson()).toList();
-    }
-    if (itemsPerPage != null) {
-      _json["itemsPerPage"] = itemsPerPage;
-    }
-    if (kind != null) {
-      _json["kind"] = kind;
-    }
-    if (nextLink != null) {
-      _json["nextLink"] = nextLink;
-    }
-    if (previousLink != null) {
-      _json["previousLink"] = previousLink;
-    }
-    if (startIndex != null) {
-      _json["startIndex"] = startIndex;
-    }
-    if (totalResults != null) {
-      _json["totalResults"] = totalResults;
-    }
-    if (username != null) {
-      _json["username"] = username;
-    }
-    return _json;
-  }
-}
-
-
 /** Web property being linked. */
 class EntityAdWordsLinkEntity {
-  /** Not documented yet. */
   WebPropertyRef webPropertyRef;
 
 
@@ -7529,7 +6827,6 @@
 }
 
 
-/** Not documented yet. */
 class ExperimentVariations {
   /**
    * The name of the variation. This field is required when creating an
@@ -8782,7 +8079,6 @@
 }
 
 
-/** Not documented yet. */
 class GaDataColumnHeaders {
   /** Column Type. Either DIMENSION or METRIC. */
   core.String columnType;
@@ -8828,15 +8124,11 @@
 }
 
 
-/** Not documented yet. */
 class GaDataDataTableCols {
-  /** Not documented yet. */
   core.String id;
 
-  /** Not documented yet. */
   core.String label;
 
-  /** Not documented yet. */
   core.String type;
 
 
@@ -8870,9 +8162,7 @@
 }
 
 
-/** Not documented yet. */
 class GaDataDataTableRowsC {
-  /** Not documented yet. */
   core.String v;
 
 
@@ -8894,9 +8184,7 @@
 }
 
 
-/** Not documented yet. */
 class GaDataDataTableRows {
-  /** Not documented yet. */
   core.List<GaDataDataTableRowsC> c;
 
 
@@ -8918,12 +8206,9 @@
 }
 
 
-/** Not documented yet. */
 class GaDataDataTable {
-  /** Not documented yet. */
   core.List<GaDataDataTableCols> cols;
 
-  /** Not documented yet. */
   core.List<GaDataDataTableRows> rows;
 
 
@@ -9148,7 +8433,6 @@
   /** Determines if Analytics data contains samples. */
   core.bool containsSampledData;
 
-  /** Not documented yet. */
   GaDataDataTable dataTable;
 
   /** Unique ID for this data response. */
@@ -9318,7 +8602,6 @@
 }
 
 
-/** Not documented yet. */
 class GoalEventDetailsEventConditions {
   /**
    * Type of comparison. Possible values are LESS_THAN, GREATER_THAN or EQUAL.
@@ -9457,7 +8740,6 @@
 }
 
 
-/** Not documented yet. */
 class GoalUrlDestinationDetailsSteps {
   /** Step name. */
   core.String name;
@@ -9920,7 +9202,6 @@
 }
 
 
-/** Not documented yet. */
 class McfDataColumnHeaders {
   /** Column Type. Either DIMENSION or METRIC. */
   core.String columnType;
@@ -10151,7 +9432,6 @@
 }
 
 
-/** Not documented yet. */
 class McfDataRowsConversionPathValue {
   /**
    * Type of an interaction on conversion path. Such as CLICK, IMPRESSION etc.
@@ -11181,7 +10461,6 @@
 }
 
 
-/** Not documented yet. */
 class RealtimeDataColumnHeaders {
   /** Column Type. Either DIMENSION or METRIC. */
   core.String columnType;
@@ -12205,7 +11484,6 @@
   /** User ID. */
   core.String id;
 
-  /** Not documented yet. */
   core.String kind;
 
 
@@ -12754,5 +12032,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/androidenterprise/v1.dart b/generated/googleapis/lib/androidenterprise/v1.dart
new file mode 100644
index 0000000..79a08db
--- /dev/null
+++ b/generated/googleapis/lib/androidenterprise/v1.dart
@@ -0,0 +1,3779 @@
+// This is a generated file (see the discoveryapis_generator project).
+
+library googleapis.androidenterprise.v1;
+
+import 'dart:core' as core;
+import 'dart:collection' as collection_1;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
+
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
+import 'package:http/http.dart' as http;
+
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client androidenterprise/v1';
+
+/**
+ * Allows MDMs/EMMs and enterprises to manage the deployment of apps to Android
+ * for Work users.
+ */
+class AndroidenterpriseApi {
+  /** Manage corporate Android devices */
+  static const AndroidenterpriseScope = "https://www.googleapis.com/auth/androidenterprise";
+
+
+  final commons.ApiRequester _requester;
+
+  CollectionsResourceApi get collections => new CollectionsResourceApi(_requester);
+  CollectionviewersResourceApi get collectionviewers => new CollectionviewersResourceApi(_requester);
+  DevicesResourceApi get devices => new DevicesResourceApi(_requester);
+  EnterprisesResourceApi get enterprises => new EnterprisesResourceApi(_requester);
+  EntitlementsResourceApi get entitlements => new EntitlementsResourceApi(_requester);
+  GrouplicensesResourceApi get grouplicenses => new GrouplicensesResourceApi(_requester);
+  GrouplicenseusersResourceApi get grouplicenseusers => new GrouplicenseusersResourceApi(_requester);
+  InstallsResourceApi get installs => new InstallsResourceApi(_requester);
+  PermissionsResourceApi get permissions => new PermissionsResourceApi(_requester);
+  ProductsResourceApi get products => new ProductsResourceApi(_requester);
+  UsersResourceApi get users => new UsersResourceApi(_requester);
+
+  AndroidenterpriseApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "androidenterprise/v1/"}) :
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
+}
+
+
+class CollectionsResourceApi {
+  final commons.ApiRequester _requester;
+
+  CollectionsResourceApi(commons.ApiRequester client) : 
+      _requester = client;
+
+  /**
+   * Deletes a collection.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [collectionId] - The ID of the collection.
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future delete(core.String enterpriseId, core.String collectionId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (collectionId == null) {
+      throw new core.ArgumentError("Parameter collectionId is required.");
+    }
+
+    _downloadOptions = null;
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/collections/' + commons.Escaper.ecapeVariable('$collectionId');
+
+    var _response = _requester.request(_url,
+                                       "DELETE",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => null);
+  }
+
+  /**
+   * Retrieves the details of a collection.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [collectionId] - The ID of the collection.
+   *
+   * Completes with a [Collection].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Collection> get(core.String enterpriseId, core.String collectionId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (collectionId == null) {
+      throw new core.ArgumentError("Parameter collectionId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/collections/' + commons.Escaper.ecapeVariable('$collectionId');
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Collection.fromJson(data));
+  }
+
+  /**
+   * Creates a new collection.
+   *
+   * [request] - The metadata request object.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * Completes with a [Collection].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Collection> insert(Collection request, core.String enterpriseId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (request != null) {
+      _body = convert.JSON.encode((request).toJson());
+    }
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/collections';
+
+    var _response = _requester.request(_url,
+                                       "POST",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Collection.fromJson(data));
+  }
+
+  /**
+   * Retrieves the IDs of all the collections for an enterprise.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * Completes with a [CollectionsListResponse].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<CollectionsListResponse> list(core.String enterpriseId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/collections';
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new CollectionsListResponse.fromJson(data));
+  }
+
+  /**
+   * Updates a collection. This method supports patch semantics.
+   *
+   * [request] - The metadata request object.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [collectionId] - The ID of the collection.
+   *
+   * Completes with a [Collection].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Collection> patch(Collection request, core.String enterpriseId, core.String collectionId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (request != null) {
+      _body = convert.JSON.encode((request).toJson());
+    }
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (collectionId == null) {
+      throw new core.ArgumentError("Parameter collectionId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/collections/' + commons.Escaper.ecapeVariable('$collectionId');
+
+    var _response = _requester.request(_url,
+                                       "PATCH",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Collection.fromJson(data));
+  }
+
+  /**
+   * Updates a collection.
+   *
+   * [request] - The metadata request object.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [collectionId] - The ID of the collection.
+   *
+   * Completes with a [Collection].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Collection> update(Collection request, core.String enterpriseId, core.String collectionId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (request != null) {
+      _body = convert.JSON.encode((request).toJson());
+    }
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (collectionId == null) {
+      throw new core.ArgumentError("Parameter collectionId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/collections/' + commons.Escaper.ecapeVariable('$collectionId');
+
+    var _response = _requester.request(_url,
+                                       "PUT",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Collection.fromJson(data));
+  }
+
+}
+
+
+class CollectionviewersResourceApi {
+  final commons.ApiRequester _requester;
+
+  CollectionviewersResourceApi(commons.ApiRequester client) : 
+      _requester = client;
+
+  /**
+   * Removes the user from the list of those specifically allowed to see the
+   * collection. If the collection's visibility is set to viewersOnly then only
+   * such users will see the collection.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [collectionId] - The ID of the collection.
+   *
+   * [userId] - The ID of the user.
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future delete(core.String enterpriseId, core.String collectionId, core.String userId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (collectionId == null) {
+      throw new core.ArgumentError("Parameter collectionId is required.");
+    }
+    if (userId == null) {
+      throw new core.ArgumentError("Parameter userId is required.");
+    }
+
+    _downloadOptions = null;
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/collections/' + commons.Escaper.ecapeVariable('$collectionId') + '/users/' + commons.Escaper.ecapeVariable('$userId');
+
+    var _response = _requester.request(_url,
+                                       "DELETE",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => null);
+  }
+
+  /**
+   * Retrieves the ID of the user if they have been specifically allowed to see
+   * the collection. If the collection's visibility is set to viewersOnly then
+   * only these users will see the collection.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [collectionId] - The ID of the collection.
+   *
+   * [userId] - The ID of the user.
+   *
+   * Completes with a [User].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<User> get(core.String enterpriseId, core.String collectionId, core.String userId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (collectionId == null) {
+      throw new core.ArgumentError("Parameter collectionId is required.");
+    }
+    if (userId == null) {
+      throw new core.ArgumentError("Parameter userId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/collections/' + commons.Escaper.ecapeVariable('$collectionId') + '/users/' + commons.Escaper.ecapeVariable('$userId');
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new User.fromJson(data));
+  }
+
+  /**
+   * Retrieves the IDs of the users who have been specifically allowed to see
+   * the collection. If the collection's visibility is set to viewersOnly then
+   * only these users will see the collection.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [collectionId] - The ID of the collection.
+   *
+   * Completes with a [CollectionViewersListResponse].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<CollectionViewersListResponse> list(core.String enterpriseId, core.String collectionId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (collectionId == null) {
+      throw new core.ArgumentError("Parameter collectionId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/collections/' + commons.Escaper.ecapeVariable('$collectionId') + '/users';
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new CollectionViewersListResponse.fromJson(data));
+  }
+
+  /**
+   * Adds the user to the list of those specifically allowed to see the
+   * collection. If the collection's visibility is set to viewersOnly then only
+   * such users will see the collection. This method supports patch semantics.
+   *
+   * [request] - The metadata request object.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [collectionId] - The ID of the collection.
+   *
+   * [userId] - The ID of the user.
+   *
+   * Completes with a [User].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<User> patch(User request, core.String enterpriseId, core.String collectionId, core.String userId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (request != null) {
+      _body = convert.JSON.encode((request).toJson());
+    }
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (collectionId == null) {
+      throw new core.ArgumentError("Parameter collectionId is required.");
+    }
+    if (userId == null) {
+      throw new core.ArgumentError("Parameter userId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/collections/' + commons.Escaper.ecapeVariable('$collectionId') + '/users/' + commons.Escaper.ecapeVariable('$userId');
+
+    var _response = _requester.request(_url,
+                                       "PATCH",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new User.fromJson(data));
+  }
+
+  /**
+   * Adds the user to the list of those specifically allowed to see the
+   * collection. If the collection's visibility is set to viewersOnly then only
+   * such users will see the collection.
+   *
+   * [request] - The metadata request object.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [collectionId] - The ID of the collection.
+   *
+   * [userId] - The ID of the user.
+   *
+   * Completes with a [User].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<User> update(User request, core.String enterpriseId, core.String collectionId, core.String userId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (request != null) {
+      _body = convert.JSON.encode((request).toJson());
+    }
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (collectionId == null) {
+      throw new core.ArgumentError("Parameter collectionId is required.");
+    }
+    if (userId == null) {
+      throw new core.ArgumentError("Parameter userId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/collections/' + commons.Escaper.ecapeVariable('$collectionId') + '/users/' + commons.Escaper.ecapeVariable('$userId');
+
+    var _response = _requester.request(_url,
+                                       "PUT",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new User.fromJson(data));
+  }
+
+}
+
+
+class DevicesResourceApi {
+  final commons.ApiRequester _requester;
+
+  DevicesResourceApi(commons.ApiRequester client) : 
+      _requester = client;
+
+  /**
+   * Retrieves the details of a device.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [userId] - The ID of the user.
+   *
+   * [deviceId] - The ID of the device.
+   *
+   * Completes with a [Device].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Device> get(core.String enterpriseId, core.String userId, core.String deviceId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (userId == null) {
+      throw new core.ArgumentError("Parameter userId is required.");
+    }
+    if (deviceId == null) {
+      throw new core.ArgumentError("Parameter deviceId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/users/' + commons.Escaper.ecapeVariable('$userId') + '/devices/' + commons.Escaper.ecapeVariable('$deviceId');
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Device.fromJson(data));
+  }
+
+  /**
+   * Retrieves whether a device is enabled or disabled for access by the user to
+   * Google services. The device state takes effect only if enforcing EMM
+   * policies on Android devices is enabled in the Google Admin Console.
+   * Otherwise, the device state is ignored and all devices are allowed access
+   * to Google services.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [userId] - The ID of the user.
+   *
+   * [deviceId] - The ID of the device.
+   *
+   * Completes with a [DeviceState].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<DeviceState> getState(core.String enterpriseId, core.String userId, core.String deviceId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (userId == null) {
+      throw new core.ArgumentError("Parameter userId is required.");
+    }
+    if (deviceId == null) {
+      throw new core.ArgumentError("Parameter deviceId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/users/' + commons.Escaper.ecapeVariable('$userId') + '/devices/' + commons.Escaper.ecapeVariable('$deviceId') + '/state';
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new DeviceState.fromJson(data));
+  }
+
+  /**
+   * Retrieves the IDs of all of a user's devices.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [userId] - The ID of the user.
+   *
+   * Completes with a [DevicesListResponse].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<DevicesListResponse> list(core.String enterpriseId, core.String userId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (userId == null) {
+      throw new core.ArgumentError("Parameter userId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/users/' + commons.Escaper.ecapeVariable('$userId') + '/devices';
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new DevicesListResponse.fromJson(data));
+  }
+
+  /**
+   * Sets whether a device is enabled or disabled for access by the user to
+   * Google services. The device state takes effect only if enforcing EMM
+   * policies on Android devices is enabled in the Google Admin Console.
+   * Otherwise, the device state is ignored and all devices are allowed access
+   * to Google services.
+   *
+   * [request] - The metadata request object.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [userId] - The ID of the user.
+   *
+   * [deviceId] - The ID of the device.
+   *
+   * Completes with a [DeviceState].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<DeviceState> setState(DeviceState request, core.String enterpriseId, core.String userId, core.String deviceId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (request != null) {
+      _body = convert.JSON.encode((request).toJson());
+    }
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (userId == null) {
+      throw new core.ArgumentError("Parameter userId is required.");
+    }
+    if (deviceId == null) {
+      throw new core.ArgumentError("Parameter deviceId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/users/' + commons.Escaper.ecapeVariable('$userId') + '/devices/' + commons.Escaper.ecapeVariable('$deviceId') + '/state';
+
+    var _response = _requester.request(_url,
+                                       "PUT",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new DeviceState.fromJson(data));
+  }
+
+}
+
+
+class EnterprisesResourceApi {
+  final commons.ApiRequester _requester;
+
+  EnterprisesResourceApi(commons.ApiRequester client) : 
+      _requester = client;
+
+  /**
+   * Deletes the binding between the MDM and enterprise. This is now deprecated;
+   * use this to unenroll customers that were previously enrolled with the
+   * 'insert' call, then enroll them again with the 'enroll' call.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future delete(core.String enterpriseId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+
+    _downloadOptions = null;
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId');
+
+    var _response = _requester.request(_url,
+                                       "DELETE",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => null);
+  }
+
+  /**
+   * Enrolls an enterprise with the calling MDM.
+   *
+   * [request] - The metadata request object.
+   *
+   * Request parameters:
+   *
+   * [token] - The token provided by the enterprise to register the MDM.
+   *
+   * Completes with a [Enterprise].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Enterprise> enroll(Enterprise request, core.String token) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (request != null) {
+      _body = convert.JSON.encode((request).toJson());
+    }
+    if (token == null) {
+      throw new core.ArgumentError("Parameter token is required.");
+    }
+    _queryParams["token"] = [token];
+
+
+    _url = 'enterprises/enroll';
+
+    var _response = _requester.request(_url,
+                                       "POST",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Enterprise.fromJson(data));
+  }
+
+  /**
+   * Retrieves the name and domain of an enterprise.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * Completes with a [Enterprise].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Enterprise> get(core.String enterpriseId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId');
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Enterprise.fromJson(data));
+  }
+
+  /**
+   * Establishes the binding between the MDM and an enterprise. This is now
+   * deprecated; use enroll instead.
+   *
+   * [request] - The metadata request object.
+   *
+   * Request parameters:
+   *
+   * [token] - The token provided by the enterprise to register the MDM.
+   *
+   * Completes with a [Enterprise].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Enterprise> insert(Enterprise request, core.String token) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (request != null) {
+      _body = convert.JSON.encode((request).toJson());
+    }
+    if (token == null) {
+      throw new core.ArgumentError("Parameter token is required.");
+    }
+    _queryParams["token"] = [token];
+
+
+    _url = 'enterprises';
+
+    var _response = _requester.request(_url,
+                                       "POST",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Enterprise.fromJson(data));
+  }
+
+  /**
+   * Looks up an enterprise by domain name.
+   *
+   * Request parameters:
+   *
+   * [domain] - The exact primary domain name of the enterprise to look up.
+   *
+   * Completes with a [EnterprisesListResponse].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<EnterprisesListResponse> list(core.String domain) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (domain == null) {
+      throw new core.ArgumentError("Parameter domain is required.");
+    }
+    _queryParams["domain"] = [domain];
+
+
+    _url = 'enterprises';
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new EnterprisesListResponse.fromJson(data));
+  }
+
+  /**
+   * Set the account that will be used to authenticate to the API as the
+   * enterprise.
+   *
+   * [request] - The metadata request object.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * Completes with a [EnterpriseAccount].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<EnterpriseAccount> setAccount(EnterpriseAccount request, core.String enterpriseId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (request != null) {
+      _body = convert.JSON.encode((request).toJson());
+    }
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/account';
+
+    var _response = _requester.request(_url,
+                                       "PUT",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new EnterpriseAccount.fromJson(data));
+  }
+
+  /**
+   * Unenrolls an enterprise from the calling MDM.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future unenroll(core.String enterpriseId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+
+    _downloadOptions = null;
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/unenroll';
+
+    var _response = _requester.request(_url,
+                                       "POST",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => null);
+  }
+
+}
+
+
+class EntitlementsResourceApi {
+  final commons.ApiRequester _requester;
+
+  EntitlementsResourceApi(commons.ApiRequester client) : 
+      _requester = client;
+
+  /**
+   * Removes an entitlement to an app for a user and uninstalls it.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [userId] - The ID of the user.
+   *
+   * [entitlementId] - The ID of the entitlement, e.g.
+   * "app:com.google.android.gm".
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future delete(core.String enterpriseId, core.String userId, core.String entitlementId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (userId == null) {
+      throw new core.ArgumentError("Parameter userId is required.");
+    }
+    if (entitlementId == null) {
+      throw new core.ArgumentError("Parameter entitlementId is required.");
+    }
+
+    _downloadOptions = null;
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/users/' + commons.Escaper.ecapeVariable('$userId') + '/entitlements/' + commons.Escaper.ecapeVariable('$entitlementId');
+
+    var _response = _requester.request(_url,
+                                       "DELETE",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => null);
+  }
+
+  /**
+   * Retrieves details of an entitlement.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [userId] - The ID of the user.
+   *
+   * [entitlementId] - The ID of the entitlement, e.g.
+   * "app:com.google.android.gm".
+   *
+   * Completes with a [Entitlement].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Entitlement> get(core.String enterpriseId, core.String userId, core.String entitlementId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (userId == null) {
+      throw new core.ArgumentError("Parameter userId is required.");
+    }
+    if (entitlementId == null) {
+      throw new core.ArgumentError("Parameter entitlementId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/users/' + commons.Escaper.ecapeVariable('$userId') + '/entitlements/' + commons.Escaper.ecapeVariable('$entitlementId');
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Entitlement.fromJson(data));
+  }
+
+  /**
+   * List of all entitlements for the specified user. Only the ID is set.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [userId] - The ID of the user.
+   *
+   * Completes with a [EntitlementsListResponse].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<EntitlementsListResponse> list(core.String enterpriseId, core.String userId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (userId == null) {
+      throw new core.ArgumentError("Parameter userId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/users/' + commons.Escaper.ecapeVariable('$userId') + '/entitlements';
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new EntitlementsListResponse.fromJson(data));
+  }
+
+  /**
+   * Adds or updates an entitlement to an app for a user. This method supports
+   * patch semantics.
+   *
+   * [request] - The metadata request object.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [userId] - The ID of the user.
+   *
+   * [entitlementId] - The ID of the entitlement, e.g.
+   * "app:com.google.android.gm".
+   *
+   * [install] - Set to true to also install the product on all the user's
+   * devices where possible. Failure to install on one or more devices will not
+   * prevent this operation from returning successfully, as long as the
+   * entitlement was successfully assigned to the user.
+   *
+   * Completes with a [Entitlement].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Entitlement> patch(Entitlement request, core.String enterpriseId, core.String userId, core.String entitlementId, {core.bool install}) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (request != null) {
+      _body = convert.JSON.encode((request).toJson());
+    }
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (userId == null) {
+      throw new core.ArgumentError("Parameter userId is required.");
+    }
+    if (entitlementId == null) {
+      throw new core.ArgumentError("Parameter entitlementId is required.");
+    }
+    if (install != null) {
+      _queryParams["install"] = ["${install}"];
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/users/' + commons.Escaper.ecapeVariable('$userId') + '/entitlements/' + commons.Escaper.ecapeVariable('$entitlementId');
+
+    var _response = _requester.request(_url,
+                                       "PATCH",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Entitlement.fromJson(data));
+  }
+
+  /**
+   * Adds or updates an entitlement to an app for a user.
+   *
+   * [request] - The metadata request object.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [userId] - The ID of the user.
+   *
+   * [entitlementId] - The ID of the entitlement, e.g.
+   * "app:com.google.android.gm".
+   *
+   * [install] - Set to true to also install the product on all the user's
+   * devices where possible. Failure to install on one or more devices will not
+   * prevent this operation from returning successfully, as long as the
+   * entitlement was successfully assigned to the user.
+   *
+   * Completes with a [Entitlement].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Entitlement> update(Entitlement request, core.String enterpriseId, core.String userId, core.String entitlementId, {core.bool install}) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (request != null) {
+      _body = convert.JSON.encode((request).toJson());
+    }
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (userId == null) {
+      throw new core.ArgumentError("Parameter userId is required.");
+    }
+    if (entitlementId == null) {
+      throw new core.ArgumentError("Parameter entitlementId is required.");
+    }
+    if (install != null) {
+      _queryParams["install"] = ["${install}"];
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/users/' + commons.Escaper.ecapeVariable('$userId') + '/entitlements/' + commons.Escaper.ecapeVariable('$entitlementId');
+
+    var _response = _requester.request(_url,
+                                       "PUT",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Entitlement.fromJson(data));
+  }
+
+}
+
+
+class GrouplicensesResourceApi {
+  final commons.ApiRequester _requester;
+
+  GrouplicensesResourceApi(commons.ApiRequester client) : 
+      _requester = client;
+
+  /**
+   * Retrieves details of an enterprise's group license for a product.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [groupLicenseId] - The ID of the product the group license is for, e.g.
+   * "app:com.google.android.gm".
+   *
+   * Completes with a [GroupLicense].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<GroupLicense> get(core.String enterpriseId, core.String groupLicenseId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (groupLicenseId == null) {
+      throw new core.ArgumentError("Parameter groupLicenseId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/groupLicenses/' + commons.Escaper.ecapeVariable('$groupLicenseId');
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new GroupLicense.fromJson(data));
+  }
+
+  /**
+   * Retrieves IDs of all products for which the enterprise has a group license.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * Completes with a [GroupLicensesListResponse].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<GroupLicensesListResponse> list(core.String enterpriseId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/groupLicenses';
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new GroupLicensesListResponse.fromJson(data));
+  }
+
+}
+
+
+class GrouplicenseusersResourceApi {
+  final commons.ApiRequester _requester;
+
+  GrouplicenseusersResourceApi(commons.ApiRequester client) : 
+      _requester = client;
+
+  /**
+   * Retrieves the IDs of the users who have been granted entitlements under the
+   * license.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [groupLicenseId] - The ID of the product the group license is for, e.g.
+   * "app:com.google.android.gm".
+   *
+   * Completes with a [GroupLicenseUsersListResponse].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<GroupLicenseUsersListResponse> list(core.String enterpriseId, core.String groupLicenseId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (groupLicenseId == null) {
+      throw new core.ArgumentError("Parameter groupLicenseId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/groupLicenses/' + commons.Escaper.ecapeVariable('$groupLicenseId') + '/users';
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new GroupLicenseUsersListResponse.fromJson(data));
+  }
+
+}
+
+
+class InstallsResourceApi {
+  final commons.ApiRequester _requester;
+
+  InstallsResourceApi(commons.ApiRequester client) : 
+      _requester = client;
+
+  /**
+   * Requests to remove an app from a device. A call to get or list will still
+   * show the app as installed on the device until it is actually removed.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [userId] - The ID of the user.
+   *
+   * [deviceId] - The Android ID of the device.
+   *
+   * [installId] - The ID of the product represented by the install, e.g.
+   * "app:com.google.android.gm".
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future delete(core.String enterpriseId, core.String userId, core.String deviceId, core.String installId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (userId == null) {
+      throw new core.ArgumentError("Parameter userId is required.");
+    }
+    if (deviceId == null) {
+      throw new core.ArgumentError("Parameter deviceId is required.");
+    }
+    if (installId == null) {
+      throw new core.ArgumentError("Parameter installId is required.");
+    }
+
+    _downloadOptions = null;
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/users/' + commons.Escaper.ecapeVariable('$userId') + '/devices/' + commons.Escaper.ecapeVariable('$deviceId') + '/installs/' + commons.Escaper.ecapeVariable('$installId');
+
+    var _response = _requester.request(_url,
+                                       "DELETE",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => null);
+  }
+
+  /**
+   * Retrieves details of an installation of an app on a device.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [userId] - The ID of the user.
+   *
+   * [deviceId] - The Android ID of the device.
+   *
+   * [installId] - The ID of the product represented by the install, e.g.
+   * "app:com.google.android.gm".
+   *
+   * Completes with a [Install].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Install> get(core.String enterpriseId, core.String userId, core.String deviceId, core.String installId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (userId == null) {
+      throw new core.ArgumentError("Parameter userId is required.");
+    }
+    if (deviceId == null) {
+      throw new core.ArgumentError("Parameter deviceId is required.");
+    }
+    if (installId == null) {
+      throw new core.ArgumentError("Parameter installId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/users/' + commons.Escaper.ecapeVariable('$userId') + '/devices/' + commons.Escaper.ecapeVariable('$deviceId') + '/installs/' + commons.Escaper.ecapeVariable('$installId');
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Install.fromJson(data));
+  }
+
+  /**
+   * Retrieves the details of all apps installed on the specified device.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [userId] - The ID of the user.
+   *
+   * [deviceId] - The Android ID of the device.
+   *
+   * Completes with a [InstallsListResponse].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<InstallsListResponse> list(core.String enterpriseId, core.String userId, core.String deviceId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (userId == null) {
+      throw new core.ArgumentError("Parameter userId is required.");
+    }
+    if (deviceId == null) {
+      throw new core.ArgumentError("Parameter deviceId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/users/' + commons.Escaper.ecapeVariable('$userId') + '/devices/' + commons.Escaper.ecapeVariable('$deviceId') + '/installs';
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new InstallsListResponse.fromJson(data));
+  }
+
+  /**
+   * Requests to install the latest version of an app to a device. If the app is
+   * already installed then it is updated to the latest version if necessary.
+   * This method supports patch semantics.
+   *
+   * [request] - The metadata request object.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [userId] - The ID of the user.
+   *
+   * [deviceId] - The Android ID of the device.
+   *
+   * [installId] - The ID of the product represented by the install, e.g.
+   * "app:com.google.android.gm".
+   *
+   * Completes with a [Install].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Install> patch(Install request, core.String enterpriseId, core.String userId, core.String deviceId, core.String installId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (request != null) {
+      _body = convert.JSON.encode((request).toJson());
+    }
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (userId == null) {
+      throw new core.ArgumentError("Parameter userId is required.");
+    }
+    if (deviceId == null) {
+      throw new core.ArgumentError("Parameter deviceId is required.");
+    }
+    if (installId == null) {
+      throw new core.ArgumentError("Parameter installId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/users/' + commons.Escaper.ecapeVariable('$userId') + '/devices/' + commons.Escaper.ecapeVariable('$deviceId') + '/installs/' + commons.Escaper.ecapeVariable('$installId');
+
+    var _response = _requester.request(_url,
+                                       "PATCH",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Install.fromJson(data));
+  }
+
+  /**
+   * Requests to install the latest version of an app to a device. If the app is
+   * already installed then it is updated to the latest version if necessary.
+   *
+   * [request] - The metadata request object.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [userId] - The ID of the user.
+   *
+   * [deviceId] - The Android ID of the device.
+   *
+   * [installId] - The ID of the product represented by the install, e.g.
+   * "app:com.google.android.gm".
+   *
+   * Completes with a [Install].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Install> update(Install request, core.String enterpriseId, core.String userId, core.String deviceId, core.String installId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (request != null) {
+      _body = convert.JSON.encode((request).toJson());
+    }
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (userId == null) {
+      throw new core.ArgumentError("Parameter userId is required.");
+    }
+    if (deviceId == null) {
+      throw new core.ArgumentError("Parameter deviceId is required.");
+    }
+    if (installId == null) {
+      throw new core.ArgumentError("Parameter installId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/users/' + commons.Escaper.ecapeVariable('$userId') + '/devices/' + commons.Escaper.ecapeVariable('$deviceId') + '/installs/' + commons.Escaper.ecapeVariable('$installId');
+
+    var _response = _requester.request(_url,
+                                       "PUT",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Install.fromJson(data));
+  }
+
+}
+
+
+class PermissionsResourceApi {
+  final commons.ApiRequester _requester;
+
+  PermissionsResourceApi(commons.ApiRequester client) : 
+      _requester = client;
+
+  /**
+   * Retrieves details of an Android app permission for display to an enterprise
+   * admin.
+   *
+   * Request parameters:
+   *
+   * [permissionId] - The ID of the permission.
+   *
+   * [language] - The BCP47 tag for the user's preferred language (e.g. "en-US",
+   * "de")
+   *
+   * Completes with a [Permission].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Permission> get(core.String permissionId, {core.String language}) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (permissionId == null) {
+      throw new core.ArgumentError("Parameter permissionId is required.");
+    }
+    if (language != null) {
+      _queryParams["language"] = [language];
+    }
+
+
+    _url = 'permissions/' + commons.Escaper.ecapeVariable('$permissionId');
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Permission.fromJson(data));
+  }
+
+}
+
+
+class ProductsResourceApi {
+  final commons.ApiRequester _requester;
+
+  ProductsResourceApi(commons.ApiRequester client) : 
+      _requester = client;
+
+  /**
+   * Retrieves details of a product for display to an enterprise admin.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [productId] - The ID of the product, e.g. "app:com.google.android.gm".
+   *
+   * [language] - The BCP47 tag for the user's preferred language (e.g. "en-US",
+   * "de").
+   *
+   * Completes with a [Product].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Product> get(core.String enterpriseId, core.String productId, {core.String language}) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (productId == null) {
+      throw new core.ArgumentError("Parameter productId is required.");
+    }
+    if (language != null) {
+      _queryParams["language"] = [language];
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/products/' + commons.Escaper.ecapeVariable('$productId');
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Product.fromJson(data));
+  }
+
+  /**
+   * Retrieves the schema defining app restrictions configurable for this
+   * product. All products have a schema, but this may be empty if no app
+   * restrictions are defined.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [productId] - The ID of the product.
+   *
+   * [language] - The BCP47 tag for the user's preferred language (e.g. "en-US",
+   * "de").
+   *
+   * Completes with a [AppRestrictionsSchema].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<AppRestrictionsSchema> getAppRestrictionsSchema(core.String enterpriseId, core.String productId, {core.String language}) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (productId == null) {
+      throw new core.ArgumentError("Parameter productId is required.");
+    }
+    if (language != null) {
+      _queryParams["language"] = [language];
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/products/' + commons.Escaper.ecapeVariable('$productId') + '/appRestrictionsSchema';
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new AppRestrictionsSchema.fromJson(data));
+  }
+
+  /**
+   * Retrieves the Android app permissions required by this app.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [productId] - The ID of the product.
+   *
+   * Completes with a [ProductPermissions].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<ProductPermissions> getPermissions(core.String enterpriseId, core.String productId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (productId == null) {
+      throw new core.ArgumentError("Parameter productId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/products/' + commons.Escaper.ecapeVariable('$productId') + '/permissions';
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new ProductPermissions.fromJson(data));
+  }
+
+  /**
+   * Updates the set of Android app permissions for this app that have been
+   * accepted by the enterprise.
+   *
+   * [request] - The metadata request object.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [productId] - The ID of the product.
+   *
+   * Completes with a [ProductPermissions].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<ProductPermissions> updatePermissions(ProductPermissions request, core.String enterpriseId, core.String productId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (request != null) {
+      _body = convert.JSON.encode((request).toJson());
+    }
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (productId == null) {
+      throw new core.ArgumentError("Parameter productId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/products/' + commons.Escaper.ecapeVariable('$productId') + '/permissions';
+
+    var _response = _requester.request(_url,
+                                       "PUT",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new ProductPermissions.fromJson(data));
+  }
+
+}
+
+
+class UsersResourceApi {
+  final commons.ApiRequester _requester;
+
+  UsersResourceApi(commons.ApiRequester client) : 
+      _requester = client;
+
+  /**
+   * Generates a token (activation code) to allow this user to configure their
+   * work account in the Android Setup Wizard. Revokes any previously generated
+   * token.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [userId] - The ID of the user.
+   *
+   * Completes with a [UserToken].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<UserToken> generateToken(core.String enterpriseId, core.String userId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (userId == null) {
+      throw new core.ArgumentError("Parameter userId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/users/' + commons.Escaper.ecapeVariable('$userId') + '/token';
+
+    var _response = _requester.request(_url,
+                                       "POST",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new UserToken.fromJson(data));
+  }
+
+  /**
+   * Retrieves a user's details.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [userId] - The ID of the user.
+   *
+   * Completes with a [User].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<User> get(core.String enterpriseId, core.String userId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (userId == null) {
+      throw new core.ArgumentError("Parameter userId is required.");
+    }
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/users/' + commons.Escaper.ecapeVariable('$userId');
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new User.fromJson(data));
+  }
+
+  /**
+   * Looks up a user by email address.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [email] - The exact primary email address of the user to look up.
+   *
+   * Completes with a [UsersListResponse].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<UsersListResponse> list(core.String enterpriseId, core.String email) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (email == null) {
+      throw new core.ArgumentError("Parameter email is required.");
+    }
+    _queryParams["email"] = [email];
+
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/users';
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new UsersListResponse.fromJson(data));
+  }
+
+  /**
+   * Revokes a previously generated token (activation code) for the user.
+   *
+   * Request parameters:
+   *
+   * [enterpriseId] - The ID of the enterprise.
+   *
+   * [userId] - The ID of the user.
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future revokeToken(core.String enterpriseId, core.String userId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (enterpriseId == null) {
+      throw new core.ArgumentError("Parameter enterpriseId is required.");
+    }
+    if (userId == null) {
+      throw new core.ArgumentError("Parameter userId is required.");
+    }
+
+    _downloadOptions = null;
+
+    _url = 'enterprises/' + commons.Escaper.ecapeVariable('$enterpriseId') + '/users/' + commons.Escaper.ecapeVariable('$userId') + '/token';
+
+    var _response = _requester.request(_url,
+                                       "DELETE",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => null);
+  }
+
+}
+
+
+
+/**
+ * Represents the list of app restrictions available to be pre-configured for
+ * the product.
+ */
+class AppRestrictionsSchema {
+  /** The set of restrictions that make up this schema. */
+  core.List<AppRestrictionsSchemaRestriction> restrictions;
+
+
+  AppRestrictionsSchema();
+
+  AppRestrictionsSchema.fromJson(core.Map _json) {
+    if (_json.containsKey("restrictions")) {
+      restrictions = _json["restrictions"].map((value) => new AppRestrictionsSchemaRestriction.fromJson(value)).toList();
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (restrictions != null) {
+      _json["restrictions"] = restrictions.map((value) => (value).toJson()).toList();
+    }
+    return _json;
+  }
+}
+
+
+/**
+ * A restriction in the App Restriction Schema represents a piece of
+ * configuration that may be pre-applied.
+ */
+class AppRestrictionsSchemaRestriction {
+  /** The default value of the restriction. */
+  AppRestrictionsSchemaRestrictionRestrictionValue defaultValue;
+
+  /**
+   * A longer description of the restriction, giving more detail of what it
+   * affects.
+   */
+  core.String description;
+
+  /**
+   * For choice or multiselect restrictions, the list of possible entries'
+   * human-readable names.
+   */
+  core.List<core.String> entry;
+
+  /**
+   * For choice or multiselect restrictions, the list of possible entries'
+   * machine-readable values.
+   */
+  core.List<core.String> entryValue;
+
+  /**
+   * The unique key that the product uses to identify the restriction, e.g.
+   * "com.google.android.gm.fieldname".
+   */
+  core.String key;
+
+  /** The type of the restriction. */
+  core.String restrictionType;
+
+  /** The name of the restriction. */
+  core.String title;
+
+
+  AppRestrictionsSchemaRestriction();
+
+  AppRestrictionsSchemaRestriction.fromJson(core.Map _json) {
+    if (_json.containsKey("defaultValue")) {
+      defaultValue = new AppRestrictionsSchemaRestrictionRestrictionValue.fromJson(_json["defaultValue"]);
+    }
+    if (_json.containsKey("description")) {
+      description = _json["description"];
+    }
+    if (_json.containsKey("entry")) {
+      entry = _json["entry"];
+    }
+    if (_json.containsKey("entryValue")) {
+      entryValue = _json["entryValue"];
+    }
+    if (_json.containsKey("key")) {
+      key = _json["key"];
+    }
+    if (_json.containsKey("restrictionType")) {
+      restrictionType = _json["restrictionType"];
+    }
+    if (_json.containsKey("title")) {
+      title = _json["title"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (defaultValue != null) {
+      _json["defaultValue"] = (defaultValue).toJson();
+    }
+    if (description != null) {
+      _json["description"] = description;
+    }
+    if (entry != null) {
+      _json["entry"] = entry;
+    }
+    if (entryValue != null) {
+      _json["entryValue"] = entryValue;
+    }
+    if (key != null) {
+      _json["key"] = key;
+    }
+    if (restrictionType != null) {
+      _json["restrictionType"] = restrictionType;
+    }
+    if (title != null) {
+      _json["title"] = title;
+    }
+    return _json;
+  }
+}
+
+
+/** A typed value for the restriction. */
+class AppRestrictionsSchemaRestrictionRestrictionValue {
+  /** The type of the value being provided. */
+  core.String type;
+
+  /** The boolean value - this will only be present if type is bool. */
+  core.bool valueBool;
+
+  /** The integer value - this will only be present if type is integer. */
+  core.int valueInteger;
+
+  /**
+   * The list of string values - this will only be present if type is
+   * multiselect.
+   */
+  core.List<core.String> valueMultiselect;
+
+  /**
+   * The string value - this will be present for types string, choice and
+   * hidden.
+   */
+  core.String valueString;
+
+
+  AppRestrictionsSchemaRestrictionRestrictionValue();
+
+  AppRestrictionsSchemaRestrictionRestrictionValue.fromJson(core.Map _json) {
+    if (_json.containsKey("type")) {
+      type = _json["type"];
+    }
+    if (_json.containsKey("valueBool")) {
+      valueBool = _json["valueBool"];
+    }
+    if (_json.containsKey("valueInteger")) {
+      valueInteger = _json["valueInteger"];
+    }
+    if (_json.containsKey("valueMultiselect")) {
+      valueMultiselect = _json["valueMultiselect"];
+    }
+    if (_json.containsKey("valueString")) {
+      valueString = _json["valueString"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (type != null) {
+      _json["type"] = type;
+    }
+    if (valueBool != null) {
+      _json["valueBool"] = valueBool;
+    }
+    if (valueInteger != null) {
+      _json["valueInteger"] = valueInteger;
+    }
+    if (valueMultiselect != null) {
+      _json["valueMultiselect"] = valueMultiselect;
+    }
+    if (valueString != null) {
+      _json["valueString"] = valueString;
+    }
+    return _json;
+  }
+}
+
+
+/**
+ * A collection resource defines a named set of apps that is visible to a set of
+ * users in the Google Play Store app running on those users' managed devices.
+ * Those users can then install any of those apps if they wish (which will
+ * trigger creation of install and entitlement resources). A user cannot install
+ * an app on a managed device unless the app is listed in at least one
+ * collection that is visible to that user.
+ *
+ * Note that the API can be used to directly install an app regardless of
+ * whether it is in any collection - so an enterprise has a choice of either
+ * directly pushing apps to users, or allowing users to install apps if they
+ * want. Which is appropriate will depend on the enterprise's policies and the
+ * purpose of the apps concerned.
+ */
+class Collection {
+  /** Arbitrary unique ID, allocated by the API on creation. */
+  core.String collectionId;
+
+  /**
+   * Identifies what kind of resource this is. Value: the fixed string
+   * "androidenterprise#collection".
+   */
+  core.String kind;
+
+  /**
+   * A user-friendly name for the collection (should be unique), e.g.
+   * "Accounting apps".
+   */
+  core.String name;
+
+  /**
+   * The IDs of the products in the collection, in the order in which they
+   * should be displayed.
+   */
+  core.List<core.String> productId;
+
+  /**
+   * Whether this collection is visible to all users, or only to the users that
+   * have been granted access through the collection_viewers api. Even if a
+   * collection is visible to allUsers, it is possible to add and remove
+   * viewers, but this will have no effect until the collection's visibility
+   * changes to viewersOnly.
+   */
+  core.String visibility;
+
+
+  Collection();
+
+  Collection.fromJson(core.Map _json) {
+    if (_json.containsKey("collectionId")) {
+      collectionId = _json["collectionId"];
+    }
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+    if (_json.containsKey("name")) {
+      name = _json["name"];
+    }
+    if (_json.containsKey("productId")) {
+      productId = _json["productId"];
+    }
+    if (_json.containsKey("visibility")) {
+      visibility = _json["visibility"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (collectionId != null) {
+      _json["collectionId"] = collectionId;
+    }
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    if (name != null) {
+      _json["name"] = name;
+    }
+    if (productId != null) {
+      _json["productId"] = productId;
+    }
+    if (visibility != null) {
+      _json["visibility"] = visibility;
+    }
+    return _json;
+  }
+}
+
+
+/** The user resources for the collection. */
+class CollectionViewersListResponse {
+  /**
+   * Identifies what kind of resource this is. Value: the fixed string
+   * "androidenterprise#collectionViewersListResponse".
+   */
+  core.String kind;
+
+  /** A user of an enterprise. */
+  core.List<User> user;
+
+
+  CollectionViewersListResponse();
+
+  CollectionViewersListResponse.fromJson(core.Map _json) {
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+    if (_json.containsKey("user")) {
+      user = _json["user"].map((value) => new User.fromJson(value)).toList();
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    if (user != null) {
+      _json["user"] = user.map((value) => (value).toJson()).toList();
+    }
+    return _json;
+  }
+}
+
+
+/** The collection resources for the enterprise. */
+class CollectionsListResponse {
+  /**
+   * An ordered collection of products which can be made visible on the Google
+   * Play Store app to a selected group of users.
+   */
+  core.List<Collection> collection;
+
+  /**
+   * Identifies what kind of resource this is. Value: the fixed string
+   * "androidenterprise#collectionsListResponse".
+   */
+  core.String kind;
+
+
+  CollectionsListResponse();
+
+  CollectionsListResponse.fromJson(core.Map _json) {
+    if (_json.containsKey("collection")) {
+      collection = _json["collection"].map((value) => new Collection.fromJson(value)).toList();
+    }
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (collection != null) {
+      _json["collection"] = collection.map((value) => (value).toJson()).toList();
+    }
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    return _json;
+  }
+}
+
+
+/**
+ * A device resource represents a mobile device managed by the MDM and belonging
+ * to a specific enterprise user.
+ *
+ * This collection cannot be modified via the API; it is automatically populated
+ * as devices are set up to be managed.
+ */
+class Device {
+  /**
+   * The Google Play Services Android ID for the device encoded as a lowercase
+   * hex string, e.g. "123456789abcdef0".
+   */
+  core.String androidId;
+
+  /**
+   * Identifies what kind of resource this is. Value: the fixed string
+   * "androidenterprise#device".
+   */
+  core.String kind;
+
+
+  Device();
+
+  Device.fromJson(core.Map _json) {
+    if (_json.containsKey("androidId")) {
+      androidId = _json["androidId"];
+    }
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (androidId != null) {
+      _json["androidId"] = androidId;
+    }
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    return _json;
+  }
+}
+
+
+/**
+ * The state of a user's device, as accessed by the getState and setState
+ * methods on device resources.
+ */
+class DeviceState {
+  /**
+   * The state of the Google account on the device. "enabled" indicates that the
+   * Google account on the device can be used to access Google services
+   * (including Google Play), while "disabled" means that it cannot. A new
+   * device is initially in the "disabled" state.
+   */
+  core.String accountState;
+
+  /**
+   * Identifies what kind of resource this is. Value: the fixed string
+   * "androidenterprise#deviceState".
+   */
+  core.String kind;
+
+
+  DeviceState();
+
+  DeviceState.fromJson(core.Map _json) {
+    if (_json.containsKey("accountState")) {
+      accountState = _json["accountState"];
+    }
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (accountState != null) {
+      _json["accountState"] = accountState;
+    }
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    return _json;
+  }
+}
+
+
+/** The device resources for the user. */
+class DevicesListResponse {
+  /** A managed device. */
+  core.List<Device> device;
+
+  /**
+   * Identifies what kind of resource this is. Value: the fixed string
+   * "androidenterprise#devicesListResponse".
+   */
+  core.String kind;
+
+
+  DevicesListResponse();
+
+  DevicesListResponse.fromJson(core.Map _json) {
+    if (_json.containsKey("device")) {
+      device = _json["device"].map((value) => new Device.fromJson(value)).toList();
+    }
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (device != null) {
+      _json["device"] = device.map((value) => (value).toJson()).toList();
+    }
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    return _json;
+  }
+}
+
+
+/**
+ * An enterprise resource represents a binding between an organisation and their
+ * MDM.
+ *
+ * To create an enterprise, an admin of the enterprise must first go through a
+ * Play for Work sign-up flow. At the end of this the admin will be presented
+ * with a token (a short opaque alphanumeric string). They must then present
+ * this to the MDM, who then supplies it to the enroll method. Until this is
+ * done the MDM will not have any access to the enterprise.
+ *
+ * After calling enroll the MDM should call setAccount to specify the service
+ * account that will be allowed to act on behalf of the enterprise, which will
+ * be required for access to the enterprise's data through this API. Only one
+ * call of setAccount is allowed for a given enterprise; the only way to change
+ * the account later is to unenroll the enterprise and enroll it again
+ * (obtaining a new token).
+ *
+ * The MDM can unenroll an enterprise in order to sever the binding between
+ * them. Re-enrolling an enterprise is possible, but requires a new token to be
+ * retrieved. Enterprises.unenroll requires the MDM's credentials (as enroll
+ * does), not the enterprise's. Enterprises.unenroll can only be used for
+ * enterprises that were previously enrolled with the enroll call. Any
+ * enterprises that were enrolled using the (deprecated) Enterprises.insert call
+ * must be unenrolled with Enterprises.delete and can then be re-enrolled using
+ * the Enterprises.enroll call.
+ *
+ * The ID for an enterprise is an opaque string. It is returned by insert and
+ * enroll and can also be retrieved if the enterprise's primary domain is known
+ * using the list method.
+ */
+class Enterprise {
+  /** The unique ID for the enterprise. */
+  core.String id;
+
+  /**
+   * Identifies what kind of resource this is. Value: the fixed string
+   * "androidenterprise#enterprise".
+   */
+  core.String kind;
+
+  /** The name of the enterprise, e.g. "Example Inc". */
+  core.String name;
+
+  /** The enterprise's primary domain, e.g. "example.com". */
+  core.String primaryDomain;
+
+
+  Enterprise();
+
+  Enterprise.fromJson(core.Map _json) {
+    if (_json.containsKey("id")) {
+      id = _json["id"];
+    }
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+    if (_json.containsKey("name")) {
+      name = _json["name"];
+    }
+    if (_json.containsKey("primaryDomain")) {
+      primaryDomain = _json["primaryDomain"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (id != null) {
+      _json["id"] = id;
+    }
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    if (name != null) {
+      _json["name"] = name;
+    }
+    if (primaryDomain != null) {
+      _json["primaryDomain"] = primaryDomain;
+    }
+    return _json;
+  }
+}
+
+
+/**
+ * A service account that can be used to authenticate as the enterprise to API
+ * calls that require such authentication.
+ */
+class EnterpriseAccount {
+  /** The email address of the service account. */
+  core.String accountEmail;
+
+  /**
+   * Identifies what kind of resource this is. Value: the fixed string
+   * "androidenterprise#enterpriseAccount".
+   */
+  core.String kind;
+
+
+  EnterpriseAccount();
+
+  EnterpriseAccount.fromJson(core.Map _json) {
+    if (_json.containsKey("accountEmail")) {
+      accountEmail = _json["accountEmail"];
+    }
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (accountEmail != null) {
+      _json["accountEmail"] = accountEmail;
+    }
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    return _json;
+  }
+}
+
+
+/** The matching enterprise resources. */
+class EnterprisesListResponse {
+  /** An enterprise. */
+  core.List<Enterprise> enterprise;
+
+  /**
+   * Identifies what kind of resource this is. Value: the fixed string
+   * "androidenterprise#enterprisesListResponse".
+   */
+  core.String kind;
+
+
+  EnterprisesListResponse();
+
+  EnterprisesListResponse.fromJson(core.Map _json) {
+    if (_json.containsKey("enterprise")) {
+      enterprise = _json["enterprise"].map((value) => new Enterprise.fromJson(value)).toList();
+    }
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (enterprise != null) {
+      _json["enterprise"] = enterprise.map((value) => (value).toJson()).toList();
+    }
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    return _json;
+  }
+}
+
+
+/**
+ * The existence of an entitlement resource means that a user has the right to
+ * use a particular app on any of their devices. This might be because the app
+ * is free or because they have been allocated a license to the app from a group
+ * license purchased by the enterprise.
+ *
+ * It should always be true that a user has an app installed on one of their
+ * devices only if they have an entitlement to it. So if an entitlement is
+ * deleted, the app will be uninstalled from all devices. Similarly if the user
+ * installs an app (and is permitted to do so), or the MDM triggers an install
+ * of the app, an entitlement to that app is automatically created. If this is
+ * impossible - e.g. the enterprise has not purchased sufficient licenses - then
+ * installation fails.
+ *
+ * Note that entitlements are always user specific, not device specific; a user
+ * may have an entitlement even though they have not installed the app anywhere.
+ * Once they have an entitlement they can install the app on multiple devices.
+ *
+ * The API can be used to create an entitlement. If the app is a free app, a
+ * group license for that app is created. If it's a paid app, creating the
+ * entitlement consumes one license; it remains consumed until the entitlement
+ * is removed. Optionally an installation of the app on all the user's managed
+ * devices can be triggered at the time the entitlement is created. An
+ * entitlement cannot be created for an app if the app requires permissions that
+ * the enterprise has not yet accepted.
+ *
+ * Entitlements for paid apps that are due to purchases by the user on a
+ * non-managed profile will have "userPurchase" as entitlement reason; those
+ * entitlements cannot be removed via the API.
+ */
+class Entitlement {
+  /**
+   * Identifies what kind of resource this is. Value: the fixed string
+   * "androidenterprise#entitlement".
+   */
+  core.String kind;
+
+  /**
+   * The ID of the product that the entitlement is for, e.g.
+   * "app:com.google.android.gm".
+   */
+  core.String productId;
+
+  /**
+   * The reason for the entitlement, e.g. "free" for free apps. This is
+   * temporary, it will be replaced by the acquisition kind field of group
+   * licenses.
+   */
+  core.String reason;
+
+
+  Entitlement();
+
+  Entitlement.fromJson(core.Map _json) {
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+    if (_json.containsKey("productId")) {
+      productId = _json["productId"];
+    }
+    if (_json.containsKey("reason")) {
+      reason = _json["reason"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    if (productId != null) {
+      _json["productId"] = productId;
+    }
+    if (reason != null) {
+      _json["reason"] = reason;
+    }
+    return _json;
+  }
+}
+
+
+/** The entitlement resources for the user. */
+class EntitlementsListResponse {
+  /**
+   * An entitlement of a user to a product (e.g. an app). For example, a free
+   * app that they have installed, or a paid app that they have been allocated a
+   * license to.
+   */
+  core.List<Entitlement> entitlement;
+
+  /**
+   * Identifies what kind of resource this is. Value: the fixed string
+   * "androidenterprise#entitlementsListResponse".
+   */
+  core.String kind;
+
+
+  EntitlementsListResponse();
+
+  EntitlementsListResponse.fromJson(core.Map _json) {
+    if (_json.containsKey("entitlement")) {
+      entitlement = _json["entitlement"].map((value) => new Entitlement.fromJson(value)).toList();
+    }
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (entitlement != null) {
+      _json["entitlement"] = entitlement.map((value) => (value).toJson()).toList();
+    }
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    return _json;
+  }
+}
+
+
+/**
+ * A group license object indicates a product that an enterprise admin has
+ * approved for use in the enterprise. The product may be free or paid. For free
+ * products, a group license object is created in these cases: if the enterprise
+ * admin approves a product in Google Play, if the product is added to a
+ * collection, or if an entitlement for the product is created for a user via
+ * the API. For paid products, a group license object is only created as part of
+ * the first bulk purchase of that product in Google Play done by the enterprise
+ * admin.
+ *
+ * The API can be used to query group licenses; the available information
+ * includes the total number of licenses purchased (for paid products) and the
+ * total number of licenses that have been provisioned, i.e. the total number of
+ * user entitlements in existence for the product.
+ *
+ * Group license objects are never deleted; if e.g. a free app is added to a
+ * collection and then removed, the group license will remain, allowing to keep
+ * track of any remaining entitlements. An enterprise admin may indicate they
+ * are no longer interested in the group license by marking it as unapproved in
+ * Google Play.
+ */
+class GroupLicense {
+  /**
+   * How this group license was acquired. "bulkPurchase" means that this group
+   * license object was created because the enterprise purchased licenses for
+   * this product; this is "free" otherwise (for free products).
+   */
+  core.String acquisitionKind;
+
+  /**
+   * Whether the product to which this group license relates is currently
+   * approved by the enterprise, as either "approved" or "unapproved". Products
+   * are approved when a group license is first created, but this approval may
+   * be revoked by an enterprise admin via Google Play. Unapproved products will
+   * not be visible to end users in collections and new entitlements to them
+   * should not normally be created.
+   */
+  core.String approval;
+
+  /**
+   * Identifies what kind of resource this is. Value: the fixed string
+   * "androidenterprise#groupLicense".
+   */
+  core.String kind;
+
+  /**
+   * The total number of provisioned licenses for this product. Returned by read
+   * operations, but ignored in write operations.
+   */
+  core.int numProvisioned;
+
+  /**
+   * The number of purchased licenses (possibly in multiple purchases). If this
+   * field is omitted then there is no limit on the number of licenses that can
+   * be provisioned (e.g. if the acquisition kind is "free").
+   */
+  core.int numPurchased;
+
+  /**
+   * The ID of the product that the license is for, e.g.
+   * "app:com.google.android.gm".
+   */
+  core.String productId;
+
+
+  GroupLicense();
+
+  GroupLicense.fromJson(core.Map _json) {
+    if (_json.containsKey("acquisitionKind")) {
+      acquisitionKind = _json["acquisitionKind"];
+    }
+    if (_json.containsKey("approval")) {
+      approval = _json["approval"];
+    }
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+    if (_json.containsKey("numProvisioned")) {
+      numProvisioned = _json["numProvisioned"];
+    }
+    if (_json.containsKey("numPurchased")) {
+      numPurchased = _json["numPurchased"];
+    }
+    if (_json.containsKey("productId")) {
+      productId = _json["productId"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (acquisitionKind != null) {
+      _json["acquisitionKind"] = acquisitionKind;
+    }
+    if (approval != null) {
+      _json["approval"] = approval;
+    }
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    if (numProvisioned != null) {
+      _json["numProvisioned"] = numProvisioned;
+    }
+    if (numPurchased != null) {
+      _json["numPurchased"] = numPurchased;
+    }
+    if (productId != null) {
+      _json["productId"] = productId;
+    }
+    return _json;
+  }
+}
+
+
+/** The user resources for the group license. */
+class GroupLicenseUsersListResponse {
+  /**
+   * Identifies what kind of resource this is. Value: the fixed string
+   * "androidenterprise#groupLicenseUsersListResponse".
+   */
+  core.String kind;
+
+  /** A user of an enterprise. */
+  core.List<User> user;
+
+
+  GroupLicenseUsersListResponse();
+
+  GroupLicenseUsersListResponse.fromJson(core.Map _json) {
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+    if (_json.containsKey("user")) {
+      user = _json["user"].map((value) => new User.fromJson(value)).toList();
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    if (user != null) {
+      _json["user"] = user.map((value) => (value).toJson()).toList();
+    }
+    return _json;
+  }
+}
+
+
+/** The grouplicense resources for the enterprise. */
+class GroupLicensesListResponse {
+  /** A group license for a product approved for use in the enterprise. */
+  core.List<GroupLicense> groupLicense;
+
+  /**
+   * Identifies what kind of resource this is. Value: the fixed string
+   * "androidenterprise#groupLicensesListResponse".
+   */
+  core.String kind;
+
+
+  GroupLicensesListResponse();
+
+  GroupLicensesListResponse.fromJson(core.Map _json) {
+    if (_json.containsKey("groupLicense")) {
+      groupLicense = _json["groupLicense"].map((value) => new GroupLicense.fromJson(value)).toList();
+    }
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (groupLicense != null) {
+      _json["groupLicense"] = groupLicense.map((value) => (value).toJson()).toList();
+    }
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    return _json;
+  }
+}
+
+
+/**
+ * The existence of an install resource indicates that an app is installed on a
+ * particular device (or that an install is pending).
+ *
+ * The API can be used to create an install resource using the update method.
+ * This triggers the actual install of the app on the device. If the user does
+ * not already have an entitlement for the app then an attempt is made to create
+ * one. If this fails (e.g. because the app is not free and there is no
+ * available license) then the creation of the install fails.
+ *
+ * The API can also be used to update an installed app. If the update method is
+ * used on an existing install then the app will be updated to the latest
+ * available version.
+ *
+ * Note that it is not possible to force the installation of a specific version
+ * of an app; the version code is read-only.
+ *
+ * If a user installs an app themselves (as permitted by the enterprise), then
+ * again an install resource and possibly an entitlement resource are
+ * automatically created.
+ *
+ * The API can also be used to delete an install resource, which triggers the
+ * removal of the app from the device. Note that deleting an install does not
+ * automatically remove the corresponding entitlement, even if there are no
+ * remaining installs. The install resource will also be deleted if the user
+ * uninstalls the app themselves.
+ */
+class Install {
+  /**
+   * Install state. The state "installPending" means that an install request has
+   * recently been made and download to the device is in progress. The state
+   * "installed" means that the app has been installed. This field is read-only.
+   */
+  core.String installState;
+
+  /**
+   * Identifies what kind of resource this is. Value: the fixed string
+   * "androidenterprise#install".
+   */
+  core.String kind;
+
+  /**
+   * The ID of the product that the install is for, e.g.
+   * "app:com.google.android.gm".
+   */
+  core.String productId;
+
+  /**
+   * The version of the installed product. Guaranteed to be set only if the
+   * install state is "installed".
+   */
+  core.int versionCode;
+
+
+  Install();
+
+  Install.fromJson(core.Map _json) {
+    if (_json.containsKey("installState")) {
+      installState = _json["installState"];
+    }
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+    if (_json.containsKey("productId")) {
+      productId = _json["productId"];
+    }
+    if (_json.containsKey("versionCode")) {
+      versionCode = _json["versionCode"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (installState != null) {
+      _json["installState"] = installState;
+    }
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    if (productId != null) {
+      _json["productId"] = productId;
+    }
+    if (versionCode != null) {
+      _json["versionCode"] = versionCode;
+    }
+    return _json;
+  }
+}
+
+
+/** The install resources for the device. */
+class InstallsListResponse {
+  /**
+   * An installation of an app for a user on a specific device. The existence of
+   * an install implies that the user must have an entitlement to the app.
+   */
+  core.List<Install> install;
+
+  /**
+   * Identifies what kind of resource this is. Value: the fixed string
+   * "androidenterprise#installsListResponse".
+   */
+  core.String kind;
+
+
+  InstallsListResponse();
+
+  InstallsListResponse.fromJson(core.Map _json) {
+    if (_json.containsKey("install")) {
+      install = _json["install"].map((value) => new Install.fromJson(value)).toList();
+    }
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (install != null) {
+      _json["install"] = install.map((value) => (value).toJson()).toList();
+    }
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    return _json;
+  }
+}
+
+
+/**
+ * A permission represents some extra capability, to be granted to an Android
+ * app, which requires explicit consent. An enterprise admin must consent to
+ * these permissions on behalf of their users before an entitlement for the app
+ * can be created.
+ *
+ * The permissions collection is read-only. The information provided for each
+ * permission (localized name and description) is intended to be used in the MDM
+ * user interface when obtaining consent from the enterprise.
+ */
+class Permission {
+  /**
+   * A longer description of the permissions giving more details of what it
+   * affects.
+   */
+  core.String description;
+
+  /**
+   * Identifies what kind of resource this is. Value: the fixed string
+   * "androidenterprise#permission".
+   */
+  core.String kind;
+
+  /** The name of the permission. */
+  core.String name;
+
+  /** An opaque string uniquely identifying the permission. */
+  core.String permissionId;
+
+
+  Permission();
+
+  Permission.fromJson(core.Map _json) {
+    if (_json.containsKey("description")) {
+      description = _json["description"];
+    }
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+    if (_json.containsKey("name")) {
+      name = _json["name"];
+    }
+    if (_json.containsKey("permissionId")) {
+      permissionId = _json["permissionId"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (description != null) {
+      _json["description"] = description;
+    }
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    if (name != null) {
+      _json["name"] = name;
+    }
+    if (permissionId != null) {
+      _json["permissionId"] = permissionId;
+    }
+    return _json;
+  }
+}
+
+
+/**
+ * A product represents an app in the Google Play Store that is available to at
+ * least some users in the enterprise. (Some apps are restricted to a single
+ * enterprise, and no information about them is made available outside that
+ * enterprise.)
+ *
+ * The information provided for each product (localized name, icon, link to the
+ * full Google Play details page) is intended to allow a basic representation of
+ * the product within an MDM user interface.
+ */
+class Product {
+  /** The name of the author of the product (e.g. the app developer). */
+  core.String authorName;
+
+  /** A link to the (consumer) Google Play details page for the product. */
+  core.String detailsUrl;
+
+  /** A link to an image that can be used as an icon for the product. */
+  core.String iconUrl;
+
+  /**
+   * Identifies what kind of resource this is. Value: the fixed string
+   * "androidenterprise#product".
+   */
+  core.String kind;
+
+  /**
+   * A string of the form "app:
+   * " - e.g. "app:com.google.android.gm" represents the GMail app.
+   */
+  core.String productId;
+
+  /** The name of the product. */
+  core.String title;
+
+  /**
+   * A link to the Google Play for Work details page for the product, for use by
+   * an Enterprise administrator.
+   */
+  core.String workDetailsUrl;
+
+
+  Product();
+
+  Product.fromJson(core.Map _json) {
+    if (_json.containsKey("authorName")) {
+      authorName = _json["authorName"];
+    }
+    if (_json.containsKey("detailsUrl")) {
+      detailsUrl = _json["detailsUrl"];
+    }
+    if (_json.containsKey("iconUrl")) {
+      iconUrl = _json["iconUrl"];
+    }
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+    if (_json.containsKey("productId")) {
+      productId = _json["productId"];
+    }
+    if (_json.containsKey("title")) {
+      title = _json["title"];
+    }
+    if (_json.containsKey("workDetailsUrl")) {
+      workDetailsUrl = _json["workDetailsUrl"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (authorName != null) {
+      _json["authorName"] = authorName;
+    }
+    if (detailsUrl != null) {
+      _json["detailsUrl"] = detailsUrl;
+    }
+    if (iconUrl != null) {
+      _json["iconUrl"] = iconUrl;
+    }
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    if (productId != null) {
+      _json["productId"] = productId;
+    }
+    if (title != null) {
+      _json["title"] = title;
+    }
+    if (workDetailsUrl != null) {
+      _json["workDetailsUrl"] = workDetailsUrl;
+    }
+    return _json;
+  }
+}
+
+
+/**
+ * A product permissions resource represents the set of permissions required by
+ * a specific app and whether or not they have been accepted by an enterprise
+ * admin.
+ *
+ * The API can be used to read the set of permissions, and also to update the
+ * set to indicate that permissions have been accepted.
+ */
+class ProductPermission {
+  /** An opaque string uniquely identifying the permission. */
+  core.String permissionId;
+
+  /** Whether the permission has been accepted or not. */
+  core.String state;
+
+
+  ProductPermission();
+
+  ProductPermission.fromJson(core.Map _json) {
+    if (_json.containsKey("permissionId")) {
+      permissionId = _json["permissionId"];
+    }
+    if (_json.containsKey("state")) {
+      state = _json["state"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (permissionId != null) {
+      _json["permissionId"] = permissionId;
+    }
+    if (state != null) {
+      _json["state"] = state;
+    }
+    return _json;
+  }
+}
+
+
+/**
+ * Information about the permissions required by a specific app and whether they
+ * have been accepted by the enterprise.
+ */
+class ProductPermissions {
+  /**
+   * Identifies what kind of resource this is. Value: the fixed string
+   * "androidenterprise#productPermissions".
+   */
+  core.String kind;
+
+  /** The permissions required by the app. */
+  core.List<ProductPermission> permission;
+
+  /**
+   * The ID of the app that the permissions relate to, e.g.
+   * "app:com.google.android.gm".
+   */
+  core.String productId;
+
+
+  ProductPermissions();
+
+  ProductPermissions.fromJson(core.Map _json) {
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+    if (_json.containsKey("permission")) {
+      permission = _json["permission"].map((value) => new ProductPermission.fromJson(value)).toList();
+    }
+    if (_json.containsKey("productId")) {
+      productId = _json["productId"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    if (permission != null) {
+      _json["permission"] = permission.map((value) => (value).toJson()).toList();
+    }
+    if (productId != null) {
+      _json["productId"] = productId;
+    }
+    return _json;
+  }
+}
+
+
+/**
+ * A user resource represents an individual user within the enterprise's domain.
+ *
+ * Note that each user is associated with a Google account based on the user's
+ * corporate email address (which must be in one of the enterprise's domains).
+ * As part of installing an MDM app to manage a device the Google account must
+ * be provisioned to the device, and so the user resource must be created before
+ * that. This can be done using the Google Admin SDK Directory API.
+ *
+ * The ID for a user is an opaque string. It can be retrieved using the list
+ * method queried by the user's primary email address.
+ */
+class User {
+  /** The unique ID for the user. */
+  core.String id;
+
+  /**
+   * Identifies what kind of resource this is. Value: the fixed string
+   * "androidenterprise#user".
+   */
+  core.String kind;
+
+  /** The user's primary email, e.g. "jsmith@example.com". */
+  core.String primaryEmail;
+
+
+  User();
+
+  User.fromJson(core.Map _json) {
+    if (_json.containsKey("id")) {
+      id = _json["id"];
+    }
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+    if (_json.containsKey("primaryEmail")) {
+      primaryEmail = _json["primaryEmail"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (id != null) {
+      _json["id"] = id;
+    }
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    if (primaryEmail != null) {
+      _json["primaryEmail"] = primaryEmail;
+    }
+    return _json;
+  }
+}
+
+
+/**
+ * A UserToken is used by a user when setting up a managed device or profile
+ * with their work account on a device. When the user enters their email address
+ * and token (activation code) the appropriate MDM app can be automatically
+ * downloaded.
+ */
+class UserToken {
+  /**
+   * Identifies what kind of resource this is. Value: the fixed string
+   * "androidenterprise#userToken".
+   */
+  core.String kind;
+
+  /**
+   * The token (activation code) to be entered by the user. This consists of a
+   * sequence of decimal digits. Note that the leading digit may be 0.
+   */
+  core.String token;
+
+  /** The unique ID for the user. */
+  core.String userId;
+
+
+  UserToken();
+
+  UserToken.fromJson(core.Map _json) {
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+    if (_json.containsKey("token")) {
+      token = _json["token"];
+    }
+    if (_json.containsKey("userId")) {
+      userId = _json["userId"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    if (token != null) {
+      _json["token"] = token;
+    }
+    if (userId != null) {
+      _json["userId"] = userId;
+    }
+    return _json;
+  }
+}
+
+
+/** The matching user resources. */
+class UsersListResponse {
+  /**
+   * Identifies what kind of resource this is. Value: the fixed string
+   * "androidenterprise#usersListResponse".
+   */
+  core.String kind;
+
+  /** A user of an enterprise. */
+  core.List<User> user;
+
+
+  UsersListResponse();
+
+  UsersListResponse.fromJson(core.Map _json) {
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+    if (_json.containsKey("user")) {
+      user = _json["user"].map((value) => new User.fromJson(value)).toList();
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    if (user != null) {
+      _json["user"] = user.map((value) => (value).toJson()).toList();
+    }
+    return _json;
+  }
+}
diff --git a/generated/googleapis/lib/androidpublisher/v2.dart b/generated/googleapis/lib/androidpublisher/v2.dart
index 019314a..b800f6f 100644
--- a/generated/googleapis/lib/androidpublisher/v2.dart
+++ b/generated/googleapis/lib/androidpublisher/v2.dart
@@ -1,17 +1,22 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.androidpublisher.v2;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError, Media, UploadOptions,
+    ResumableUploadOptions, DownloadOptions, PartialDownloadOptions,
+    ByteRange;
+
+const core.String USER_AGENT = 'dart-api-client androidpublisher/v2';
 
 /** Lets Android application developers access their Google Play accounts. */
 class AndroidpublisherApi {
@@ -19,20 +24,19 @@
   static const AndroidpublisherScope = "https://www.googleapis.com/auth/androidpublisher";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   EditsResourceApi get edits => new EditsResourceApi(_requester);
   InappproductsResourceApi get inappproducts => new InappproductsResourceApi(_requester);
   PurchasesResourceApi get purchases => new PurchasesResourceApi(_requester);
 
   AndroidpublisherApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "androidpublisher/v2/applications/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class EditsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   EditsApklistingsResourceApi get apklistings => new EditsApklistingsResourceApi(_requester);
   EditsApksResourceApi get apks => new EditsApksResourceApi(_requester);
@@ -43,7 +47,7 @@
   EditsTestersResourceApi get testers => new EditsTestersResourceApi(_requester);
   EditsTracksResourceApi get tracks => new EditsTracksResourceApi(_requester);
 
-  EditsResourceApi(common_internal.ApiRequester client) : 
+  EditsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -58,7 +62,7 @@
    *
    * Completes with a [AppEdit].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -69,7 +73,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -80,7 +84,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + ':commit';
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + ':commit';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -104,7 +108,7 @@
    *
    * [editId] - Unique identifier for this edit.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -115,7 +119,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -127,7 +131,7 @@
 
     _downloadOptions = null;
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -152,7 +156,7 @@
    *
    * Completes with a [AppEdit].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -163,7 +167,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -174,7 +178,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -198,7 +202,7 @@
    *
    * Completes with a [AppEdit].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -209,7 +213,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -220,7 +224,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits';
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -245,7 +249,7 @@
    *
    * Completes with a [AppEdit].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -256,7 +260,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -267,7 +271,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + ':validate';
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + ':validate';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -282,11 +286,10 @@
 }
 
 
-/** Not documented yet. */
 class EditsApklistingsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  EditsApklistingsResourceApi(common_internal.ApiRequester client) : 
+  EditsApklistingsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -307,7 +310,7 @@
    * localized listing to read or modify. For example, to select Austrian
    * German, pass "de-AT".
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -318,7 +321,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -336,7 +339,7 @@
 
     _downloadOptions = null;
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/apks/' + common_internal.Escaper.ecapeVariable('$apkVersionCode') + '/listings/' + common_internal.Escaper.ecapeVariable('$language');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/apks/' + commons.Escaper.ecapeVariable('$apkVersionCode') + '/listings/' + commons.Escaper.ecapeVariable('$language');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -361,7 +364,7 @@
    * [apkVersionCode] - The APK version code whose APK-specific listings should
    * be read or modified.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -372,7 +375,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -387,7 +390,7 @@
 
     _downloadOptions = null;
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/apks/' + common_internal.Escaper.ecapeVariable('$apkVersionCode') + '/listings';
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/apks/' + commons.Escaper.ecapeVariable('$apkVersionCode') + '/listings';
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -419,7 +422,7 @@
    *
    * Completes with a [ApkListing].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -430,7 +433,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -447,7 +450,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/apks/' + common_internal.Escaper.ecapeVariable('$apkVersionCode') + '/listings/' + common_internal.Escaper.ecapeVariable('$language');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/apks/' + commons.Escaper.ecapeVariable('$apkVersionCode') + '/listings/' + commons.Escaper.ecapeVariable('$language');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -474,7 +477,7 @@
    *
    * Completes with a [ApkListingsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -485,7 +488,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -499,7 +502,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/apks/' + common_internal.Escaper.ecapeVariable('$apkVersionCode') + '/listings';
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/apks/' + commons.Escaper.ecapeVariable('$apkVersionCode') + '/listings';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -533,7 +536,7 @@
    *
    * Completes with a [ApkListing].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -544,7 +547,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -564,7 +567,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/apks/' + common_internal.Escaper.ecapeVariable('$apkVersionCode') + '/listings/' + common_internal.Escaper.ecapeVariable('$language');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/apks/' + commons.Escaper.ecapeVariable('$apkVersionCode') + '/listings/' + commons.Escaper.ecapeVariable('$language');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -598,7 +601,7 @@
    *
    * Completes with a [ApkListing].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -609,7 +612,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -629,7 +632,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/apks/' + common_internal.Escaper.ecapeVariable('$apkVersionCode') + '/listings/' + common_internal.Escaper.ecapeVariable('$language');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/apks/' + commons.Escaper.ecapeVariable('$apkVersionCode') + '/listings/' + commons.Escaper.ecapeVariable('$language');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -644,17 +647,16 @@
 }
 
 
-/** Not documented yet. */
 class EditsApksResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  EditsApksResourceApi(common_internal.ApiRequester client) : 
+  EditsApksResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
    * Creates a new APK without uploading the APK itself to Google Play, instead
    * hosting the APK at a specified URL. This function is only available to
-   * enterprises using Google Play for work whose application is configured to
+   * enterprises using Google Play for Work whose application is configured to
    * restrict distribution to the enterprise domain.
    *
    * [request] - The metadata request object.
@@ -668,7 +670,7 @@
    *
    * Completes with a [ApksAddExternallyHostedResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -679,7 +681,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -693,7 +695,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/apks/externallyHosted';
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/apks/externallyHosted';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -706,8 +708,6 @@
   }
 
   /**
-   * Not documented yet.
-   *
    * Request parameters:
    *
    * [packageName] - Unique identifier for the Android app that is being
@@ -717,7 +717,7 @@
    *
    * Completes with a [ApksListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -728,7 +728,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -739,7 +739,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/apks';
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/apks';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -752,8 +752,6 @@
   }
 
   /**
-   * Not documented yet.
-   *
    * Request parameters:
    *
    * [packageName] - Unique identifier for the Android app that is being
@@ -768,18 +766,18 @@
    *
    * Completes with a [Apk].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<Apk> upload(core.String packageName, core.String editId, {common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<Apk> upload(core.String packageName, core.String editId, {commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -793,11 +791,11 @@
     _uploadOptions =  uploadOptions;
 
     if (_uploadMedia == null) {
-      _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/apks';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/androidpublisher/v2/applications/' + common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/apks';
+      _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/apks';
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/androidpublisher/v2/applications/' + commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/apks';
     } else {
-      _url = '/upload/androidpublisher/v2/applications/' + common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/apks';
+      _url = '/upload/androidpublisher/v2/applications/' + commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/apks';
     }
 
 
@@ -814,11 +812,10 @@
 }
 
 
-/** Not documented yet. */
 class EditsDetailsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  EditsDetailsResourceApi(common_internal.ApiRequester client) : 
+  EditsDetailsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -834,7 +831,7 @@
    *
    * Completes with a [AppDetails].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -845,7 +842,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -856,7 +853,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/details';
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/details';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -882,7 +879,7 @@
    *
    * Completes with a [AppDetails].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -893,7 +890,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -907,7 +904,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/details';
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/details';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -933,7 +930,7 @@
    *
    * Completes with a [AppDetails].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -944,7 +941,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -958,7 +955,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/details';
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/details';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -973,11 +970,10 @@
 }
 
 
-/** Not documented yet. */
 class EditsExpansionfilesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  EditsExpansionfilesResourceApi(common_internal.ApiRequester client) : 
+  EditsExpansionfilesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1000,7 +996,7 @@
    *
    * Completes with a [ExpansionFile].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1011,7 +1007,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -1028,7 +1024,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/apks/' + common_internal.Escaper.ecapeVariable('$apkVersionCode') + '/expansionFiles/' + common_internal.Escaper.ecapeVariable('$expansionFileType');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/apks/' + commons.Escaper.ecapeVariable('$apkVersionCode') + '/expansionFiles/' + commons.Escaper.ecapeVariable('$expansionFileType');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1064,7 +1060,7 @@
    *
    * Completes with a [ExpansionFile].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1075,7 +1071,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1095,7 +1091,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/apks/' + common_internal.Escaper.ecapeVariable('$apkVersionCode') + '/expansionFiles/' + common_internal.Escaper.ecapeVariable('$expansionFileType');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/apks/' + commons.Escaper.ecapeVariable('$apkVersionCode') + '/expansionFiles/' + commons.Escaper.ecapeVariable('$expansionFileType');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1130,7 +1126,7 @@
    *
    * Completes with a [ExpansionFile].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1141,7 +1137,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1161,7 +1157,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/apks/' + common_internal.Escaper.ecapeVariable('$apkVersionCode') + '/expansionFiles/' + common_internal.Escaper.ecapeVariable('$expansionFileType');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/apks/' + commons.Escaper.ecapeVariable('$apkVersionCode') + '/expansionFiles/' + commons.Escaper.ecapeVariable('$expansionFileType');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1198,18 +1194,18 @@
    *
    * Completes with a [ExpansionFilesUploadResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<ExpansionFilesUploadResponse> upload(core.String packageName, core.String editId, core.int apkVersionCode, core.String expansionFileType, {common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<ExpansionFilesUploadResponse> upload(core.String packageName, core.String editId, core.int apkVersionCode, core.String expansionFileType, {commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -1229,11 +1225,11 @@
     _uploadOptions =  uploadOptions;
 
     if (_uploadMedia == null) {
-      _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/apks/' + common_internal.Escaper.ecapeVariable('$apkVersionCode') + '/expansionFiles/' + common_internal.Escaper.ecapeVariable('$expansionFileType');
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/androidpublisher/v2/applications/' + common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/apks/' + common_internal.Escaper.ecapeVariable('$apkVersionCode') + '/expansionFiles/' + common_internal.Escaper.ecapeVariable('$expansionFileType');
+      _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/apks/' + commons.Escaper.ecapeVariable('$apkVersionCode') + '/expansionFiles/' + commons.Escaper.ecapeVariable('$expansionFileType');
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/androidpublisher/v2/applications/' + commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/apks/' + commons.Escaper.ecapeVariable('$apkVersionCode') + '/expansionFiles/' + commons.Escaper.ecapeVariable('$expansionFileType');
     } else {
-      _url = '/upload/androidpublisher/v2/applications/' + common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/apks/' + common_internal.Escaper.ecapeVariable('$apkVersionCode') + '/expansionFiles/' + common_internal.Escaper.ecapeVariable('$expansionFileType');
+      _url = '/upload/androidpublisher/v2/applications/' + commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/apks/' + commons.Escaper.ecapeVariable('$apkVersionCode') + '/expansionFiles/' + commons.Escaper.ecapeVariable('$expansionFileType');
     }
 
 
@@ -1250,11 +1246,10 @@
 }
 
 
-/** Not documented yet. */
 class EditsImagesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  EditsImagesResourceApi(common_internal.ApiRequester client) : 
+  EditsImagesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1285,7 +1280,7 @@
    * [imageId] - Unique identifier an image within the set of images attached to
    * this edit.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1296,7 +1291,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -1317,7 +1312,7 @@
 
     _downloadOptions = null;
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/listings/' + common_internal.Escaper.ecapeVariable('$language') + '/' + common_internal.Escaper.ecapeVariable('$imageType') + '/' + common_internal.Escaper.ecapeVariable('$imageId');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/listings/' + commons.Escaper.ecapeVariable('$language') + '/' + commons.Escaper.ecapeVariable('$imageType') + '/' + commons.Escaper.ecapeVariable('$imageId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1356,7 +1351,7 @@
    *
    * Completes with a [ImagesDeleteAllResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1367,7 +1362,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -1384,7 +1379,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/listings/' + common_internal.Escaper.ecapeVariable('$language') + '/' + common_internal.Escaper.ecapeVariable('$imageType');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/listings/' + commons.Escaper.ecapeVariable('$language') + '/' + commons.Escaper.ecapeVariable('$imageType');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1423,7 +1418,7 @@
    *
    * Completes with a [ImagesListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1434,7 +1429,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -1451,7 +1446,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/listings/' + common_internal.Escaper.ecapeVariable('$language') + '/' + common_internal.Escaper.ecapeVariable('$imageType');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/listings/' + commons.Escaper.ecapeVariable('$language') + '/' + commons.Escaper.ecapeVariable('$imageType');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1496,18 +1491,18 @@
    *
    * Completes with a [ImagesUploadResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<ImagesUploadResponse> upload(core.String packageName, core.String editId, core.String language, core.String imageType, {common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<ImagesUploadResponse> upload(core.String packageName, core.String editId, core.String language, core.String imageType, {commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -1527,11 +1522,11 @@
     _uploadOptions =  uploadOptions;
 
     if (_uploadMedia == null) {
-      _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/listings/' + common_internal.Escaper.ecapeVariable('$language') + '/' + common_internal.Escaper.ecapeVariable('$imageType');
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/androidpublisher/v2/applications/' + common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/listings/' + common_internal.Escaper.ecapeVariable('$language') + '/' + common_internal.Escaper.ecapeVariable('$imageType');
+      _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/listings/' + commons.Escaper.ecapeVariable('$language') + '/' + commons.Escaper.ecapeVariable('$imageType');
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/androidpublisher/v2/applications/' + commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/listings/' + commons.Escaper.ecapeVariable('$language') + '/' + commons.Escaper.ecapeVariable('$imageType');
     } else {
-      _url = '/upload/androidpublisher/v2/applications/' + common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/listings/' + common_internal.Escaper.ecapeVariable('$language') + '/' + common_internal.Escaper.ecapeVariable('$imageType');
+      _url = '/upload/androidpublisher/v2/applications/' + commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/listings/' + commons.Escaper.ecapeVariable('$language') + '/' + commons.Escaper.ecapeVariable('$imageType');
     }
 
 
@@ -1548,11 +1543,10 @@
 }
 
 
-/** Not documented yet. */
 class EditsListingsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  EditsListingsResourceApi(common_internal.ApiRequester client) : 
+  EditsListingsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1569,7 +1563,7 @@
    * listing to read or modify. For example, to select Austrian German, pass
    * "de-AT".
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1580,7 +1574,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -1595,7 +1589,7 @@
 
     _downloadOptions = null;
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/listings/' + common_internal.Escaper.ecapeVariable('$language');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/listings/' + commons.Escaper.ecapeVariable('$language');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1617,7 +1611,7 @@
    *
    * [editId] - Unique identifier for this edit.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1628,7 +1622,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -1640,7 +1634,7 @@
 
     _downloadOptions = null;
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/listings';
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/listings';
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1668,7 +1662,7 @@
    *
    * Completes with a [Listing].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1679,7 +1673,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -1693,7 +1687,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/listings/' + common_internal.Escaper.ecapeVariable('$language');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/listings/' + commons.Escaper.ecapeVariable('$language');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1717,7 +1711,7 @@
    *
    * Completes with a [ListingsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1728,7 +1722,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -1739,7 +1733,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/listings';
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/listings';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1770,7 +1764,7 @@
    *
    * Completes with a [Listing].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1781,7 +1775,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1798,7 +1792,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/listings/' + common_internal.Escaper.ecapeVariable('$language');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/listings/' + commons.Escaper.ecapeVariable('$language');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1828,7 +1822,7 @@
    *
    * Completes with a [Listing].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1839,7 +1833,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1856,7 +1850,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/listings/' + common_internal.Escaper.ecapeVariable('$language');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/listings/' + commons.Escaper.ecapeVariable('$language');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1871,16 +1865,13 @@
 }
 
 
-/** Not documented yet. */
 class EditsTestersResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  EditsTestersResourceApi(common_internal.ApiRequester client) : 
+  EditsTestersResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
-   * Not documented yet.
-   *
    * Request parameters:
    *
    * [packageName] - Unique identifier for the Android app that is being
@@ -1897,7 +1888,7 @@
    *
    * Completes with a [Testers].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1908,7 +1899,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -1922,7 +1913,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/testers/' + common_internal.Escaper.ecapeVariable('$track');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/testers/' + commons.Escaper.ecapeVariable('$track');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1935,8 +1926,6 @@
   }
 
   /**
-   * Not documented yet.
-   *
    * [request] - The metadata request object.
    *
    * Request parameters:
@@ -1955,7 +1944,7 @@
    *
    * Completes with a [Testers].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1966,7 +1955,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1983,7 +1972,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/testers/' + common_internal.Escaper.ecapeVariable('$track');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/testers/' + commons.Escaper.ecapeVariable('$track');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1996,8 +1985,6 @@
   }
 
   /**
-   * Not documented yet.
-   *
    * [request] - The metadata request object.
    *
    * Request parameters:
@@ -2016,7 +2003,7 @@
    *
    * Completes with a [Testers].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2027,7 +2014,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2044,7 +2031,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/testers/' + common_internal.Escaper.ecapeVariable('$track');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/testers/' + commons.Escaper.ecapeVariable('$track');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -2059,11 +2046,10 @@
 }
 
 
-/** Not documented yet. */
 class EditsTracksResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  EditsTracksResourceApi(common_internal.ApiRequester client) : 
+  EditsTracksResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2086,7 +2072,7 @@
    *
    * Completes with a [Track].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2097,7 +2083,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -2111,7 +2097,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/tracks/' + common_internal.Escaper.ecapeVariable('$track');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/tracks/' + commons.Escaper.ecapeVariable('$track');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2135,7 +2121,7 @@
    *
    * Completes with a [TracksListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2146,7 +2132,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -2157,7 +2143,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/tracks';
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/tracks';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2192,7 +2178,7 @@
    *
    * Completes with a [Track].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2203,7 +2189,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2220,7 +2206,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/tracks/' + common_internal.Escaper.ecapeVariable('$track');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/tracks/' + commons.Escaper.ecapeVariable('$track');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -2255,7 +2241,7 @@
    *
    * Completes with a [Track].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2266,7 +2252,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2283,7 +2269,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/edits/' + common_internal.Escaper.ecapeVariable('$editId') + '/tracks/' + common_internal.Escaper.ecapeVariable('$track');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/edits/' + commons.Escaper.ecapeVariable('$editId') + '/tracks/' + commons.Escaper.ecapeVariable('$track');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -2298,23 +2284,20 @@
 }
 
 
-/** Not documented yet. */
 class InappproductsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  InappproductsResourceApi(common_internal.ApiRequester client) : 
+  InappproductsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
-   * Not documented yet.
-   *
    * [request] - The metadata request object.
    *
    * Request parameters:
    *
    * Completes with a [InappproductsBatchResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2325,7 +2308,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2355,7 +2338,7 @@
    *
    * [sku] - Unique identifier for the in-app product.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2366,7 +2349,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -2378,7 +2361,7 @@
 
     _downloadOptions = null;
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/inappproducts/' + common_internal.Escaper.ecapeVariable('$sku');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/inappproducts/' + commons.Escaper.ecapeVariable('$sku');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -2401,7 +2384,7 @@
    *
    * Completes with a [InAppProduct].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2412,7 +2395,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -2423,7 +2406,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/inappproducts/' + common_internal.Escaper.ecapeVariable('$sku');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/inappproducts/' + commons.Escaper.ecapeVariable('$sku');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2452,7 +2435,7 @@
    *
    * Completes with a [InAppProduct].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2463,7 +2446,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2477,7 +2460,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/inappproducts';
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/inappproducts';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2506,7 +2489,7 @@
    *
    * Completes with a [InappproductsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2517,7 +2500,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -2534,7 +2517,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/inappproducts';
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/inappproducts';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2566,7 +2549,7 @@
    *
    * Completes with a [InAppProduct].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2577,7 +2560,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2594,7 +2577,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/inappproducts/' + common_internal.Escaper.ecapeVariable('$sku');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/inappproducts/' + commons.Escaper.ecapeVariable('$sku');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -2625,7 +2608,7 @@
    *
    * Completes with a [InAppProduct].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2636,7 +2619,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2653,7 +2636,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/inappproducts/' + common_internal.Escaper.ecapeVariable('$sku');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/inappproducts/' + commons.Escaper.ecapeVariable('$sku');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -2668,23 +2651,21 @@
 }
 
 
-/** Not documented yet. */
 class PurchasesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   PurchasesProductsResourceApi get products => new PurchasesProductsResourceApi(_requester);
   PurchasesSubscriptionsResourceApi get subscriptions => new PurchasesSubscriptionsResourceApi(_requester);
 
-  PurchasesResourceApi(common_internal.ApiRequester client) : 
+  PurchasesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 }
 
 
-/** Not documented yet. */
 class PurchasesProductsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PurchasesProductsResourceApi(common_internal.ApiRequester client) : 
+  PurchasesProductsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2702,7 +2683,7 @@
    *
    * Completes with a [ProductPurchase].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2713,7 +2694,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -2727,7 +2708,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/purchases/products/' + common_internal.Escaper.ecapeVariable('$productId') + '/tokens/' + common_internal.Escaper.ecapeVariable('$token');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/purchases/products/' + commons.Escaper.ecapeVariable('$productId') + '/tokens/' + commons.Escaper.ecapeVariable('$token');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2742,11 +2723,10 @@
 }
 
 
-/** Not documented yet. */
 class PurchasesSubscriptionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PurchasesSubscriptionsResourceApi(common_internal.ApiRequester client) : 
+  PurchasesSubscriptionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2764,7 +2744,7 @@
    * [token] - The token provided to the user's device when the subscription was
    * purchased.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2775,7 +2755,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -2790,7 +2770,7 @@
 
     _downloadOptions = null;
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/purchases/subscriptions/' + common_internal.Escaper.ecapeVariable('$subscriptionId') + '/tokens/' + common_internal.Escaper.ecapeVariable('$token') + ':cancel';
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/purchases/subscriptions/' + commons.Escaper.ecapeVariable('$subscriptionId') + '/tokens/' + commons.Escaper.ecapeVariable('$token') + ':cancel';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2821,7 +2801,7 @@
    *
    * Completes with a [SubscriptionPurchasesDeferResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2832,7 +2812,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2849,7 +2829,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/purchases/subscriptions/' + common_internal.Escaper.ecapeVariable('$subscriptionId') + '/tokens/' + common_internal.Escaper.ecapeVariable('$token') + ':defer';
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/purchases/subscriptions/' + commons.Escaper.ecapeVariable('$subscriptionId') + '/tokens/' + commons.Escaper.ecapeVariable('$token') + ':defer';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2878,7 +2858,7 @@
    *
    * Completes with a [SubscriptionPurchase].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2889,7 +2869,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -2903,7 +2883,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/purchases/subscriptions/' + common_internal.Escaper.ecapeVariable('$subscriptionId') + '/tokens/' + common_internal.Escaper.ecapeVariable('$token');
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/purchases/subscriptions/' + commons.Escaper.ecapeVariable('$subscriptionId') + '/tokens/' + commons.Escaper.ecapeVariable('$token');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2930,7 +2910,7 @@
    * [token] - The token provided to the user's device when the subscription was
    * purchased.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2941,7 +2921,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -2956,7 +2936,7 @@
 
     _downloadOptions = null;
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/purchases/subscriptions/' + common_internal.Escaper.ecapeVariable('$subscriptionId') + '/tokens/' + common_internal.Escaper.ecapeVariable('$token') + ':refund';
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/purchases/subscriptions/' + commons.Escaper.ecapeVariable('$subscriptionId') + '/tokens/' + commons.Escaper.ecapeVariable('$token') + ':refund';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2983,7 +2963,7 @@
    * [token] - The token provided to the user's device when the subscription was
    * purchased.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2994,7 +2974,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (packageName == null) {
@@ -3009,7 +2989,7 @@
 
     _downloadOptions = null;
 
-    _url = common_internal.Escaper.ecapeVariable('$packageName') + '/purchases/subscriptions/' + common_internal.Escaper.ecapeVariable('$subscriptionId') + '/tokens/' + common_internal.Escaper.ecapeVariable('$token') + ':revoke';
+    _url = commons.Escaper.ecapeVariable('$packageName') + '/purchases/subscriptions/' + commons.Escaper.ecapeVariable('$subscriptionId') + '/tokens/' + commons.Escaper.ecapeVariable('$token') + ':revoke';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -3025,7 +3005,6 @@
 
 
 
-/** Not documented yet. */
 class Apk {
   /** Information about the binary payload of this APK. */
   ApkBinary binary;
@@ -3085,7 +3064,6 @@
 }
 
 
-/** Not documented yet. */
 class ApkListing {
   /** The language code, in BCP 47 format (eg "en-US"). */
   core.String language;
@@ -3118,7 +3096,6 @@
 }
 
 
-/** Not documented yet. */
 class ApkListingsListResponse {
   /**
    * Identifies what kind of resource this is. Value: the fixed string
@@ -3126,7 +3103,6 @@
    */
   core.String kind;
 
-  /** Not documented yet. */
   core.List<ApkListing> listings;
 
 
@@ -3154,7 +3130,6 @@
 }
 
 
-/** Not documented yet. */
 class ApksAddExternallyHostedRequest {
   /** The definition of the externally-hosted APK and where it is located. */
   ExternallyHostedApk externallyHostedApk;
@@ -3178,7 +3153,6 @@
 }
 
 
-/** Not documented yet. */
 class ApksAddExternallyHostedResponse {
   /** The definition of the externally-hosted APK and where it is located. */
   ExternallyHostedApk externallyHostedApk;
@@ -3202,9 +3176,7 @@
 }
 
 
-/** Not documented yet. */
 class ApksListResponse {
-  /** Not documented yet. */
   core.List<Apk> apks;
 
   /**
@@ -3238,7 +3210,6 @@
 }
 
 
-/** Not documented yet. */
 class AppDetails {
   /** The user-visible support email for this app. */
   core.String contactEmail;
@@ -3328,7 +3299,6 @@
 }
 
 
-/** Not documented yet. */
 class ExpansionFile {
   /**
    * If set this field indicates that this APK has an Expansion File uploaded to
@@ -3368,9 +3338,7 @@
 }
 
 
-/** Not documented yet. */
 class ExpansionFilesUploadResponse {
-  /** Not documented yet. */
   ExpansionFile expansionFile;
 
 
@@ -3395,7 +3363,7 @@
 /**
  * Defines an APK available for this application that is hosted externally and
  * not uploaded to Google Play. This function is only available to enterprises
- * who are using Android for Work, and whos application is restricted to the
+ * who are using Google Play for Work, and whos application is restricted to the
  * enterprise private channel
  */
 class ExternallyHostedApk {
@@ -3590,7 +3558,6 @@
 }
 
 
-/** Not documented yet. */
 class Image {
   /** A unique id representing this image. */
   core.String id;
@@ -3632,9 +3599,7 @@
 }
 
 
-/** Not documented yet. */
 class ImagesDeleteAllResponse {
-  /** Not documented yet. */
   core.List<Image> deleted;
 
 
@@ -3656,9 +3621,7 @@
 }
 
 
-/** Not documented yet. */
 class ImagesListResponse {
-  /** Not documented yet. */
   core.List<Image> images;
 
 
@@ -3680,9 +3643,7 @@
 }
 
 
-/** Not documented yet. */
 class ImagesUploadResponse {
-  /** Not documented yet. */
   Image image;
 
 
@@ -3704,7 +3665,6 @@
 }
 
 
-/** Not documented yet. */
 class InAppProduct {
   /**
    * The default language of the localized data, as defined by BCP 47. e.g.
@@ -3742,7 +3702,6 @@
   /** The stock-keeping-unit (SKU) of the product, unique within an app. */
   core.String sku;
 
-  /** Not documented yet. */
   core.String status;
 
   /**
@@ -3769,13 +3728,13 @@
       defaultPrice = new Price.fromJson(_json["defaultPrice"]);
     }
     if (_json.containsKey("listings")) {
-      listings = common_internal.mapMap(_json["listings"], (item) => new InAppProductListing.fromJson(item));
+      listings = commons.mapMap(_json["listings"], (item) => new InAppProductListing.fromJson(item));
     }
     if (_json.containsKey("packageName")) {
       packageName = _json["packageName"];
     }
     if (_json.containsKey("prices")) {
-      prices = common_internal.mapMap(_json["prices"], (item) => new Price.fromJson(item));
+      prices = commons.mapMap(_json["prices"], (item) => new Price.fromJson(item));
     }
     if (_json.containsKey("purchaseType")) {
       purchaseType = _json["purchaseType"];
@@ -3806,13 +3765,13 @@
       _json["defaultPrice"] = (defaultPrice).toJson();
     }
     if (listings != null) {
-      _json["listings"] = common_internal.mapMap(listings, (item) => (item).toJson());
+      _json["listings"] = commons.mapMap(listings, (item) => (item).toJson());
     }
     if (packageName != null) {
       _json["packageName"] = packageName;
     }
     if (prices != null) {
-      _json["prices"] = common_internal.mapMap(prices, (item) => (item).toJson());
+      _json["prices"] = commons.mapMap(prices, (item) => (item).toJson());
     }
     if (purchaseType != null) {
       _json["purchaseType"] = purchaseType;
@@ -3837,12 +3796,9 @@
 }
 
 
-/** Not documented yet. */
 class InAppProductListing {
-  /** Not documented yet. */
   core.String description;
 
-  /** Not documented yet. */
   core.String title;
 
 
@@ -3870,9 +3826,7 @@
 }
 
 
-/** Not documented yet. */
 class InappproductsBatchRequest {
-  /** Not documented yet. */
   core.List<InappproductsBatchRequestEntry> entrys;
 
 
@@ -3894,18 +3848,13 @@
 }
 
 
-/** Not documented yet. */
 class InappproductsBatchRequestEntry {
-  /** Not documented yet. */
   core.int batchId;
 
-  /** Not documented yet. */
   InappproductsInsertRequest inappproductsinsertrequest;
 
-  /** Not documented yet. */
   InappproductsUpdateRequest inappproductsupdaterequest;
 
-  /** Not documented yet. */
   core.String methodName;
 
 
@@ -3945,9 +3894,7 @@
 }
 
 
-/** Not documented yet. */
 class InappproductsBatchResponse {
-  /** Not documented yet. */
   core.List<InappproductsBatchResponseEntry> entrys;
 
   /**
@@ -3981,15 +3928,11 @@
 }
 
 
-/** Not documented yet. */
 class InappproductsBatchResponseEntry {
-  /** Not documented yet. */
   core.int batchId;
 
-  /** Not documented yet. */
   InappproductsInsertResponse inappproductsinsertresponse;
 
-  /** Not documented yet. */
   InappproductsUpdateResponse inappproductsupdateresponse;
 
 
@@ -4023,9 +3966,7 @@
 }
 
 
-/** Not documented yet. */
 class InappproductsInsertRequest {
-  /** Not documented yet. */
   InAppProduct inappproduct;
 
 
@@ -4047,9 +3988,7 @@
 }
 
 
-/** Not documented yet. */
 class InappproductsInsertResponse {
-  /** Not documented yet. */
   InAppProduct inappproduct;
 
 
@@ -4071,9 +4010,7 @@
 }
 
 
-/** Not documented yet. */
 class InappproductsListResponse {
-  /** Not documented yet. */
   core.List<InAppProduct> inappproduct;
 
   /**
@@ -4082,10 +4019,8 @@
    */
   core.String kind;
 
-  /** Not documented yet. */
   PageInfo pageInfo;
 
-  /** Not documented yet. */
   TokenPagination tokenPagination;
 
 
@@ -4125,9 +4060,7 @@
 }
 
 
-/** Not documented yet. */
 class InappproductsUpdateRequest {
-  /** Not documented yet. */
   InAppProduct inappproduct;
 
 
@@ -4149,9 +4082,7 @@
 }
 
 
-/** Not documented yet. */
 class InappproductsUpdateResponse {
-  /** Not documented yet. */
   InAppProduct inappproduct;
 
 
@@ -4173,7 +4104,6 @@
 }
 
 
-/** Not documented yet. */
 class Listing {
   /**
    * Full description of the app; this may be up to 4000 characters in length.
@@ -4238,7 +4168,6 @@
 }
 
 
-/** Not documented yet. */
 class ListingsListResponse {
   /**
    * Identifies what kind of resource this is. Value: the fixed string
@@ -4246,7 +4175,6 @@
    */
   core.String kind;
 
-  /** Not documented yet. */
   core.List<Listing> listings;
 
 
@@ -4274,7 +4202,6 @@
 }
 
 
-/** Not documented yet. */
 class MonthDay {
   /**
    * Day of a month, value in [1, 31] range. Valid range depends on the
@@ -4310,15 +4237,11 @@
 }
 
 
-/** Not documented yet. */
 class PageInfo {
-  /** Not documented yet. */
   core.int resultPerPage;
 
-  /** Not documented yet. */
   core.int startIndex;
 
-  /** Not documented yet. */
   core.int totalResults;
 
 
@@ -4352,7 +4275,6 @@
 }
 
 
-/** Not documented yet. */
 class Price {
   /** 3 letter Currency code, as defined by ISO 4217. */
   core.String currency;
@@ -4467,7 +4389,6 @@
 }
 
 
-/** Not documented yet. */
 class Season {
   /** Inclusive end date of the recurrence period. */
   MonthDay end;
@@ -4608,7 +4529,6 @@
 }
 
 
-/** Not documented yet. */
 class SubscriptionPurchasesDeferRequest {
   /**
    * The information about the new desired expiry time for the subscription.
@@ -4634,7 +4554,6 @@
 }
 
 
-/** Not documented yet. */
 class SubscriptionPurchasesDeferResponse {
   /**
    * The new expiry time for the subscription in milliseconds since the Epoch.
@@ -4660,12 +4579,9 @@
 }
 
 
-/** Not documented yet. */
 class Testers {
-  /** Not documented yet. */
   core.List<core.String> googleGroups;
 
-  /** Not documented yet. */
   core.List<core.String> googlePlusCommunities;
 
 
@@ -4693,12 +4609,9 @@
 }
 
 
-/** Not documented yet. */
 class TokenPagination {
-  /** Not documented yet. */
   core.String nextPageToken;
 
-  /** Not documented yet. */
   core.String previousPageToken;
 
 
@@ -4726,15 +4639,11 @@
 }
 
 
-/** Not documented yet. */
 class Track {
-  /** Not documented yet. */
   core.String track;
 
-  /** Not documented yet. */
   core.double userFraction;
 
-  /** Not documented yet. */
   core.List<core.int> versionCodes;
 
 
@@ -4768,7 +4677,6 @@
 }
 
 
-/** Not documented yet. */
 class TracksListResponse {
   /**
    * Identifies what kind of resource this is. Value: the fixed string
@@ -4776,7 +4684,6 @@
    */
   core.String kind;
 
-  /** Not documented yet. */
   core.List<Track> tracks;
 
 
@@ -4802,5 +4709,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/appsactivity/v1.dart b/generated/googleapis/lib/appsactivity/v1.dart
index 0b8e6db..76669a1 100644
--- a/generated/googleapis/lib/appsactivity/v1.dart
+++ b/generated/googleapis/lib/appsactivity/v1.dart
@@ -1,47 +1,49 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.appsactivity.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client appsactivity/v1';
 
 /** Provides a historical view of activity. */
 class AppsactivityApi {
   /** View the activity history of your Google Apps */
   static const ActivityScope = "https://www.googleapis.com/auth/activity";
 
-  /** View and manage the files and documents in your Google Drive */
+  /** View and manage the files in your Google Drive */
   static const DriveScope = "https://www.googleapis.com/auth/drive";
 
-  /** View metadata for files and documents in your Google Drive */
+  /** View metadata for files in your Google Drive */
   static const DriveMetadataReadonlyScope = "https://www.googleapis.com/auth/drive.metadata.readonly";
 
-  /** View the files and documents in your Google Drive */
+  /** View the files in your Google Drive */
   static const DriveReadonlyScope = "https://www.googleapis.com/auth/drive.readonly";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   ActivitiesResourceApi get activities => new ActivitiesResourceApi(_requester);
 
   AppsactivityApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "appsactivity/v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class ActivitiesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ActivitiesResourceApi(common_internal.ApiRequester client) : 
+  ActivitiesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -79,7 +81,7 @@
    *
    * Completes with a [ListActivitiesResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -90,7 +92,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (drive_ancestorId != null) {
@@ -676,5 +678,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/appstate/v1.dart b/generated/googleapis/lib/appstate/v1.dart
index 1eca19f..c98a578 100644
--- a/generated/googleapis/lib/appstate/v1.dart
+++ b/generated/googleapis/lib/appstate/v1.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.appstate.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client appstate/v1';
 
 /** The Google App State API. */
 class AppstateApi {
@@ -19,20 +22,19 @@
   static const AppstateScope = "https://www.googleapis.com/auth/appstate";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   StatesResourceApi get states => new StatesResourceApi(_requester);
 
   AppstateApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "appstate/v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class StatesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  StatesResourceApi(common_internal.ApiRequester client) : 
+  StatesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -50,7 +52,7 @@
    *
    * Completes with a [WriteResult].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -61,7 +63,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (stateKey == null) {
@@ -72,7 +74,7 @@
     }
 
 
-    _url = 'states/' + common_internal.Escaper.ecapeVariable('$stateKey') + '/clear';
+    _url = 'states/' + commons.Escaper.ecapeVariable('$stateKey') + '/clear';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -96,7 +98,7 @@
    * [stateKey] - The key for the data to be retrieved.
    * Value must be between "0" and "3".
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -107,7 +109,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (stateKey == null) {
@@ -116,7 +118,7 @@
 
     _downloadOptions = null;
 
-    _url = 'states/' + common_internal.Escaper.ecapeVariable('$stateKey');
+    _url = 'states/' + commons.Escaper.ecapeVariable('$stateKey');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -139,7 +141,7 @@
    *
    * Completes with a [GetResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -150,7 +152,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (stateKey == null) {
@@ -158,7 +160,7 @@
     }
 
 
-    _url = 'states/' + common_internal.Escaper.ecapeVariable('$stateKey');
+    _url = 'states/' + commons.Escaper.ecapeVariable('$stateKey');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -180,7 +182,7 @@
    *
    * Completes with a [ListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -191,7 +193,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (includeData != null) {
@@ -231,7 +233,7 @@
    *
    * Completes with a [WriteResult].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -242,7 +244,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -256,7 +258,7 @@
     }
 
 
-    _url = 'states/' + common_internal.Escaper.ecapeVariable('$stateKey');
+    _url = 'states/' + commons.Escaper.ecapeVariable('$stateKey');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -450,5 +452,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/bigquery/v2.dart b/generated/googleapis/lib/bigquery/v2.dart
index 4dbc748..1ba50cd 100644
--- a/generated/googleapis/lib/bigquery/v2.dart
+++ b/generated/googleapis/lib/bigquery/v2.dart
@@ -1,17 +1,22 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.bigquery.v2;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError, Media, UploadOptions,
+    ResumableUploadOptions, DownloadOptions, PartialDownloadOptions,
+    ByteRange;
+
+const core.String USER_AGENT = 'dart-api-client bigquery/v2';
 
 /** A data platform for customers to create, manage, share and query data. */
 class BigqueryApi {
@@ -34,7 +39,7 @@
   static const DevstorageReadWriteScope = "https://www.googleapis.com/auth/devstorage.read_write";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   DatasetsResourceApi get datasets => new DatasetsResourceApi(_requester);
   JobsResourceApi get jobs => new JobsResourceApi(_requester);
@@ -43,15 +48,14 @@
   TablesResourceApi get tables => new TablesResourceApi(_requester);
 
   BigqueryApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "bigquery/v2/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class DatasetsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  DatasetsResourceApi(common_internal.ApiRequester client) : 
+  DatasetsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -69,7 +73,7 @@
    * [deleteContents] - If True, delete all the tables in the dataset. If False
    * and the dataset contains tables, the request will fail. Default is False
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -80,7 +84,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (projectId == null) {
@@ -95,7 +99,7 @@
 
     _downloadOptions = null;
 
-    _url = 'projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/datasets/' + common_internal.Escaper.ecapeVariable('$datasetId');
+    _url = 'projects/' + commons.Escaper.ecapeVariable('$projectId') + '/datasets/' + commons.Escaper.ecapeVariable('$datasetId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -118,7 +122,7 @@
    *
    * Completes with a [Dataset].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -129,7 +133,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (projectId == null) {
@@ -140,7 +144,7 @@
     }
 
 
-    _url = 'projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/datasets/' + common_internal.Escaper.ecapeVariable('$datasetId');
+    _url = 'projects/' + commons.Escaper.ecapeVariable('$projectId') + '/datasets/' + commons.Escaper.ecapeVariable('$datasetId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -163,7 +167,7 @@
    *
    * Completes with a [Dataset].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -174,7 +178,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -185,7 +189,7 @@
     }
 
 
-    _url = 'projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/datasets';
+    _url = 'projects/' + commons.Escaper.ecapeVariable('$projectId') + '/datasets';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -215,7 +219,7 @@
    *
    * Completes with a [DatasetList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -226,7 +230,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (projectId == null) {
@@ -243,7 +247,7 @@
     }
 
 
-    _url = 'projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/datasets';
+    _url = 'projects/' + commons.Escaper.ecapeVariable('$projectId') + '/datasets';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -271,7 +275,7 @@
    *
    * Completes with a [Dataset].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -282,7 +286,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -296,7 +300,7 @@
     }
 
 
-    _url = 'projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/datasets/' + common_internal.Escaper.ecapeVariable('$datasetId');
+    _url = 'projects/' + commons.Escaper.ecapeVariable('$projectId') + '/datasets/' + commons.Escaper.ecapeVariable('$datasetId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -323,7 +327,7 @@
    *
    * Completes with a [Dataset].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -334,7 +338,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -348,7 +352,7 @@
     }
 
 
-    _url = 'projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/datasets/' + common_internal.Escaper.ecapeVariable('$datasetId');
+    _url = 'projects/' + commons.Escaper.ecapeVariable('$projectId') + '/datasets/' + commons.Escaper.ecapeVariable('$datasetId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -363,11 +367,10 @@
 }
 
 
-/** Not documented yet. */
 class JobsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  JobsResourceApi(common_internal.ApiRequester client) : 
+  JobsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -381,7 +384,7 @@
    *
    * Completes with a [Job].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -392,7 +395,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (projectId == null) {
@@ -403,7 +406,7 @@
     }
 
 
-    _url = 'projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/jobs/' + common_internal.Escaper.ecapeVariable('$jobId');
+    _url = 'projects/' + commons.Escaper.ecapeVariable('$projectId') + '/jobs/' + commons.Escaper.ecapeVariable('$jobId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -437,7 +440,7 @@
    *
    * Completes with a [GetQueryResultsResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -448,7 +451,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (projectId == null) {
@@ -471,7 +474,7 @@
     }
 
 
-    _url = 'projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/queries/' + common_internal.Escaper.ecapeVariable('$jobId');
+    _url = 'projects/' + commons.Escaper.ecapeVariable('$projectId') + '/queries/' + commons.Escaper.ecapeVariable('$jobId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -499,18 +502,18 @@
    *
    * Completes with a [Job].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<Job> insert(Job request, core.String projectId, {common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<Job> insert(Job request, core.String projectId, {commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -524,11 +527,11 @@
     _uploadOptions =  uploadOptions;
 
     if (_uploadMedia == null) {
-      _url = 'projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/jobs';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/bigquery/v2/projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/jobs';
+      _url = 'projects/' + commons.Escaper.ecapeVariable('$projectId') + '/jobs';
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/bigquery/v2/projects/' + commons.Escaper.ecapeVariable('$projectId') + '/jobs';
     } else {
-      _url = '/upload/bigquery/v2/projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/jobs';
+      _url = '/upload/bigquery/v2/projects/' + commons.Escaper.ecapeVariable('$projectId') + '/jobs';
     }
 
 
@@ -568,7 +571,7 @@
    *
    * Completes with a [JobList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -579,7 +582,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (projectId == null) {
@@ -602,7 +605,7 @@
     }
 
 
-    _url = 'projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/jobs';
+    _url = 'projects/' + commons.Escaper.ecapeVariable('$projectId') + '/jobs';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -626,7 +629,7 @@
    *
    * Completes with a [QueryResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -637,7 +640,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -648,7 +651,7 @@
     }
 
 
-    _url = 'projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/queries';
+    _url = 'projects/' + commons.Escaper.ecapeVariable('$projectId') + '/queries';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -663,11 +666,10 @@
 }
 
 
-/** Not documented yet. */
 class ProjectsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ProjectsResourceApi(common_internal.ApiRequester client) : 
+  ProjectsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -682,7 +684,7 @@
    *
    * Completes with a [ProjectList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -693,7 +695,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (maxResults != null) {
@@ -719,11 +721,10 @@
 }
 
 
-/** Not documented yet. */
 class TabledataResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  TabledataResourceApi(common_internal.ApiRequester client) : 
+  TabledataResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -742,7 +743,7 @@
    *
    * Completes with a [TableDataInsertAllResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -753,7 +754,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -770,7 +771,7 @@
     }
 
 
-    _url = 'projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/datasets/' + common_internal.Escaper.ecapeVariable('$datasetId') + '/tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/insertAll';
+    _url = 'projects/' + commons.Escaper.ecapeVariable('$projectId') + '/datasets/' + commons.Escaper.ecapeVariable('$datasetId') + '/tables/' + commons.Escaper.ecapeVariable('$tableId') + '/insertAll';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -802,7 +803,7 @@
    *
    * Completes with a [TableDataList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -813,7 +814,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (projectId == null) {
@@ -836,7 +837,7 @@
     }
 
 
-    _url = 'projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/datasets/' + common_internal.Escaper.ecapeVariable('$datasetId') + '/tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/data';
+    _url = 'projects/' + commons.Escaper.ecapeVariable('$projectId') + '/datasets/' + commons.Escaper.ecapeVariable('$datasetId') + '/tables/' + commons.Escaper.ecapeVariable('$tableId') + '/data';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -851,11 +852,10 @@
 }
 
 
-/** Not documented yet. */
 class TablesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  TablesResourceApi(common_internal.ApiRequester client) : 
+  TablesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -870,7 +870,7 @@
    *
    * [tableId] - Table ID of the table to delete
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -881,7 +881,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (projectId == null) {
@@ -896,7 +896,7 @@
 
     _downloadOptions = null;
 
-    _url = 'projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/datasets/' + common_internal.Escaper.ecapeVariable('$datasetId') + '/tables/' + common_internal.Escaper.ecapeVariable('$tableId');
+    _url = 'projects/' + commons.Escaper.ecapeVariable('$projectId') + '/datasets/' + commons.Escaper.ecapeVariable('$datasetId') + '/tables/' + commons.Escaper.ecapeVariable('$tableId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -923,7 +923,7 @@
    *
    * Completes with a [Table].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -934,7 +934,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (projectId == null) {
@@ -948,7 +948,7 @@
     }
 
 
-    _url = 'projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/datasets/' + common_internal.Escaper.ecapeVariable('$datasetId') + '/tables/' + common_internal.Escaper.ecapeVariable('$tableId');
+    _url = 'projects/' + commons.Escaper.ecapeVariable('$projectId') + '/datasets/' + commons.Escaper.ecapeVariable('$datasetId') + '/tables/' + commons.Escaper.ecapeVariable('$tableId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -973,7 +973,7 @@
    *
    * Completes with a [Table].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -984,7 +984,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -998,7 +998,7 @@
     }
 
 
-    _url = 'projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/datasets/' + common_internal.Escaper.ecapeVariable('$datasetId') + '/tables';
+    _url = 'projects/' + commons.Escaper.ecapeVariable('$projectId') + '/datasets/' + commons.Escaper.ecapeVariable('$datasetId') + '/tables';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1026,7 +1026,7 @@
    *
    * Completes with a [TableList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1037,7 +1037,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (projectId == null) {
@@ -1054,7 +1054,7 @@
     }
 
 
-    _url = 'projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/datasets/' + common_internal.Escaper.ecapeVariable('$datasetId') + '/tables';
+    _url = 'projects/' + commons.Escaper.ecapeVariable('$projectId') + '/datasets/' + commons.Escaper.ecapeVariable('$datasetId') + '/tables';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1084,7 +1084,7 @@
    *
    * Completes with a [Table].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1095,7 +1095,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1112,7 +1112,7 @@
     }
 
 
-    _url = 'projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/datasets/' + common_internal.Escaper.ecapeVariable('$datasetId') + '/tables/' + common_internal.Escaper.ecapeVariable('$tableId');
+    _url = 'projects/' + commons.Escaper.ecapeVariable('$projectId') + '/datasets/' + commons.Escaper.ecapeVariable('$datasetId') + '/tables/' + commons.Escaper.ecapeVariable('$tableId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1141,7 +1141,7 @@
    *
    * Completes with a [Table].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1152,7 +1152,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1169,7 +1169,7 @@
     }
 
 
-    _url = 'projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/datasets/' + common_internal.Escaper.ecapeVariable('$datasetId') + '/tables/' + common_internal.Escaper.ecapeVariable('$tableId');
+    _url = 'projects/' + commons.Escaper.ecapeVariable('$projectId') + '/datasets/' + commons.Escaper.ecapeVariable('$datasetId') + '/tables/' + commons.Escaper.ecapeVariable('$tableId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1185,7 +1185,106 @@
 
 
 
-/** Not documented yet. */
+class CsvOptions {
+  /**
+   * [Optional] Indicates if BigQuery should accept rows that are missing
+   * trailing optional columns. If true, BigQuery treats missing trailing
+   * columns as null values. If false, records with missing trailing columns are
+   * treated as bad records, and if there are too many bad records, an invalid
+   * error is returned in the job result. The default value is false.
+   */
+  core.bool allowJaggedRows;
+
+  /**
+   * [Optional] Indicates if BigQuery should allow quoted data sections that
+   * contain newline characters in a CSV file. The default value is false.
+   */
+  core.bool allowQuotedNewlines;
+
+  /**
+   * [Optional] The character encoding of the data. The supported values are
+   * UTF-8 or ISO-8859-1. The default value is UTF-8. BigQuery decodes the data
+   * after the raw, binary data has been split using the values of the quote and
+   * fieldDelimiter properties.
+   */
+  core.String encoding;
+
+  /**
+   * [Optional] The separator for fields in a CSV file. BigQuery converts the
+   * string to ISO-8859-1 encoding, and then uses the first byte of the encoded
+   * string to split the data in its raw, binary state. BigQuery also supports
+   * the escape sequence "\t" to specify a tab separator. The default value is a
+   * comma (',').
+   */
+  core.String fieldDelimiter;
+
+  /**
+   * [Optional] The value that is used to quote data sections in a CSV file.
+   * BigQuery converts the string to ISO-8859-1 encoding, and then uses the
+   * first byte of the encoded string to split the data in its raw, binary
+   * state. The default value is a double-quote ('"'). If your data does not
+   * contain quoted sections, set the property value to an empty string. If your
+   * data contains quoted newline characters, you must also set the
+   * allowQuotedNewlines property to true.
+   */
+  core.String quote;
+
+  /**
+   * [Optional] The number of rows at the top of a CSV file that BigQuery will
+   * skip when reading the data. The default value is 0. This property is useful
+   * if you have header rows in the file that should be skipped.
+   */
+  core.int skipLeadingRows;
+
+
+  CsvOptions();
+
+  CsvOptions.fromJson(core.Map _json) {
+    if (_json.containsKey("allowJaggedRows")) {
+      allowJaggedRows = _json["allowJaggedRows"];
+    }
+    if (_json.containsKey("allowQuotedNewlines")) {
+      allowQuotedNewlines = _json["allowQuotedNewlines"];
+    }
+    if (_json.containsKey("encoding")) {
+      encoding = _json["encoding"];
+    }
+    if (_json.containsKey("fieldDelimiter")) {
+      fieldDelimiter = _json["fieldDelimiter"];
+    }
+    if (_json.containsKey("quote")) {
+      quote = _json["quote"];
+    }
+    if (_json.containsKey("skipLeadingRows")) {
+      skipLeadingRows = _json["skipLeadingRows"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (allowJaggedRows != null) {
+      _json["allowJaggedRows"] = allowJaggedRows;
+    }
+    if (allowQuotedNewlines != null) {
+      _json["allowQuotedNewlines"] = allowQuotedNewlines;
+    }
+    if (encoding != null) {
+      _json["encoding"] = encoding;
+    }
+    if (fieldDelimiter != null) {
+      _json["fieldDelimiter"] = fieldDelimiter;
+    }
+    if (quote != null) {
+      _json["quote"] = quote;
+    }
+    if (skipLeadingRows != null) {
+      _json["skipLeadingRows"] = skipLeadingRows;
+    }
+    return _json;
+  }
+}
+
+
 class DatasetAccess {
   /**
    * [Pick one] A domain to grant access to. Any users signed in with the domain
@@ -1275,7 +1374,6 @@
 }
 
 
-/** Not documented yet. */
 class Dataset {
   /**
    * [Optional] An array of objects that define dataset access for one or more
@@ -1298,6 +1396,20 @@
   /** [Required] A reference that identifies the dataset. */
   DatasetReference datasetReference;
 
+  /**
+   * [Experimental] The default lifetime of all tables in the dataset, in
+   * milliseconds. The minimum value is 3600000 milliseconds (one hour). Once
+   * this property is set, all newly-created tables in the dataset will have an
+   * expirationTime property set to the creation time plus the value in this
+   * property, and changing the value will only affect new tables, not existing
+   * ones. When the expirationTime for a given table is reached, that table will
+   * be deleted automatically. If a table's expirationTime is modified or
+   * removed before the table expires, or if you provide an explicit
+   * expirationTime when creating a table, that value takes precedence over the
+   * default expiration time indicated by this property.
+   */
+  core.String defaultTableExpirationMs;
+
   /** [Optional] A user-friendly description of the dataset. */
   core.String description;
 
@@ -1343,6 +1455,9 @@
     if (_json.containsKey("datasetReference")) {
       datasetReference = new DatasetReference.fromJson(_json["datasetReference"]);
     }
+    if (_json.containsKey("defaultTableExpirationMs")) {
+      defaultTableExpirationMs = _json["defaultTableExpirationMs"];
+    }
     if (_json.containsKey("description")) {
       description = _json["description"];
     }
@@ -1377,6 +1492,9 @@
     if (datasetReference != null) {
       _json["datasetReference"] = (datasetReference).toJson();
     }
+    if (defaultTableExpirationMs != null) {
+      _json["defaultTableExpirationMs"] = defaultTableExpirationMs;
+    }
     if (description != null) {
       _json["description"] = description;
     }
@@ -1403,7 +1521,6 @@
 }
 
 
-/** Not documented yet. */
 class DatasetListDatasets {
   /**
    * The dataset reference. Use this property to access specific parts of the
@@ -1460,7 +1577,6 @@
 }
 
 
-/** Not documented yet. */
 class DatasetList {
   /**
    * An array of the dataset resources in the project. Each resource contains
@@ -1525,7 +1641,6 @@
 }
 
 
-/** Not documented yet. */
 class DatasetReference {
   /**
    * [Required] A unique ID for this dataset, without the project name. The ID
@@ -1562,7 +1677,6 @@
 }
 
 
-/** Not documented yet. */
 class ErrorProto {
   /**
    * Debugging information. This property is internal to Google and should not
@@ -1616,7 +1730,107 @@
 }
 
 
-/** Not documented yet. */
+class ExternalDataConfiguration {
+  /**
+   * [Optional] The compression type of the data source. Possible values include
+   * GZIP and NONE. The default value is NONE.
+   */
+  core.String compression;
+
+  /** Additional properties to set if sourceFormat is set to CSV. */
+  CsvOptions csvOptions;
+
+  /**
+   * [Optional] Indicates if BigQuery should allow extra values that are not
+   * represented in the table schema. If true, the extra values are ignored. If
+   * false, records with extra columns are treated as bad records, and if there
+   * are too many bad records, an invalid error is returned in the job result.
+   * The default value is false. The sourceFormat property determines what
+   * BigQuery treats as an extra value: CSV: Trailing columns
+   */
+  core.bool ignoreUnknownValues;
+
+  /**
+   * [Optional] The maximum number of bad records that BigQuery can ignore when
+   * reading data. If the number of bad records exceeds this value, an invalid
+   * error is returned in the job result. The default value is 0, which requires
+   * that all records are valid.
+   */
+  core.int maxBadRecords;
+
+  /** [Required] The schema for the data. */
+  TableSchema schema;
+
+  /**
+   * [Optional] The data format. External data sources must be in CSV format.
+   * The default value is CSV.
+   */
+  core.String sourceFormat;
+
+  /**
+   * [Required] The fully-qualified URIs that point to your data in Google Cloud
+   * Storage. Each URI can contain one '*' wildcard character and it must come
+   * after the 'bucket' name. CSV limits related to load jobs apply to external
+   * data sources, plus an additional limit of 10 GB maximum size across all
+   * URIs.
+   */
+  core.List<core.String> sourceUris;
+
+
+  ExternalDataConfiguration();
+
+  ExternalDataConfiguration.fromJson(core.Map _json) {
+    if (_json.containsKey("compression")) {
+      compression = _json["compression"];
+    }
+    if (_json.containsKey("csvOptions")) {
+      csvOptions = new CsvOptions.fromJson(_json["csvOptions"]);
+    }
+    if (_json.containsKey("ignoreUnknownValues")) {
+      ignoreUnknownValues = _json["ignoreUnknownValues"];
+    }
+    if (_json.containsKey("maxBadRecords")) {
+      maxBadRecords = _json["maxBadRecords"];
+    }
+    if (_json.containsKey("schema")) {
+      schema = new TableSchema.fromJson(_json["schema"]);
+    }
+    if (_json.containsKey("sourceFormat")) {
+      sourceFormat = _json["sourceFormat"];
+    }
+    if (_json.containsKey("sourceUris")) {
+      sourceUris = _json["sourceUris"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (compression != null) {
+      _json["compression"] = compression;
+    }
+    if (csvOptions != null) {
+      _json["csvOptions"] = (csvOptions).toJson();
+    }
+    if (ignoreUnknownValues != null) {
+      _json["ignoreUnknownValues"] = ignoreUnknownValues;
+    }
+    if (maxBadRecords != null) {
+      _json["maxBadRecords"] = maxBadRecords;
+    }
+    if (schema != null) {
+      _json["schema"] = (schema).toJson();
+    }
+    if (sourceFormat != null) {
+      _json["sourceFormat"] = sourceFormat;
+    }
+    if (sourceUris != null) {
+      _json["sourceUris"] = sourceUris;
+    }
+    return _json;
+  }
+}
+
+
 class GetQueryResultsResponse {
   /** Whether the query result was fetched from the query cache. */
   core.bool cacheHit;
@@ -1743,7 +1957,6 @@
 }
 
 
-/** Not documented yet. */
 class Job {
   /** [Required] Describes the job configuration. */
   JobConfiguration configuration;
@@ -1845,7 +2058,6 @@
 }
 
 
-/** Not documented yet. */
 class JobConfiguration {
   /** [Pick one] Copies a table. */
   JobConfigurationTableCopy copy;
@@ -1919,7 +2131,6 @@
 }
 
 
-/** Not documented yet. */
 class JobConfigurationExtract {
   /**
    * [Optional] The compression type to use for exported files. Possible values
@@ -2017,7 +2228,6 @@
 }
 
 
-/** Not documented yet. */
 class JobConfigurationLink {
   /**
    * [Optional] Specifies whether the job is allowed to create new tables. The
@@ -2085,12 +2295,13 @@
 }
 
 
-/** Not documented yet. */
 class JobConfigurationLoad {
   /**
    * [Optional] Accept rows that are missing trailing optional columns. The
-   * missing values are treated as nulls. Default is false which treats short
-   * rows as errors. Only applicable to CSV, ignored for other formats.
+   * missing values are treated as nulls. If false, records with missing
+   * trailing columns are treated as bad records, and if there are too many bad
+   * records, an invalid error is returned in the job result. The default value
+   * is false. Only applicable to CSV, ignored for other formats.
    */
   core.bool allowJaggedRows;
 
@@ -2131,18 +2342,21 @@
   core.String fieldDelimiter;
 
   /**
-   * [Optional] Accept rows that contain values that do not match the schema.
-   * The unknown values are ignored. Default is false which treats unknown
-   * values as errors. For CSV this ignores extra values at the end of a line.
-   * For JSON this ignores named values that do not match any column name.
+   * [Optional] Indicates if BigQuery should allow extra values that are not
+   * represented in the table schema. If true, the extra values are ignored. If
+   * false, records with extra columns are treated as bad records, and if there
+   * are too many bad records, an invalid error is returned in the job result.
+   * The default value is false. The sourceFormat property determines what
+   * BigQuery treats as an extra value: CSV: Trailing columns JSON: Named values
+   * that don't match any column names
    */
   core.bool ignoreUnknownValues;
 
   /**
    * [Optional] The maximum number of bad records that BigQuery can ignore when
    * running the job. If the number of bad records exceeds this value, an
-   * 'invalid' error is returned in the job result and the job fails. The
-   * default value is 0, which requires that all records are valid.
+   * invalid error is returned in the job result. The default value is 0, which
+   * requires that all records are valid.
    */
   core.int maxBadRecords;
 
@@ -2200,8 +2414,8 @@
 
   /**
    * [Required] The fully-qualified URIs that point to your data in Google Cloud
-   * Storage. Wildcard names are only supported when they appear at the end of
-   * the URI.
+   * Storage. Each URI can contain one '*' wildcard character and it must come
+   * after the 'bucket' name.
    */
   core.List<core.String> sourceUris;
 
@@ -2333,7 +2547,6 @@
 }
 
 
-/** Not documented yet. */
 class JobConfigurationQuery {
   /**
    * If true, allows the query to produce arbitrarily large result tables at a
@@ -2383,6 +2596,14 @@
   core.String query;
 
   /**
+   * [Experimental] If querying an external data source outside of BigQuery,
+   * describes the data format, location and other properties of the data
+   * source. By defining these properties, the data source can then be queried
+   * as if it were a standard BigQuery table.
+   */
+  core.Map<core.String, ExternalDataConfiguration> tableDefinitions;
+
+  /**
    * [Optional] Whether to look for the result in the query cache. The query
    * cache is a best-effort cache that will be flushed whenever tables in the
    * query are modified. Moreover, the query cache is only available when a
@@ -2431,6 +2652,9 @@
     if (_json.containsKey("query")) {
       query = _json["query"];
     }
+    if (_json.containsKey("tableDefinitions")) {
+      tableDefinitions = commons.mapMap(_json["tableDefinitions"], (item) => new ExternalDataConfiguration.fromJson(item));
+    }
     if (_json.containsKey("useQueryCache")) {
       useQueryCache = _json["useQueryCache"];
     }
@@ -2465,6 +2689,9 @@
     if (query != null) {
       _json["query"] = query;
     }
+    if (tableDefinitions != null) {
+      _json["tableDefinitions"] = commons.mapMap(tableDefinitions, (item) => (item).toJson());
+    }
     if (useQueryCache != null) {
       _json["useQueryCache"] = useQueryCache;
     }
@@ -2476,7 +2703,6 @@
 }
 
 
-/** Not documented yet. */
 class JobConfigurationTableCopy {
   /**
    * [Optional] Specifies whether the job is allowed to create new tables. The
@@ -2553,7 +2779,6 @@
 }
 
 
-/** Not documented yet. */
 class JobListJobs {
   /** [Full-projection-only] Specifies the job configuration. */
   JobConfiguration configuration;
@@ -2655,7 +2880,6 @@
 }
 
 
-/** Not documented yet. */
 class JobList {
   /** A hash of this page of results. */
   core.String etag;
@@ -2715,7 +2939,6 @@
 }
 
 
-/** Not documented yet. */
 class JobReference {
   /**
    * [Required] The ID of the job. The ID must contain only letters (a-z, A-Z),
@@ -2752,7 +2975,6 @@
 }
 
 
-/** Not documented yet. */
 class JobStatistics {
   /**
    * [Output-only] Creation time of this job, in milliseconds since the epoch.
@@ -2843,7 +3065,6 @@
 }
 
 
-/** Not documented yet. */
 class JobStatistics2 {
   /**
    * [Output-only] Whether the query result was fetched from the query cache.
@@ -2878,7 +3099,6 @@
 }
 
 
-/** Not documented yet. */
 class JobStatistics3 {
   /** [Output-only] Number of bytes of source data in a joad job. */
   core.String inputFileBytes;
@@ -2935,7 +3155,6 @@
 }
 
 
-/** Not documented yet. */
 class JobStatistics4 {
   /**
    * [Experimental] Number of files per destination URI or URI pattern specified
@@ -2963,7 +3182,6 @@
 }
 
 
-/** Not documented yet. */
 class JobStatus {
   /**
    * [Output-only] Final error result of the job. If present, indicates that the
@@ -3050,7 +3268,6 @@
 }
 
 
-/** Not documented yet. */
 class ProjectListProjects {
   /** A descriptive name for this project. */
   core.String friendlyName;
@@ -3110,7 +3327,6 @@
 }
 
 
-/** Not documented yet. */
 class ProjectList {
   /** A hash of the page of results */
   core.String etag;
@@ -3170,7 +3386,6 @@
 }
 
 
-/** Not documented yet. */
 class ProjectReference {
   /**
    * [Required] ID of the project. Can be either the numeric ID or the assigned
@@ -3197,7 +3412,6 @@
 }
 
 
-/** Not documented yet. */
 class QueryRequest {
   /**
    * [Optional] Specifies the default datasetId and projectId to assume for any
@@ -3314,7 +3528,6 @@
 }
 
 
-/** Not documented yet. */
 class QueryResponse {
   /** Whether the query result was fetched from the query cache. */
   core.bool cacheHit;
@@ -3434,7 +3647,6 @@
 }
 
 
-/** Not documented yet. */
 class Table {
   /**
    * [Output-only] The time when this table was created, in milliseconds since
@@ -3611,7 +3823,7 @@
  */
 class TableCell {
   /**
-   * Not documented yet.
+   *
    *
    * The values for Object must be JSON objects. It can consist of `num`,
    * `String`, `bool` and `null` as well as `Map` and `List` values.
@@ -3637,7 +3849,6 @@
 }
 
 
-/** Not documented yet. */
 class TableDataInsertAllRequestRows {
   /**
    * [Optional] A unique ID for each row. BigQuery uses this property to detect
@@ -3676,40 +3887,64 @@
 }
 
 
-/** Not documented yet. */
 class TableDataInsertAllRequest {
+  /**
+   * [Optional] Accept rows that contain values that do not match the schema.
+   * The unknown values are ignored. Default is false, which treats unknown
+   * values as errors.
+   */
+  core.bool ignoreUnknownValues;
+
   /** The resource type of the response. */
   core.String kind;
 
   /** The rows to insert. */
   core.List<TableDataInsertAllRequestRows> rows;
 
+  /**
+   * [Optional] Insert all valid rows of a request, even if invalid rows exist.
+   * The default value is false, which causes the entire request to fail if any
+   * invalid rows exist.
+   */
+  core.bool skipInvalidRows;
+
 
   TableDataInsertAllRequest();
 
   TableDataInsertAllRequest.fromJson(core.Map _json) {
+    if (_json.containsKey("ignoreUnknownValues")) {
+      ignoreUnknownValues = _json["ignoreUnknownValues"];
+    }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
     }
     if (_json.containsKey("rows")) {
       rows = _json["rows"].map((value) => new TableDataInsertAllRequestRows.fromJson(value)).toList();
     }
+    if (_json.containsKey("skipInvalidRows")) {
+      skipInvalidRows = _json["skipInvalidRows"];
+    }
   }
 
   core.Map toJson() {
     var _json = new core.Map();
+    if (ignoreUnknownValues != null) {
+      _json["ignoreUnknownValues"] = ignoreUnknownValues;
+    }
     if (kind != null) {
       _json["kind"] = kind;
     }
     if (rows != null) {
       _json["rows"] = rows.map((value) => (value).toJson()).toList();
     }
+    if (skipInvalidRows != null) {
+      _json["skipInvalidRows"] = skipInvalidRows;
+    }
     return _json;
   }
 }
 
 
-/** Not documented yet. */
 class TableDataInsertAllResponseInsertErrors {
   /** Error information for the row indicated by the index property. */
   core.List<ErrorProto> errors;
@@ -3742,7 +3977,6 @@
 }
 
 
-/** Not documented yet. */
 class TableDataInsertAllResponse {
   /** An array of errors for rows that were not inserted. */
   core.List<TableDataInsertAllResponseInsertErrors> insertErrors;
@@ -3775,7 +4009,6 @@
 }
 
 
-/** Not documented yet. */
 class TableDataList {
   /** A hash of this page of results. */
   core.String etag;
@@ -3839,7 +4072,6 @@
 }
 
 
-/** Not documented yet. */
 class TableFieldSchema {
   /**
    * [Optional] The field description. The maximum length is 16K characters.
@@ -3915,7 +4147,6 @@
 }
 
 
-/** Not documented yet. */
 class TableListTables {
   /** The user-friendly name for this table. */
   core.String friendlyName;
@@ -3975,7 +4206,6 @@
 }
 
 
-/** Not documented yet. */
 class TableList {
   /** A hash of this page of results. */
   core.String etag;
@@ -4035,7 +4265,6 @@
 }
 
 
-/** Not documented yet. */
 class TableReference {
   /** [Required] The ID of the dataset containing this table. */
   core.String datasetId;
@@ -4085,7 +4314,6 @@
  * Represents a single row in the result set, consisting of one or more fields.
  */
 class TableRow {
-  /** Not documented yet. */
   core.List<TableCell> f;
 
 
@@ -4107,7 +4335,6 @@
 }
 
 
-/** Not documented yet. */
 class TableSchema {
   /** Describes the fields in a table. */
   core.List<TableFieldSchema> fields;
@@ -4131,7 +4358,6 @@
 }
 
 
-/** Not documented yet. */
 class ViewDefinition {
   /** [Required] A query that BigQuery executes when the view is referenced. */
   core.String query;
@@ -4153,5 +4379,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/blogger/v3.dart b/generated/googleapis/lib/blogger/v3.dart
index cedb50e..2cf423e 100644
--- a/generated/googleapis/lib/blogger/v3.dart
+++ b/generated/googleapis/lib/blogger/v3.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.blogger.v3;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client blogger/v3';
 
 /** API for access to the data within Blogger. */
 class BloggerApi {
@@ -22,7 +25,7 @@
   static const BloggerReadonlyScope = "https://www.googleapis.com/auth/blogger.readonly";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   BlogUserInfosResourceApi get blogUserInfos => new BlogUserInfosResourceApi(_requester);
   BlogsResourceApi get blogs => new BlogsResourceApi(_requester);
@@ -34,15 +37,14 @@
   UsersResourceApi get users => new UsersResourceApi(_requester);
 
   BloggerApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "blogger/v3/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class BlogUserInfosResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  BlogUserInfosResourceApi(common_internal.ApiRequester client) : 
+  BlogUserInfosResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -59,7 +61,7 @@
    *
    * Completes with a [BlogUserInfo].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -70,7 +72,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -84,7 +86,7 @@
     }
 
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userId') + '/blogs/' + common_internal.Escaper.ecapeVariable('$blogId');
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userId') + '/blogs/' + commons.Escaper.ecapeVariable('$blogId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -99,11 +101,10 @@
 }
 
 
-/** Not documented yet. */
 class BlogsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  BlogsResourceApi(common_internal.ApiRequester client) : 
+  BlogsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -124,7 +125,7 @@
    *
    * Completes with a [Blog].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -135,7 +136,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (blogId == null) {
@@ -149,7 +150,7 @@
     }
 
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId');
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -177,7 +178,7 @@
    *
    * Completes with a [Blog].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -188,7 +189,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (url == null) {
@@ -239,7 +240,7 @@
    *
    * Completes with a [BlogList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -250,7 +251,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -270,7 +271,7 @@
     }
 
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userId') + '/blogs';
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userId') + '/blogs';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -285,11 +286,10 @@
 }
 
 
-/** Not documented yet. */
 class CommentsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  CommentsResourceApi(common_internal.ApiRequester client) : 
+  CommentsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -305,7 +305,7 @@
    *
    * Completes with a [Comment].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -316,7 +316,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (blogId == null) {
@@ -330,7 +330,7 @@
     }
 
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/posts/' + common_internal.Escaper.ecapeVariable('$postId') + '/comments/' + common_internal.Escaper.ecapeVariable('$commentId') + '/approve';
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/posts/' + commons.Escaper.ecapeVariable('$postId') + '/comments/' + commons.Escaper.ecapeVariable('$commentId') + '/approve';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -353,7 +353,7 @@
    *
    * [commentId] - The ID of the comment to delete.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -364,7 +364,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (blogId == null) {
@@ -379,7 +379,7 @@
 
     _downloadOptions = null;
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/posts/' + common_internal.Escaper.ecapeVariable('$postId') + '/comments/' + common_internal.Escaper.ecapeVariable('$commentId');
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/posts/' + commons.Escaper.ecapeVariable('$postId') + '/comments/' + commons.Escaper.ecapeVariable('$commentId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -413,7 +413,7 @@
    *
    * Completes with a [Comment].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -424,7 +424,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (blogId == null) {
@@ -441,7 +441,7 @@
     }
 
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/posts/' + common_internal.Escaper.ecapeVariable('$postId') + '/comments/' + common_internal.Escaper.ecapeVariable('$commentId');
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/posts/' + commons.Escaper.ecapeVariable('$postId') + '/comments/' + commons.Escaper.ecapeVariable('$commentId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -485,7 +485,7 @@
    *
    * Completes with a [CommentList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -496,7 +496,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (blogId == null) {
@@ -528,7 +528,7 @@
     }
 
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/posts/' + common_internal.Escaper.ecapeVariable('$postId') + '/comments';
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/posts/' + commons.Escaper.ecapeVariable('$postId') + '/comments';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -563,7 +563,7 @@
    *
    * Completes with a [CommentList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -574,7 +574,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (blogId == null) {
@@ -600,7 +600,7 @@
     }
 
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/comments';
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/comments';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -625,7 +625,7 @@
    *
    * Completes with a [Comment].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -636,7 +636,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (blogId == null) {
@@ -650,7 +650,7 @@
     }
 
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/posts/' + common_internal.Escaper.ecapeVariable('$postId') + '/comments/' + common_internal.Escaper.ecapeVariable('$commentId') + '/spam';
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/posts/' + commons.Escaper.ecapeVariable('$postId') + '/comments/' + commons.Escaper.ecapeVariable('$commentId') + '/spam';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -675,7 +675,7 @@
    *
    * Completes with a [Comment].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -686,7 +686,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (blogId == null) {
@@ -700,7 +700,7 @@
     }
 
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/posts/' + common_internal.Escaper.ecapeVariable('$postId') + '/comments/' + common_internal.Escaper.ecapeVariable('$commentId') + '/removecontent';
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/posts/' + commons.Escaper.ecapeVariable('$postId') + '/comments/' + commons.Escaper.ecapeVariable('$commentId') + '/removecontent';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -715,11 +715,10 @@
 }
 
 
-/** Not documented yet. */
 class PageViewsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PageViewsResourceApi(common_internal.ApiRequester client) : 
+  PageViewsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -733,7 +732,7 @@
    *
    * Completes with a [Pageviews].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -744,7 +743,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (blogId == null) {
@@ -755,7 +754,7 @@
     }
 
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/pageviews';
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/pageviews';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -770,11 +769,10 @@
 }
 
 
-/** Not documented yet. */
 class PagesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PagesResourceApi(common_internal.ApiRequester client) : 
+  PagesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -786,7 +784,7 @@
    *
    * [pageId] - The ID of the Page.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -797,7 +795,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (blogId == null) {
@@ -809,7 +807,7 @@
 
     _downloadOptions = null;
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/pages/' + common_internal.Escaper.ecapeVariable('$pageId');
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/pages/' + commons.Escaper.ecapeVariable('$pageId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -838,7 +836,7 @@
    *
    * Completes with a [Page].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -849,7 +847,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (blogId == null) {
@@ -863,7 +861,7 @@
     }
 
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/pages/' + common_internal.Escaper.ecapeVariable('$pageId');
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/pages/' + commons.Escaper.ecapeVariable('$pageId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -888,7 +886,7 @@
    *
    * Completes with a [Page].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -899,7 +897,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -913,7 +911,7 @@
     }
 
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/pages';
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/pages';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -949,7 +947,7 @@
    *
    * Completes with a [PageList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -960,7 +958,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (blogId == null) {
@@ -983,7 +981,7 @@
     }
 
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/pages';
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/pages';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1014,7 +1012,7 @@
    *
    * Completes with a [Page].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1025,7 +1023,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1045,7 +1043,7 @@
     }
 
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/pages/' + common_internal.Escaper.ecapeVariable('$pageId');
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/pages/' + commons.Escaper.ecapeVariable('$pageId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1068,7 +1066,7 @@
    *
    * Completes with a [Page].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1079,7 +1077,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (blogId == null) {
@@ -1090,7 +1088,7 @@
     }
 
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/pages/' + common_internal.Escaper.ecapeVariable('$pageId') + '/publish';
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/pages/' + commons.Escaper.ecapeVariable('$pageId') + '/publish';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1113,7 +1111,7 @@
    *
    * Completes with a [Page].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1124,7 +1122,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (blogId == null) {
@@ -1135,7 +1133,7 @@
     }
 
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/pages/' + common_internal.Escaper.ecapeVariable('$pageId') + '/revert';
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/pages/' + commons.Escaper.ecapeVariable('$pageId') + '/revert';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1166,7 +1164,7 @@
    *
    * Completes with a [Page].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1177,7 +1175,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1197,7 +1195,7 @@
     }
 
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/pages/' + common_internal.Escaper.ecapeVariable('$pageId');
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/pages/' + commons.Escaper.ecapeVariable('$pageId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1212,11 +1210,10 @@
 }
 
 
-/** Not documented yet. */
 class PostUserInfosResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PostUserInfosResourceApi(common_internal.ApiRequester client) : 
+  PostUserInfosResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1237,7 +1234,7 @@
    *
    * Completes with a [PostUserInfo].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1248,7 +1245,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -1265,7 +1262,7 @@
     }
 
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userId') + '/blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/posts/' + common_internal.Escaper.ecapeVariable('$postId');
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userId') + '/blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/posts/' + commons.Escaper.ecapeVariable('$postId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1320,7 +1317,7 @@
    *
    * Completes with a [PostUserInfosList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1331,7 +1328,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -1369,7 +1366,7 @@
     }
 
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userId') + '/blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/posts';
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userId') + '/blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/posts';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1384,11 +1381,10 @@
 }
 
 
-/** Not documented yet. */
 class PostsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PostsResourceApi(common_internal.ApiRequester client) : 
+  PostsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1400,7 +1396,7 @@
    *
    * [postId] - The ID of the Post.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1411,7 +1407,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (blogId == null) {
@@ -1423,7 +1419,7 @@
 
     _downloadOptions = null;
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/posts/' + common_internal.Escaper.ecapeVariable('$postId');
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/posts/' + commons.Escaper.ecapeVariable('$postId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1462,7 +1458,7 @@
    *
    * Completes with a [Post].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1473,7 +1469,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (blogId == null) {
@@ -1496,7 +1492,7 @@
     }
 
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/posts/' + common_internal.Escaper.ecapeVariable('$postId');
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/posts/' + commons.Escaper.ecapeVariable('$postId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1528,7 +1524,7 @@
    *
    * Completes with a [Post].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1539,7 +1535,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (blogId == null) {
@@ -1557,7 +1553,7 @@
     }
 
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/posts/bypath';
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/posts/bypath';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1588,7 +1584,7 @@
    *
    * Completes with a [Post].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1599,7 +1595,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1619,7 +1615,7 @@
     }
 
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/posts';
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/posts';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1672,7 +1668,7 @@
    *
    * Completes with a [PostList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1683,7 +1679,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (blogId == null) {
@@ -1721,7 +1717,7 @@
     }
 
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/posts';
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/posts';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1761,7 +1757,7 @@
    *
    * Completes with a [Post].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1772,7 +1768,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1801,7 +1797,7 @@
     }
 
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/posts/' + common_internal.Escaper.ecapeVariable('$postId');
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/posts/' + commons.Escaper.ecapeVariable('$postId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1830,7 +1826,7 @@
    *
    * Completes with a [Post].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1841,7 +1837,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (blogId == null) {
@@ -1855,7 +1851,7 @@
     }
 
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/posts/' + common_internal.Escaper.ecapeVariable('$postId') + '/publish';
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/posts/' + commons.Escaper.ecapeVariable('$postId') + '/publish';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1878,7 +1874,7 @@
    *
    * Completes with a [Post].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1889,7 +1885,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (blogId == null) {
@@ -1900,7 +1896,7 @@
     }
 
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/posts/' + common_internal.Escaper.ecapeVariable('$postId') + '/revert';
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/posts/' + commons.Escaper.ecapeVariable('$postId') + '/revert';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1932,7 +1928,7 @@
    *
    * Completes with a [PostList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1943,7 +1939,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (blogId == null) {
@@ -1961,7 +1957,7 @@
     }
 
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/posts/search';
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/posts/search';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2001,7 +1997,7 @@
    *
    * Completes with a [Post].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2012,7 +2008,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2041,7 +2037,7 @@
     }
 
 
-    _url = 'blogs/' + common_internal.Escaper.ecapeVariable('$blogId') + '/posts/' + common_internal.Escaper.ecapeVariable('$postId');
+    _url = 'blogs/' + commons.Escaper.ecapeVariable('$blogId') + '/posts/' + commons.Escaper.ecapeVariable('$postId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -2056,11 +2052,10 @@
 }
 
 
-/** Not documented yet. */
 class UsersResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  UsersResourceApi(common_internal.ApiRequester client) : 
+  UsersResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2072,7 +2067,7 @@
    *
    * Completes with a [User].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2083,7 +2078,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -2091,7 +2086,7 @@
     }
 
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userId');
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2224,7 +2219,6 @@
 }
 
 
-/** Not documented yet. */
 class Blog {
   /** The JSON custom meta-data for the Blog */
   core.String customMetaData;
@@ -2356,7 +2350,6 @@
 }
 
 
-/** Not documented yet. */
 class BlogList {
   /** Admin level list of blog per-user information */
   core.List<BlogUserInfo> blogUserInfos;
@@ -2398,7 +2391,6 @@
 }
 
 
-/** Not documented yet. */
 class BlogPerUserInfo {
   /** ID of the Blog resource */
   core.String blogId;
@@ -2470,7 +2462,6 @@
 }
 
 
-/** Not documented yet. */
 class BlogUserInfo {
   /** The Blog resource. */
   Blog blog;
@@ -2659,7 +2650,6 @@
 }
 
 
-/** Not documented yet. */
 class Comment {
   /** The author of this Comment. */
   CommentAuthor author;
@@ -2773,7 +2763,6 @@
 }
 
 
-/** Not documented yet. */
 class CommentList {
   /** The List of Comments for a Post. */
   core.List<Comment> items;
@@ -2923,7 +2912,6 @@
 }
 
 
-/** Not documented yet. */
 class Page {
   /** The author of this Page. */
   PageAuthor author;
@@ -3049,7 +3037,6 @@
 }
 
 
-/** Not documented yet. */
 class PageList {
   /** The list of Pages for a Blog. */
   core.List<Page> items;
@@ -3091,7 +3078,6 @@
 }
 
 
-/** Not documented yet. */
 class PageviewsCounts {
   /** Count of page views for the given time range */
   core.String count;
@@ -3124,7 +3110,6 @@
 }
 
 
-/** Not documented yet. */
 class Pageviews {
   /** Blog Id */
   core.String blogId;
@@ -3265,9 +3250,7 @@
 }
 
 
-/** Not documented yet. */
 class PostImages {
-  /** Not documented yet. */
   core.String url;
 
 
@@ -3382,7 +3365,6 @@
 }
 
 
-/** Not documented yet. */
 class Post {
   /** The author of this Post. */
   PostAuthor author;
@@ -3568,7 +3550,6 @@
 }
 
 
-/** Not documented yet. */
 class PostList {
   /** The list of Posts for this Blog. */
   core.List<Post> items;
@@ -3610,7 +3591,6 @@
 }
 
 
-/** Not documented yet. */
 class PostPerUserInfo {
   /** ID of the Blog that the post resource belongs to. */
   core.String blogId;
@@ -3670,7 +3650,6 @@
 }
 
 
-/** Not documented yet. */
 class PostUserInfo {
   /** The kind of this entity. Always blogger#postUserInfo */
   core.String kind;
@@ -3712,7 +3691,6 @@
 }
 
 
-/** Not documented yet. */
 class PostUserInfosList {
   /** The list of Posts with User information for the post, for this Blog. */
   core.List<PostUserInfo> items;
@@ -3820,7 +3798,6 @@
 }
 
 
-/** Not documented yet. */
 class User {
   /** Profile summary information. */
   core.String about;
@@ -3916,5 +3893,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/books/v1.dart b/generated/googleapis/lib/books/v1.dart
index 715705a..627305f 100644
--- a/generated/googleapis/lib/books/v1.dart
+++ b/generated/googleapis/lib/books/v1.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.books.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common_1;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client books/v1';
 
 /** Lets you search for books and manage your Google Books library. */
 class BooksApi {
@@ -19,7 +22,7 @@
   static const BooksScope = "https://www.googleapis.com/auth/books";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   BookshelvesResourceApi get bookshelves => new BookshelvesResourceApi(_requester);
   CloudloadingResourceApi get cloudloading => new CloudloadingResourceApi(_requester);
@@ -32,17 +35,16 @@
   VolumesResourceApi get volumes => new VolumesResourceApi(_requester);
 
   BooksApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "books/v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class BookshelvesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   BookshelvesVolumesResourceApi get volumes => new BookshelvesVolumesResourceApi(_requester);
 
-  BookshelvesResourceApi(common_internal.ApiRequester client) : 
+  BookshelvesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -58,7 +60,7 @@
    *
    * Completes with a [Bookshelf].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -69,7 +71,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -83,7 +85,7 @@
     }
 
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userId') + '/bookshelves/' + common_internal.Escaper.ecapeVariable('$shelf');
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userId') + '/bookshelves/' + commons.Escaper.ecapeVariable('$shelf');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -106,7 +108,7 @@
    *
    * Completes with a [Bookshelves].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -117,7 +119,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -128,7 +130,7 @@
     }
 
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userId') + '/bookshelves';
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userId') + '/bookshelves';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -143,11 +145,10 @@
 }
 
 
-/** Not documented yet. */
 class BookshelvesVolumesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  BookshelvesVolumesResourceApi(common_internal.ApiRequester client) : 
+  BookshelvesVolumesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -169,7 +170,7 @@
    *
    * Completes with a [Volumes].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -180,7 +181,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -203,7 +204,7 @@
     }
 
 
-    _url = 'users/' + common_internal.Escaper.ecapeVariable('$userId') + '/bookshelves/' + common_internal.Escaper.ecapeVariable('$shelf') + '/volumes';
+    _url = 'users/' + commons.Escaper.ecapeVariable('$userId') + '/bookshelves/' + commons.Escaper.ecapeVariable('$shelf') + '/volumes';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -218,16 +219,13 @@
 }
 
 
-/** Not documented yet. */
 class CloudloadingResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  CloudloadingResourceApi(common_internal.ApiRequester client) : 
+  CloudloadingResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
-   * Not documented yet.
-   *
    * Request parameters:
    *
    * [driveDocumentId] - A drive document id. The upload_client_token must not
@@ -243,7 +241,7 @@
    *
    * Completes with a [BooksCloudloadingResource].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -254,7 +252,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (driveDocumentId != null) {
@@ -290,7 +288,7 @@
    *
    * [volumeId] - The id of the book to be removed.
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -301,7 +299,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (volumeId == null) {
@@ -324,15 +322,13 @@
   }
 
   /**
-   * Not documented yet.
-   *
    * [request] - The metadata request object.
    *
    * Request parameters:
    *
    * Completes with a [BooksCloudloadingResource].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -343,7 +339,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -366,11 +362,10 @@
 }
 
 
-/** Not documented yet. */
 class DictionaryResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  DictionaryResourceApi(common_internal.ApiRequester client) : 
+  DictionaryResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -382,7 +377,7 @@
    *
    * Completes with a [Metadata].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -393,7 +388,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (cpksver == null) {
@@ -417,14 +412,13 @@
 }
 
 
-/** Not documented yet. */
 class LayersResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   LayersAnnotationDataResourceApi get annotationData => new LayersAnnotationDataResourceApi(_requester);
   LayersVolumeAnnotationsResourceApi get volumeAnnotations => new LayersVolumeAnnotationsResourceApi(_requester);
 
-  LayersResourceApi(common_internal.ApiRequester client) : 
+  LayersResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -442,7 +436,7 @@
    *
    * Completes with a [Layersummary].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -453,7 +447,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (volumeId == null) {
@@ -470,7 +464,7 @@
     }
 
 
-    _url = 'volumes/' + common_internal.Escaper.ecapeVariable('$volumeId') + '/layersummary/' + common_internal.Escaper.ecapeVariable('$summaryId');
+    _url = 'volumes/' + commons.Escaper.ecapeVariable('$volumeId') + '/layersummary/' + commons.Escaper.ecapeVariable('$summaryId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -500,7 +494,7 @@
    *
    * Completes with a [Layersummaries].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -511,7 +505,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (volumeId == null) {
@@ -531,7 +525,7 @@
     }
 
 
-    _url = 'volumes/' + common_internal.Escaper.ecapeVariable('$volumeId') + '/layersummary';
+    _url = 'volumes/' + commons.Escaper.ecapeVariable('$volumeId') + '/layersummary';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -546,11 +540,10 @@
 }
 
 
-/** Not documented yet. */
 class LayersAnnotationDataResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  LayersAnnotationDataResourceApi(common_internal.ApiRequester client) : 
+  LayersAnnotationDataResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -585,7 +578,7 @@
    *
    * Completes with a [Annotationdata].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -596,7 +589,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (volumeId == null) {
@@ -632,7 +625,7 @@
     }
 
 
-    _url = 'volumes/' + common_internal.Escaper.ecapeVariable('$volumeId') + '/layers/' + common_internal.Escaper.ecapeVariable('$layerId') + '/data/' + common_internal.Escaper.ecapeVariable('$annotationDataId');
+    _url = 'volumes/' + commons.Escaper.ecapeVariable('$volumeId') + '/layers/' + commons.Escaper.ecapeVariable('$layerId') + '/data/' + commons.Escaper.ecapeVariable('$annotationDataId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -684,7 +677,7 @@
    *
    * Completes with a [Annotationsdata].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -695,7 +688,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (volumeId == null) {
@@ -740,7 +733,7 @@
     }
 
 
-    _url = 'volumes/' + common_internal.Escaper.ecapeVariable('$volumeId') + '/layers/' + common_internal.Escaper.ecapeVariable('$layerId') + '/data';
+    _url = 'volumes/' + commons.Escaper.ecapeVariable('$volumeId') + '/layers/' + commons.Escaper.ecapeVariable('$layerId') + '/data';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -755,11 +748,10 @@
 }
 
 
-/** Not documented yet. */
 class LayersVolumeAnnotationsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  LayersVolumeAnnotationsResourceApi(common_internal.ApiRequester client) : 
+  LayersVolumeAnnotationsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -780,7 +772,7 @@
    *
    * Completes with a [Volumeannotation].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -791,7 +783,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (volumeId == null) {
@@ -811,7 +803,7 @@
     }
 
 
-    _url = 'volumes/' + common_internal.Escaper.ecapeVariable('$volumeId') + '/layers/' + common_internal.Escaper.ecapeVariable('$layerId') + '/annotations/' + common_internal.Escaper.ecapeVariable('$annotationId');
+    _url = 'volumes/' + commons.Escaper.ecapeVariable('$volumeId') + '/layers/' + commons.Escaper.ecapeVariable('$layerId') + '/annotations/' + commons.Escaper.ecapeVariable('$annotationId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -866,7 +858,7 @@
    *
    * Completes with a [Volumeannotations].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -877,7 +869,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (volumeId == null) {
@@ -928,7 +920,7 @@
     }
 
 
-    _url = 'volumes/' + common_internal.Escaper.ecapeVariable('$volumeId') + '/layers/' + common_internal.Escaper.ecapeVariable('$layerId');
+    _url = 'volumes/' + commons.Escaper.ecapeVariable('$volumeId') + '/layers/' + commons.Escaper.ecapeVariable('$layerId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -943,11 +935,10 @@
 }
 
 
-/** Not documented yet. */
 class MyconfigResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  MyconfigResourceApi(common_internal.ApiRequester client) : 
+  MyconfigResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -957,7 +948,7 @@
    *
    * Completes with a [Usersettings].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -968,7 +959,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -1001,7 +992,7 @@
    *
    * Completes with a [DownloadAccesses].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1012,7 +1003,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (volumeIds == null || volumeIds.isEmpty) {
@@ -1068,7 +1059,7 @@
    *
    * Completes with a [RequestAccess].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1079,7 +1070,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (source == null) {
@@ -1141,7 +1132,7 @@
    *
    * Completes with a [Volumes].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1152,7 +1143,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (source == null) {
@@ -1203,7 +1194,7 @@
    *
    * Completes with a [Usersettings].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1214,7 +1205,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1237,24 +1228,22 @@
 }
 
 
-/** Not documented yet. */
 class MylibraryResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   MylibraryAnnotationsResourceApi get annotations => new MylibraryAnnotationsResourceApi(_requester);
   MylibraryBookshelvesResourceApi get bookshelves => new MylibraryBookshelvesResourceApi(_requester);
   MylibraryReadingpositionsResourceApi get readingpositions => new MylibraryReadingpositionsResourceApi(_requester);
 
-  MylibraryResourceApi(common_internal.ApiRequester client) : 
+  MylibraryResourceApi(commons.ApiRequester client) : 
       _requester = client;
 }
 
 
-/** Not documented yet. */
 class MylibraryAnnotationsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  MylibraryAnnotationsResourceApi(common_internal.ApiRequester client) : 
+  MylibraryAnnotationsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1266,7 +1255,7 @@
    *
    * [source] - String to identify the originator of this request.
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1277,7 +1266,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (annotationId == null) {
@@ -1289,7 +1278,7 @@
 
     _downloadOptions = null;
 
-    _url = 'mylibrary/annotations/' + common_internal.Escaper.ecapeVariable('$annotationId');
+    _url = 'mylibrary/annotations/' + commons.Escaper.ecapeVariable('$annotationId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1302,51 +1291,6 @@
   }
 
   /**
-   * Gets an annotation by its ID.
-   *
-   * Request parameters:
-   *
-   * [annotationId] - The ID for the annotation to retrieve.
-   *
-   * [source] - String to identify the originator of this request.
-   *
-   * Completes with a [Annotation].
-   *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
-   * error.
-   *
-   * If the used [http.Client] completes with an error when making a REST call,
-   * this method  will complete with the same error.
-   */
-  async.Future<Annotation> get(core.String annotationId, {core.String source}) {
-    var _url = null;
-    var _queryParams = new core.Map();
-    var _uploadMedia = null;
-    var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
-    var _body = null;
-
-    if (annotationId == null) {
-      throw new core.ArgumentError("Parameter annotationId is required.");
-    }
-    if (source != null) {
-      _queryParams["source"] = [source];
-    }
-
-
-    _url = 'mylibrary/annotations/' + common_internal.Escaper.ecapeVariable('$annotationId');
-
-    var _response = _requester.request(_url,
-                                       "GET",
-                                       body: _body,
-                                       queryParams: _queryParams,
-                                       uploadOptions: _uploadOptions,
-                                       uploadMedia: _uploadMedia,
-                                       downloadOptions: _downloadOptions);
-    return _response.then((data) => new Annotation.fromJson(data));
-  }
-
-  /**
    * Inserts a new annotation.
    *
    * [request] - The metadata request object.
@@ -1362,7 +1306,7 @@
    *
    * Completes with a [Annotation].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1373,7 +1317,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1416,8 +1360,6 @@
    * [maxResults] - Maximum number of results to return
    * Value must be between "0" and "40".
    *
-   * [pageIds] - The page ID(s) for the volume that is being queried.
-   *
    * [pageToken] - The value of the nextToken from the previous page.
    *
    * [showDeleted] - Set to true to return deleted annotations. updatedMin must
@@ -1435,18 +1377,18 @@
    *
    * Completes with a [Annotations].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<Annotations> list({core.String contentVersion, core.String layerId, core.List<core.String> layerIds, core.int maxResults, core.List<core.String> pageIds, core.String pageToken, core.bool showDeleted, core.String source, core.String updatedMax, core.String updatedMin, core.String volumeId}) {
+  async.Future<Annotations> list({core.String contentVersion, core.String layerId, core.List<core.String> layerIds, core.int maxResults, core.String pageToken, core.bool showDeleted, core.String source, core.String updatedMax, core.String updatedMin, core.String volumeId}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (contentVersion != null) {
@@ -1461,9 +1403,6 @@
     if (maxResults != null) {
       _queryParams["maxResults"] = ["${maxResults}"];
     }
-    if (pageIds != null) {
-      _queryParams["pageIds"] = pageIds;
-    }
     if (pageToken != null) {
       _queryParams["pageToken"] = [pageToken];
     }
@@ -1507,7 +1446,7 @@
    *
    * Completes with a [AnnotationsSummary].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1518,7 +1457,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (layerIds == null || layerIds.isEmpty) {
@@ -1556,7 +1495,7 @@
    *
    * Completes with a [Annotation].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1567,7 +1506,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1581,7 +1520,7 @@
     }
 
 
-    _url = 'mylibrary/annotations/' + common_internal.Escaper.ecapeVariable('$annotationId');
+    _url = 'mylibrary/annotations/' + commons.Escaper.ecapeVariable('$annotationId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1596,13 +1535,12 @@
 }
 
 
-/** Not documented yet. */
 class MylibraryBookshelvesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   MylibraryBookshelvesVolumesResourceApi get volumes => new MylibraryBookshelvesVolumesResourceApi(_requester);
 
-  MylibraryBookshelvesResourceApi(common_internal.ApiRequester client) : 
+  MylibraryBookshelvesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1622,7 +1560,7 @@
    *
    * [source] - String to identify the originator of this request.
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1633,7 +1571,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (shelf == null) {
@@ -1652,7 +1590,7 @@
 
     _downloadOptions = null;
 
-    _url = 'mylibrary/bookshelves/' + common_internal.Escaper.ecapeVariable('$shelf') + '/addVolume';
+    _url = 'mylibrary/bookshelves/' + commons.Escaper.ecapeVariable('$shelf') + '/addVolume';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1673,7 +1611,7 @@
    *
    * [source] - String to identify the originator of this request.
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1684,7 +1622,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (shelf == null) {
@@ -1696,7 +1634,7 @@
 
     _downloadOptions = null;
 
-    _url = 'mylibrary/bookshelves/' + common_internal.Escaper.ecapeVariable('$shelf') + '/clearVolumes';
+    _url = 'mylibrary/bookshelves/' + commons.Escaper.ecapeVariable('$shelf') + '/clearVolumes';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1720,7 +1658,7 @@
    *
    * Completes with a [Bookshelf].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1731,7 +1669,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (shelf == null) {
@@ -1742,7 +1680,7 @@
     }
 
 
-    _url = 'mylibrary/bookshelves/' + common_internal.Escaper.ecapeVariable('$shelf');
+    _url = 'mylibrary/bookshelves/' + commons.Escaper.ecapeVariable('$shelf');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1763,7 +1701,7 @@
    *
    * Completes with a [Bookshelves].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1774,7 +1712,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (source != null) {
@@ -1809,7 +1747,7 @@
    *
    * [source] - String to identify the originator of this request.
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1820,7 +1758,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (shelf == null) {
@@ -1840,7 +1778,7 @@
 
     _downloadOptions = null;
 
-    _url = 'mylibrary/bookshelves/' + common_internal.Escaper.ecapeVariable('$shelf') + '/moveVolume';
+    _url = 'mylibrary/bookshelves/' + commons.Escaper.ecapeVariable('$shelf') + '/moveVolume';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1867,7 +1805,7 @@
    *
    * [source] - String to identify the originator of this request.
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1878,7 +1816,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (shelf == null) {
@@ -1897,7 +1835,7 @@
 
     _downloadOptions = null;
 
-    _url = 'mylibrary/bookshelves/' + common_internal.Escaper.ecapeVariable('$shelf') + '/removeVolume';
+    _url = 'mylibrary/bookshelves/' + commons.Escaper.ecapeVariable('$shelf') + '/removeVolume';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1912,11 +1850,10 @@
 }
 
 
-/** Not documented yet. */
 class MylibraryBookshelvesVolumesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  MylibraryBookshelvesVolumesResourceApi(common_internal.ApiRequester client) : 
+  MylibraryBookshelvesVolumesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1945,7 +1882,7 @@
    *
    * Completes with a [Volumes].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1956,7 +1893,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (shelf == null) {
@@ -1985,7 +1922,7 @@
     }
 
 
-    _url = 'mylibrary/bookshelves/' + common_internal.Escaper.ecapeVariable('$shelf') + '/volumes';
+    _url = 'mylibrary/bookshelves/' + commons.Escaper.ecapeVariable('$shelf') + '/volumes';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2000,11 +1937,10 @@
 }
 
 
-/** Not documented yet. */
 class MylibraryReadingpositionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  MylibraryReadingpositionsResourceApi(common_internal.ApiRequester client) : 
+  MylibraryReadingpositionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2021,7 +1957,7 @@
    *
    * Completes with a [ReadingPosition].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2032,7 +1968,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (volumeId == null) {
@@ -2046,7 +1982,7 @@
     }
 
 
-    _url = 'mylibrary/readingpositions/' + common_internal.Escaper.ecapeVariable('$volumeId');
+    _url = 'mylibrary/readingpositions/' + commons.Escaper.ecapeVariable('$volumeId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2086,7 +2022,7 @@
    *
    * [source] - String to identify the originator of this request.
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2097,7 +2033,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (volumeId == null) {
@@ -2126,7 +2062,7 @@
 
     _downloadOptions = null;
 
-    _url = 'mylibrary/readingpositions/' + common_internal.Escaper.ecapeVariable('$volumeId') + '/setPosition';
+    _url = 'mylibrary/readingpositions/' + commons.Escaper.ecapeVariable('$volumeId') + '/setPosition';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2141,11 +2077,10 @@
 }
 
 
-/** Not documented yet. */
 class OnboardingResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  OnboardingResourceApi(common_internal.ApiRequester client) : 
+  OnboardingResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2158,7 +2093,7 @@
    *
    * Completes with a [Category].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2169,7 +2104,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (locale != null) {
@@ -2206,7 +2141,7 @@
    *
    * Completes with a [Volume2].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2217,7 +2152,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (categoryId != null) {
@@ -2249,16 +2184,13 @@
 }
 
 
-/** Not documented yet. */
 class PromoofferResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PromoofferResourceApi(common_internal.ApiRequester client) : 
+  PromoofferResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
-   * Not documented yet.
-   *
    * Request parameters:
    *
    * [androidId] - device android_id
@@ -2277,7 +2209,7 @@
    *
    * [volumeId] - Volume id to exercise the offer
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2288,7 +2220,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (androidId != null) {
@@ -2331,8 +2263,6 @@
   }
 
   /**
-   * Not documented yet.
-   *
    * Request parameters:
    *
    * [androidId] - device android_id
@@ -2349,7 +2279,7 @@
    *
    * [serial] - device serial
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2360,7 +2290,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (androidId != null) {
@@ -2418,7 +2348,7 @@
    *
    * Completes with a [Offers].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2429,7 +2359,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (androidId != null) {
@@ -2467,16 +2397,15 @@
 }
 
 
-/** Not documented yet. */
 class VolumesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   VolumesAssociatedResourceApi get associated => new VolumesAssociatedResourceApi(_requester);
   VolumesMybooksResourceApi get mybooks => new VolumesMybooksResourceApi(_requester);
   VolumesRecommendedResourceApi get recommended => new VolumesRecommendedResourceApi(_requester);
   VolumesUseruploadedResourceApi get useruploaded => new VolumesUseruploadedResourceApi(_requester);
 
-  VolumesResourceApi(common_internal.ApiRequester client) : 
+  VolumesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2501,7 +2430,7 @@
    *
    * Completes with a [Volume].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2512,7 +2441,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (volumeId == null) {
@@ -2535,7 +2464,7 @@
     }
 
 
-    _url = 'volumes/' + common_internal.Escaper.ecapeVariable('$volumeId');
+    _url = 'volumes/' + commons.Escaper.ecapeVariable('$volumeId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2603,7 +2532,7 @@
    *
    * Completes with a [Volumes].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2614,7 +2543,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (q == null) {
@@ -2674,11 +2603,10 @@
 }
 
 
-/** Not documented yet. */
 class VolumesAssociatedResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  VolumesAssociatedResourceApi(common_internal.ApiRequester client) : 
+  VolumesAssociatedResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2701,7 +2629,7 @@
    *
    * Completes with a [Volumes].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2712,7 +2640,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (volumeId == null) {
@@ -2729,7 +2657,7 @@
     }
 
 
-    _url = 'volumes/' + common_internal.Escaper.ecapeVariable('$volumeId') + '/associated';
+    _url = 'volumes/' + commons.Escaper.ecapeVariable('$volumeId') + '/associated';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2744,11 +2672,10 @@
 }
 
 
-/** Not documented yet. */
 class VolumesMybooksResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  VolumesMybooksResourceApi(common_internal.ApiRequester client) : 
+  VolumesMybooksResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2774,7 +2701,7 @@
    *
    * Completes with a [Volumes].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2785,7 +2712,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (acquireMethod != null) {
@@ -2823,11 +2750,10 @@
 }
 
 
-/** Not documented yet. */
 class VolumesRecommendedResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  VolumesRecommendedResourceApi(common_internal.ApiRequester client) : 
+  VolumesRecommendedResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2842,7 +2768,7 @@
    *
    * Completes with a [Volumes].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2853,7 +2779,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (locale != null) {
@@ -2895,7 +2821,7 @@
    *
    * Completes with a [BooksVolumesRecommendedRateResponse].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2906,7 +2832,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (rating == null) {
@@ -2940,11 +2866,10 @@
 }
 
 
-/** Not documented yet. */
 class VolumesUseruploadedResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  VolumesUseruploadedResourceApi(common_internal.ApiRequester client) : 
+  VolumesUseruploadedResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2970,7 +2895,7 @@
    *
    * Completes with a [Volumes].
    *
-   * Completes with a [common_1.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2981,7 +2906,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common_1.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (locale != null) {
@@ -3140,7 +3065,6 @@
 }
 
 
-/** Not documented yet. */
 class AnnotationLayerSummary {
   /**
    * Maximum allowed characters on this layer, especially for the "copy" layer.
@@ -3190,7 +3114,6 @@
 }
 
 
-/** Not documented yet. */
 class Annotation {
   /**
    * Anchor text after excerpt. For requests, if the user bookmarked a screen
@@ -3231,7 +3154,6 @@
   /** The layer this annotation is for. */
   core.String layerId;
 
-  /** Not documented yet. */
   AnnotationLayerSummary layerSummary;
 
   /** Pages that this annotation spans. */
@@ -3364,13 +3286,12 @@
 }
 
 
-/** Not documented yet. */
 class Annotationdata {
   /** The type of annotation this data is for. */
   core.String annotationType;
 
   /**
-   * Not documented yet.
+   *
    *
    * The values for Object must be JSON objects. It can consist of `num`,
    * `String`, `bool` and `null` as well as `Map` and `List` values.
@@ -3476,7 +3397,6 @@
 }
 
 
-/** Not documented yet. */
 class Annotations {
   /** A list of annotations. */
   core.List<Annotation> items;
@@ -3533,21 +3453,15 @@
 }
 
 
-/** Not documented yet. */
 class AnnotationsSummaryLayers {
-  /** Not documented yet. */
   core.int allowedCharacterCount;
 
-  /** Not documented yet. */
   core.String layerId;
 
-  /** Not documented yet. */
   core.String limitType;
 
-  /** Not documented yet. */
   core.int remainingCharacterCount;
 
-  /** Not documented yet. */
   core.DateTime updated;
 
 
@@ -3593,12 +3507,9 @@
 }
 
 
-/** Not documented yet. */
 class AnnotationsSummary {
-  /** Not documented yet. */
   core.String kind;
 
-  /** Not documented yet. */
   core.List<AnnotationsSummaryLayers> layers;
 
 
@@ -3626,7 +3537,6 @@
 }
 
 
-/** Not documented yet. */
 class Annotationsdata {
   /** A list of Annotation Data. */
   core.List<Annotationdata> items;
@@ -3680,7 +3590,6 @@
 }
 
 
-/** Not documented yet. */
 class BooksAnnotationsRange {
   /** The offset from the ending position. */
   core.String endOffset;
@@ -3731,18 +3640,13 @@
 }
 
 
-/** Not documented yet. */
 class BooksCloudloadingResource {
-  /** Not documented yet. */
   core.String author;
 
-  /** Not documented yet. */
   core.String processingState;
 
-  /** Not documented yet. */
   core.String title;
 
-  /** Not documented yet. */
   core.String volumeId;
 
 
@@ -3782,9 +3686,7 @@
 }
 
 
-/** Not documented yet. */
 class BooksVolumesRecommendedRateResponse {
-  /** Not documented yet. */
   core.String consistencyToken;
 
 
@@ -3806,7 +3708,6 @@
 }
 
 
-/** Not documented yet. */
 class Bookshelf {
   /** Whether this bookshelf is PUBLIC or PRIVATE. */
   core.String access;
@@ -3920,7 +3821,6 @@
 }
 
 
-/** Not documented yet. */
 class Bookshelves {
   /** A list of bookshelves. */
   core.List<Bookshelf> items;
@@ -3953,15 +3853,11 @@
 }
 
 
-/** Not documented yet. */
 class CategoryItems {
-  /** Not documented yet. */
   core.String badgeUrl;
 
-  /** Not documented yet. */
   core.String categoryId;
 
-  /** Not documented yet. */
   core.String name;
 
 
@@ -3995,7 +3891,6 @@
 }
 
 
-/** Not documented yet. */
 class Category {
   /** A list of onboarding categories. */
   core.List<CategoryItems> items;
@@ -4028,7 +3923,6 @@
 }
 
 
-/** Not documented yet. */
 class ConcurrentAccessRestriction {
   /** Whether access is granted for this (user, device, volume). */
   core.bool deviceAllowed;
@@ -4147,7 +4041,6 @@
 }
 
 
-/** Not documented yet. */
 class DictlayerdataCommon {
   /**
    * The display title and localized canonical name to use when searching for
@@ -4176,10 +4069,8 @@
 
 /** The source, url and attribution for this dictionary data. */
 class DictlayerdataDictSource {
-  /** Not documented yet. */
   core.String attribution;
 
-  /** Not documented yet. */
   core.String url;
 
 
@@ -4207,12 +4098,9 @@
 }
 
 
-/** Not documented yet. */
 class DictlayerdataDictWordsDerivativesSource {
-  /** Not documented yet. */
   core.String attribution;
 
-  /** Not documented yet. */
   core.String url;
 
 
@@ -4240,12 +4128,9 @@
 }
 
 
-/** Not documented yet. */
 class DictlayerdataDictWordsDerivatives {
-  /** Not documented yet. */
   DictlayerdataDictWordsDerivativesSource source;
 
-  /** Not documented yet. */
   core.String text;
 
 
@@ -4273,12 +4158,9 @@
 }
 
 
-/** Not documented yet. */
 class DictlayerdataDictWordsExamplesSource {
-  /** Not documented yet. */
   core.String attribution;
 
-  /** Not documented yet. */
   core.String url;
 
 
@@ -4306,12 +4188,9 @@
 }
 
 
-/** Not documented yet. */
 class DictlayerdataDictWordsExamples {
-  /** Not documented yet. */
   DictlayerdataDictWordsExamplesSource source;
 
-  /** Not documented yet. */
   core.String text;
 
 
@@ -4339,12 +4218,9 @@
 }
 
 
-/** Not documented yet. */
 class DictlayerdataDictWordsSensesConjugations {
-  /** Not documented yet. */
   core.String type;
 
-  /** Not documented yet. */
   core.String value;
 
 
@@ -4372,12 +4248,9 @@
 }
 
 
-/** Not documented yet. */
 class DictlayerdataDictWordsSensesDefinitionsExamplesSource {
-  /** Not documented yet. */
   core.String attribution;
 
-  /** Not documented yet. */
   core.String url;
 
 
@@ -4405,12 +4278,9 @@
 }
 
 
-/** Not documented yet. */
 class DictlayerdataDictWordsSensesDefinitionsExamples {
-  /** Not documented yet. */
   DictlayerdataDictWordsSensesDefinitionsExamplesSource source;
 
-  /** Not documented yet. */
   core.String text;
 
 
@@ -4438,12 +4308,9 @@
 }
 
 
-/** Not documented yet. */
 class DictlayerdataDictWordsSensesDefinitions {
-  /** Not documented yet. */
   core.String definition;
 
-  /** Not documented yet. */
   core.List<DictlayerdataDictWordsSensesDefinitionsExamples> examples;
 
 
@@ -4471,12 +4338,9 @@
 }
 
 
-/** Not documented yet. */
 class DictlayerdataDictWordsSensesSource {
-  /** Not documented yet. */
   core.String attribution;
 
-  /** Not documented yet. */
   core.String url;
 
 
@@ -4504,12 +4368,9 @@
 }
 
 
-/** Not documented yet. */
 class DictlayerdataDictWordsSensesSynonymsSource {
-  /** Not documented yet. */
   core.String attribution;
 
-  /** Not documented yet. */
   core.String url;
 
 
@@ -4537,12 +4398,9 @@
 }
 
 
-/** Not documented yet. */
 class DictlayerdataDictWordsSensesSynonyms {
-  /** Not documented yet. */
   DictlayerdataDictWordsSensesSynonymsSource source;
 
-  /** Not documented yet. */
   core.String text;
 
 
@@ -4570,30 +4428,21 @@
 }
 
 
-/** Not documented yet. */
 class DictlayerdataDictWordsSenses {
-  /** Not documented yet. */
   core.List<DictlayerdataDictWordsSensesConjugations> conjugations;
 
-  /** Not documented yet. */
   core.List<DictlayerdataDictWordsSensesDefinitions> definitions;
 
-  /** Not documented yet. */
   core.String partOfSpeech;
 
-  /** Not documented yet. */
   core.String pronunciation;
 
-  /** Not documented yet. */
   core.String pronunciationUrl;
 
-  /** Not documented yet. */
   DictlayerdataDictWordsSensesSource source;
 
-  /** Not documented yet. */
   core.String syllabification;
 
-  /** Not documented yet. */
   core.List<DictlayerdataDictWordsSensesSynonyms> synonyms;
 
 
@@ -4662,10 +4511,8 @@
  * "go" (verb).
  */
 class DictlayerdataDictWordsSource {
-  /** Not documented yet. */
   core.String attribution;
 
-  /** Not documented yet. */
   core.String url;
 
 
@@ -4693,15 +4540,11 @@
 }
 
 
-/** Not documented yet. */
 class DictlayerdataDictWords {
-  /** Not documented yet. */
   core.List<DictlayerdataDictWordsDerivatives> derivatives;
 
-  /** Not documented yet. */
   core.List<DictlayerdataDictWordsExamples> examples;
 
-  /** Not documented yet. */
   core.List<DictlayerdataDictWordsSenses> senses;
 
   /**
@@ -4747,12 +4590,10 @@
 }
 
 
-/** Not documented yet. */
 class DictlayerdataDict {
   /** The source, url and attribution for this dictionary data. */
   DictlayerdataDictSource source;
 
-  /** Not documented yet. */
   core.List<DictlayerdataDictWords> words;
 
 
@@ -4780,15 +4621,11 @@
 }
 
 
-/** Not documented yet. */
 class Dictlayerdata {
-  /** Not documented yet. */
   DictlayerdataCommon common;
 
-  /** Not documented yet. */
   DictlayerdataDict dict;
 
-  /** Not documented yet. */
   core.String kind;
 
 
@@ -4822,7 +4659,6 @@
 }
 
 
-/** Not documented yet. */
 class DownloadAccessRestriction {
   /**
    * If restricted, whether access is granted for this (user, device, volume).
@@ -4962,7 +4798,6 @@
 }
 
 
-/** Not documented yet. */
 class DownloadAccesses {
   /** A list of download access responses. */
   core.List<DownloadAccessRestriction> downloadAccessList;
@@ -4995,7 +4830,6 @@
 }
 
 
-/** Not documented yet. */
 class GeolayerdataCommon {
   /** The language of the information url and description. */
   core.String lang;
@@ -5058,12 +4892,9 @@
 }
 
 
-/** Not documented yet. */
 class GeolayerdataGeoBoundary {
-  /** Not documented yet. */
   core.int latitude;
 
-  /** Not documented yet. */
   core.int longitude;
 
 
@@ -5091,12 +4922,9 @@
 }
 
 
-/** Not documented yet. */
 class GeolayerdataGeoViewportHi {
-  /** Not documented yet. */
   core.double latitude;
 
-  /** Not documented yet. */
   core.double longitude;
 
 
@@ -5124,12 +4952,9 @@
 }
 
 
-/** Not documented yet. */
 class GeolayerdataGeoViewportLo {
-  /** Not documented yet. */
   core.double latitude;
 
-  /** Not documented yet. */
   core.double longitude;
 
 
@@ -5162,10 +4987,8 @@
  * rectangle.
  */
 class GeolayerdataGeoViewport {
-  /** Not documented yet. */
   GeolayerdataGeoViewportHi hi;
 
-  /** Not documented yet. */
   GeolayerdataGeoViewportLo lo;
 
 
@@ -5193,7 +5016,6 @@
 }
 
 
-/** Not documented yet. */
 class GeolayerdataGeo {
   /**
    * The boundary of the location as a set of loops containing pairs of
@@ -5296,15 +5118,11 @@
 }
 
 
-/** Not documented yet. */
 class Geolayerdata {
-  /** Not documented yet. */
   GeolayerdataCommon common;
 
-  /** Not documented yet. */
   GeolayerdataGeo geo;
 
-  /** Not documented yet. */
   core.String kind;
 
 
@@ -5338,7 +5156,6 @@
 }
 
 
-/** Not documented yet. */
 class Layersummaries {
   /** A list of layer summary items. */
   core.List<Layersummary> items;
@@ -5380,7 +5197,6 @@
 }
 
 
-/** Not documented yet. */
 class Layersummary {
   /** The number of annotations for this layer. */
   core.int annotationCount;
@@ -5519,21 +5335,15 @@
 }
 
 
-/** Not documented yet. */
 class MetadataItems {
-  /** Not documented yet. */
   core.String downloadUrl;
 
-  /** Not documented yet. */
   core.String encryptedKey;
 
-  /** Not documented yet. */
   core.String language;
 
-  /** Not documented yet. */
   core.String size;
 
-  /** Not documented yet. */
   core.String version;
 
 
@@ -5579,7 +5389,6 @@
 }
 
 
-/** Not documented yet. */
 class Metadata {
   /** A list of offline dictionary metadata. */
   core.List<MetadataItems> items;
@@ -5612,24 +5421,17 @@
 }
 
 
-/** Not documented yet. */
 class OffersItemsItems {
-  /** Not documented yet. */
   core.String author;
 
-  /** Not documented yet. */
   core.String canonicalVolumeLink;
 
-  /** Not documented yet. */
   core.String coverUrl;
 
-  /** Not documented yet. */
   core.String description;
 
-  /** Not documented yet. */
   core.String title;
 
-  /** Not documented yet. */
   core.String volumeId;
 
 
@@ -5681,18 +5483,13 @@
 }
 
 
-/** Not documented yet. */
 class OffersItems {
-  /** Not documented yet. */
   core.String artUrl;
 
-  /** Not documented yet. */
   core.String gservicesKey;
 
-  /** Not documented yet. */
   core.String id;
 
-  /** Not documented yet. */
   core.List<OffersItemsItems> items;
 
 
@@ -5732,7 +5529,6 @@
 }
 
 
-/** Not documented yet. */
 class Offers {
   /** A list of offers. */
   core.List<OffersItems> items;
@@ -5765,7 +5561,6 @@
 }
 
 
-/** Not documented yet. */
 class ReadingPosition {
   /** Position in an EPUB as a CFI. */
   core.String epubCfiPosition;
@@ -5846,7 +5641,6 @@
 }
 
 
-/** Not documented yet. */
 class RequestAccess {
   /** A concurrent access response. */
   ConcurrentAccessRestriction concurrentAccess;
@@ -5957,7 +5751,6 @@
 }
 
 
-/** Not documented yet. */
 class Review {
   /** Author of this review. */
   ReviewAuthor author;
@@ -6073,10 +5866,8 @@
 
 /** User settings in sub-objects, each for different purposes. */
 class UsersettingsNotesExport {
-  /** Not documented yet. */
   core.String folderName;
 
-  /** Not documented yet. */
   core.bool isEnabled;
 
 
@@ -6104,7 +5895,6 @@
 }
 
 
-/** Not documented yet. */
 class Usersettings {
   /** Resource type. */
   core.String kind;
@@ -6405,7 +6195,6 @@
 }
 
 
-/** Not documented yet. */
 class VolumeLayerInfoLayers {
   /** The layer id of this layer (e.g. "geo"). */
   core.String layerId;
@@ -6527,10 +6316,8 @@
 
 /** Offer list (=undiscounted) price in Micros. */
 class VolumeSaleInfoOffersListPrice {
-  /** Not documented yet. */
   core.double amountInMicros;
 
-  /** Not documented yet. */
   core.String currencyCode;
 
 
@@ -6560,10 +6347,8 @@
 
 /** The rental duration (for rental offers only). */
 class VolumeSaleInfoOffersRentalDuration {
-  /** Not documented yet. */
   core.double count;
 
-  /** Not documented yet. */
   core.String unit;
 
 
@@ -6593,10 +6378,8 @@
 
 /** Offer retail (=discounted) price in Micros */
 class VolumeSaleInfoOffersRetailPrice {
-  /** Not documented yet. */
   core.double amountInMicros;
 
-  /** Not documented yet. */
   core.String currencyCode;
 
 
@@ -6624,7 +6407,6 @@
 }
 
 
-/** Not documented yet. */
 class VolumeSaleInfoOffers {
   /** The finsky offer type (e.g., PURCHASE=0 RENTAL=3) */
   core.int finskyOfferType;
@@ -6846,16 +6628,12 @@
 
 /** Copy/Paste accounting information. */
 class VolumeUserInfoCopy {
-  /** Not documented yet. */
   core.int allowedCharacterCount;
 
-  /** Not documented yet. */
   core.String limitType;
 
-  /** Not documented yet. */
   core.int remainingCharacterCount;
 
-  /** Not documented yet. */
   core.DateTime updated;
 
 
@@ -6897,10 +6675,8 @@
 
 /** Period during this book is/was a valid rental. */
 class VolumeUserInfoRentalPeriod {
-  /** Not documented yet. */
   core.String endUtcSec;
 
-  /** Not documented yet. */
   core.String startUtcSec;
 
 
@@ -6928,9 +6704,7 @@
 }
 
 
-/** Not documented yet. */
 class VolumeUserInfoUserUploadedVolumeInfo {
-  /** Not documented yet. */
   core.String processingState;
 
 
@@ -7000,7 +6774,6 @@
    */
   core.DateTime updated;
 
-  /** Not documented yet. */
   VolumeUserInfoUserUploadedVolumeInfo userUploadedVolumeInfo;
 
 
@@ -7206,7 +6979,6 @@
 }
 
 
-/** Not documented yet. */
 class VolumeVolumeInfoIndustryIdentifiers {
   /** Industry specific volume identifier. */
   core.String identifier;
@@ -7490,7 +7262,6 @@
 }
 
 
-/** Not documented yet. */
 class Volume {
   /**
    * Any information about a volume related to reading or obtaining that volume
@@ -7621,7 +7392,6 @@
 }
 
 
-/** Not documented yet. */
 class Volume2 {
   /** A list of volumes. */
   core.List<Volume> items;
@@ -7629,7 +7399,6 @@
   /** Resource type. */
   core.String kind;
 
-  /** Not documented yet. */
   core.String nextPageToken;
 
 
@@ -7714,7 +7483,6 @@
 }
 
 
-/** Not documented yet. */
 class Volumeannotation {
   /** The annotation data id for this volume annotation. */
   core.String annotationDataId;
@@ -7858,7 +7626,6 @@
 }
 
 
-/** Not documented yet. */
 class Volumeannotations {
   /** A list of volume annotations. */
   core.List<Volumeannotation> items;
@@ -7926,7 +7693,6 @@
 }
 
 
-/** Not documented yet. */
 class Volumes {
   /** A list of volumes. */
   core.List<Volume> items;
@@ -7969,5 +7735,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/calendar/v3.dart b/generated/googleapis/lib/calendar/v3.dart
index 0766b8b..3d2da63 100644
--- a/generated/googleapis/lib/calendar/v3.dart
+++ b/generated/googleapis/lib/calendar/v3.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.calendar.v3;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client calendar/v3';
 
 /** Lets you manipulate events and other calendar data. */
 class CalendarApi {
@@ -22,7 +25,7 @@
   static const CalendarReadonlyScope = "https://www.googleapis.com/auth/calendar.readonly";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AclResourceApi get acl => new AclResourceApi(_requester);
   CalendarListResourceApi get calendarList => new CalendarListResourceApi(_requester);
@@ -34,15 +37,14 @@
   SettingsResourceApi get settings => new SettingsResourceApi(_requester);
 
   CalendarApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "calendar/v3/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class AclResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AclResourceApi(common_internal.ApiRequester client) : 
+  AclResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -54,7 +56,7 @@
    *
    * [ruleId] - ACL rule identifier.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -65,7 +67,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (calendarId == null) {
@@ -77,7 +79,7 @@
 
     _downloadOptions = null;
 
-    _url = 'calendars/' + common_internal.Escaper.ecapeVariable('$calendarId') + '/acl/' + common_internal.Escaper.ecapeVariable('$ruleId');
+    _url = 'calendars/' + commons.Escaper.ecapeVariable('$calendarId') + '/acl/' + commons.Escaper.ecapeVariable('$ruleId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -100,7 +102,7 @@
    *
    * Completes with a [AclRule].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -111,7 +113,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (calendarId == null) {
@@ -122,7 +124,7 @@
     }
 
 
-    _url = 'calendars/' + common_internal.Escaper.ecapeVariable('$calendarId') + '/acl/' + common_internal.Escaper.ecapeVariable('$ruleId');
+    _url = 'calendars/' + commons.Escaper.ecapeVariable('$calendarId') + '/acl/' + commons.Escaper.ecapeVariable('$ruleId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -145,7 +147,7 @@
    *
    * Completes with a [AclRule].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -156,7 +158,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -167,7 +169,7 @@
     }
 
 
-    _url = 'calendars/' + common_internal.Escaper.ecapeVariable('$calendarId') + '/acl';
+    _url = 'calendars/' + commons.Escaper.ecapeVariable('$calendarId') + '/acl';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -209,7 +211,7 @@
    *
    * Completes with a [Acl].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -220,7 +222,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (calendarId == null) {
@@ -240,7 +242,7 @@
     }
 
 
-    _url = 'calendars/' + common_internal.Escaper.ecapeVariable('$calendarId') + '/acl';
+    _url = 'calendars/' + commons.Escaper.ecapeVariable('$calendarId') + '/acl';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -265,7 +267,7 @@
    *
    * Completes with a [AclRule].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -276,7 +278,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -290,7 +292,7 @@
     }
 
 
-    _url = 'calendars/' + common_internal.Escaper.ecapeVariable('$calendarId') + '/acl/' + common_internal.Escaper.ecapeVariable('$ruleId');
+    _url = 'calendars/' + commons.Escaper.ecapeVariable('$calendarId') + '/acl/' + commons.Escaper.ecapeVariable('$ruleId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -315,7 +317,7 @@
    *
    * Completes with a [AclRule].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -326,7 +328,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -340,7 +342,7 @@
     }
 
 
-    _url = 'calendars/' + common_internal.Escaper.ecapeVariable('$calendarId') + '/acl/' + common_internal.Escaper.ecapeVariable('$ruleId');
+    _url = 'calendars/' + commons.Escaper.ecapeVariable('$calendarId') + '/acl/' + commons.Escaper.ecapeVariable('$ruleId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -384,7 +386,7 @@
    *
    * Completes with a [Channel].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -395,7 +397,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -418,7 +420,7 @@
     }
 
 
-    _url = 'calendars/' + common_internal.Escaper.ecapeVariable('$calendarId') + '/acl/watch';
+    _url = 'calendars/' + commons.Escaper.ecapeVariable('$calendarId') + '/acl/watch';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -433,11 +435,10 @@
 }
 
 
-/** Not documented yet. */
 class CalendarListResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  CalendarListResourceApi(common_internal.ApiRequester client) : 
+  CalendarListResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -447,7 +448,7 @@
    *
    * [calendarId] - Calendar identifier.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -458,7 +459,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (calendarId == null) {
@@ -467,7 +468,7 @@
 
     _downloadOptions = null;
 
-    _url = 'users/me/calendarList/' + common_internal.Escaper.ecapeVariable('$calendarId');
+    _url = 'users/me/calendarList/' + commons.Escaper.ecapeVariable('$calendarId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -488,7 +489,7 @@
    *
    * Completes with a [CalendarListEntry].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -499,7 +500,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (calendarId == null) {
@@ -507,7 +508,7 @@
     }
 
 
-    _url = 'users/me/calendarList/' + common_internal.Escaper.ecapeVariable('$calendarId');
+    _url = 'users/me/calendarList/' + commons.Escaper.ecapeVariable('$calendarId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -533,7 +534,7 @@
    *
    * Completes with a [CalendarListEntry].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -544,7 +545,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -609,7 +610,7 @@
    *
    * Completes with a [CalendarList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -620,7 +621,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (maxResults != null) {
@@ -672,7 +673,7 @@
    *
    * Completes with a [CalendarListEntry].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -683,7 +684,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -697,7 +698,7 @@
     }
 
 
-    _url = 'users/me/calendarList/' + common_internal.Escaper.ecapeVariable('$calendarId');
+    _url = 'users/me/calendarList/' + commons.Escaper.ecapeVariable('$calendarId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -725,7 +726,7 @@
    *
    * Completes with a [CalendarListEntry].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -736,7 +737,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -750,7 +751,7 @@
     }
 
 
-    _url = 'users/me/calendarList/' + common_internal.Escaper.ecapeVariable('$calendarId');
+    _url = 'users/me/calendarList/' + commons.Escaper.ecapeVariable('$calendarId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -806,7 +807,7 @@
    *
    * Completes with a [Channel].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -817,7 +818,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -858,22 +859,21 @@
 }
 
 
-/** Not documented yet. */
 class CalendarsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  CalendarsResourceApi(common_internal.ApiRequester client) : 
+  CalendarsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
-   * Clears a primary calendar. This operation deletes all data associated with
-   * the primary calendar of an account and cannot be undone.
+   * Clears a primary calendar. This operation deletes all events associated
+   * with the primary calendar of an account.
    *
    * Request parameters:
    *
    * [calendarId] - Calendar identifier.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -884,7 +884,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (calendarId == null) {
@@ -893,7 +893,7 @@
 
     _downloadOptions = null;
 
-    _url = 'calendars/' + common_internal.Escaper.ecapeVariable('$calendarId') + '/clear';
+    _url = 'calendars/' + commons.Escaper.ecapeVariable('$calendarId') + '/clear';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -906,13 +906,14 @@
   }
 
   /**
-   * Deletes a secondary calendar.
+   * Deletes a secondary calendar. Use calendars.clear for clearing all events
+   * on primary calendars.
    *
    * Request parameters:
    *
    * [calendarId] - Calendar identifier.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -923,7 +924,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (calendarId == null) {
@@ -932,7 +933,7 @@
 
     _downloadOptions = null;
 
-    _url = 'calendars/' + common_internal.Escaper.ecapeVariable('$calendarId');
+    _url = 'calendars/' + commons.Escaper.ecapeVariable('$calendarId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -953,7 +954,7 @@
    *
    * Completes with a [Calendar].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -964,7 +965,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (calendarId == null) {
@@ -972,7 +973,7 @@
     }
 
 
-    _url = 'calendars/' + common_internal.Escaper.ecapeVariable('$calendarId');
+    _url = 'calendars/' + commons.Escaper.ecapeVariable('$calendarId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -993,7 +994,7 @@
    *
    * Completes with a [Calendar].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1004,7 +1005,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1035,7 +1036,7 @@
    *
    * Completes with a [Calendar].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1046,7 +1047,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1057,7 +1058,7 @@
     }
 
 
-    _url = 'calendars/' + common_internal.Escaper.ecapeVariable('$calendarId');
+    _url = 'calendars/' + commons.Escaper.ecapeVariable('$calendarId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1080,7 +1081,7 @@
    *
    * Completes with a [Calendar].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1091,7 +1092,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1102,7 +1103,7 @@
     }
 
 
-    _url = 'calendars/' + common_internal.Escaper.ecapeVariable('$calendarId');
+    _url = 'calendars/' + commons.Escaper.ecapeVariable('$calendarId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1117,11 +1118,10 @@
 }
 
 
-/** Not documented yet. */
 class ChannelsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ChannelsResourceApi(common_internal.ApiRequester client) : 
+  ChannelsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1131,7 +1131,7 @@
    *
    * Request parameters:
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1142,7 +1142,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1166,11 +1166,10 @@
 }
 
 
-/** Not documented yet. */
 class ColorsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ColorsResourceApi(common_internal.ApiRequester client) : 
+  ColorsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1180,7 +1179,7 @@
    *
    * Completes with a [Colors].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1191,7 +1190,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -1211,11 +1210,10 @@
 }
 
 
-/** Not documented yet. */
 class EventsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  EventsResourceApi(common_internal.ApiRequester client) : 
+  EventsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1230,7 +1228,7 @@
    * [sendNotifications] - Whether to send notifications about the deletion of
    * the event. Optional. The default is False.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1241,7 +1239,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (calendarId == null) {
@@ -1256,7 +1254,7 @@
 
     _downloadOptions = null;
 
-    _url = 'calendars/' + common_internal.Escaper.ecapeVariable('$calendarId') + '/events/' + common_internal.Escaper.ecapeVariable('$eventId');
+    _url = 'calendars/' + commons.Escaper.ecapeVariable('$calendarId') + '/events/' + commons.Escaper.ecapeVariable('$eventId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1293,7 +1291,7 @@
    *
    * Completes with a [Event].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1304,7 +1302,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (calendarId == null) {
@@ -1324,7 +1322,7 @@
     }
 
 
-    _url = 'calendars/' + common_internal.Escaper.ecapeVariable('$calendarId') + '/events/' + common_internal.Escaper.ecapeVariable('$eventId');
+    _url = 'calendars/' + commons.Escaper.ecapeVariable('$calendarId') + '/events/' + commons.Escaper.ecapeVariable('$eventId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1348,7 +1346,7 @@
    *
    * Completes with a [Event].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1359,7 +1357,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1370,7 +1368,7 @@
     }
 
 
-    _url = 'calendars/' + common_internal.Escaper.ecapeVariable('$calendarId') + '/events/import';
+    _url = 'calendars/' + commons.Escaper.ecapeVariable('$calendarId') + '/events/import';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1400,7 +1398,7 @@
    *
    * Completes with a [Event].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1411,7 +1409,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1428,7 +1426,7 @@
     }
 
 
-    _url = 'calendars/' + common_internal.Escaper.ecapeVariable('$calendarId') + '/events';
+    _url = 'calendars/' + commons.Escaper.ecapeVariable('$calendarId') + '/events';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1484,7 +1482,7 @@
    *
    * Completes with a [Events].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1495,7 +1493,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (calendarId == null) {
@@ -1533,7 +1531,7 @@
     }
 
 
-    _url = 'calendars/' + common_internal.Escaper.ecapeVariable('$calendarId') + '/events/' + common_internal.Escaper.ecapeVariable('$eventId') + '/instances';
+    _url = 'calendars/' + commons.Escaper.ecapeVariable('$calendarId') + '/events/' + commons.Escaper.ecapeVariable('$eventId') + '/instances';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1644,7 +1642,7 @@
    *
    * Completes with a [Events].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1655,7 +1653,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (calendarId == null) {
@@ -1714,7 +1712,7 @@
     }
 
 
-    _url = 'calendars/' + common_internal.Escaper.ecapeVariable('$calendarId') + '/events';
+    _url = 'calendars/' + commons.Escaper.ecapeVariable('$calendarId') + '/events';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1744,7 +1742,7 @@
    *
    * Completes with a [Event].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1755,7 +1753,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (calendarId == null) {
@@ -1773,7 +1771,7 @@
     }
 
 
-    _url = 'calendars/' + common_internal.Escaper.ecapeVariable('$calendarId') + '/events/' + common_internal.Escaper.ecapeVariable('$eventId') + '/move';
+    _url = 'calendars/' + commons.Escaper.ecapeVariable('$calendarId') + '/events/' + commons.Escaper.ecapeVariable('$eventId') + '/move';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1813,7 +1811,7 @@
    *
    * Completes with a [Event].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1824,7 +1822,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1847,7 +1845,7 @@
     }
 
 
-    _url = 'calendars/' + common_internal.Escaper.ecapeVariable('$calendarId') + '/events/' + common_internal.Escaper.ecapeVariable('$eventId');
+    _url = 'calendars/' + commons.Escaper.ecapeVariable('$calendarId') + '/events/' + commons.Escaper.ecapeVariable('$eventId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1873,7 +1871,7 @@
    *
    * Completes with a [Event].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1884,7 +1882,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (calendarId == null) {
@@ -1899,7 +1897,7 @@
     }
 
 
-    _url = 'calendars/' + common_internal.Escaper.ecapeVariable('$calendarId') + '/events/quickAdd';
+    _url = 'calendars/' + commons.Escaper.ecapeVariable('$calendarId') + '/events/quickAdd';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1939,7 +1937,7 @@
    *
    * Completes with a [Event].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1950,7 +1948,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1973,7 +1971,7 @@
     }
 
 
-    _url = 'calendars/' + common_internal.Escaper.ecapeVariable('$calendarId') + '/events/' + common_internal.Escaper.ecapeVariable('$eventId');
+    _url = 'calendars/' + commons.Escaper.ecapeVariable('$calendarId') + '/events/' + commons.Escaper.ecapeVariable('$eventId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -2086,7 +2084,7 @@
    *
    * Completes with a [Channel].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2097,7 +2095,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2159,7 +2157,7 @@
     }
 
 
-    _url = 'calendars/' + common_internal.Escaper.ecapeVariable('$calendarId') + '/events/watch';
+    _url = 'calendars/' + commons.Escaper.ecapeVariable('$calendarId') + '/events/watch';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2174,11 +2172,10 @@
 }
 
 
-/** Not documented yet. */
 class FreebusyResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  FreebusyResourceApi(common_internal.ApiRequester client) : 
+  FreebusyResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2190,7 +2187,7 @@
    *
    * Completes with a [FreeBusyResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2201,7 +2198,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2224,11 +2221,10 @@
 }
 
 
-/** Not documented yet. */
 class SettingsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  SettingsResourceApi(common_internal.ApiRequester client) : 
+  SettingsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2240,7 +2236,7 @@
    *
    * Completes with a [Setting].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2251,7 +2247,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (setting == null) {
@@ -2259,7 +2255,7 @@
     }
 
 
-    _url = 'users/me/settings/' + common_internal.Escaper.ecapeVariable('$setting');
+    _url = 'users/me/settings/' + commons.Escaper.ecapeVariable('$setting');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2293,7 +2289,7 @@
    *
    * Completes with a [Settings].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2304,7 +2300,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (maxResults != null) {
@@ -2354,7 +2350,7 @@
    *
    * Completes with a [Channel].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2365,7 +2361,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2398,7 +2394,6 @@
 
 
 
-/** Not documented yet. */
 class Acl {
   /** ETag of the collection. */
   core.String etag;
@@ -2508,7 +2503,6 @@
 }
 
 
-/** Not documented yet. */
 class AclRule {
   /** ETag of the resource. */
   core.String etag;
@@ -2579,7 +2573,6 @@
 }
 
 
-/** Not documented yet. */
 class Calendar {
   /** Description of the calendar. Optional. */
   core.String description;
@@ -2660,7 +2653,6 @@
 }
 
 
-/** Not documented yet. */
 class CalendarList {
   /** ETag of the collection. */
   core.String etag;
@@ -2753,7 +2745,6 @@
 }
 
 
-/** Not documented yet. */
 class CalendarListEntry {
   /**
    * The effective access role that the authenticated user has on the calendar.
@@ -2973,7 +2964,6 @@
 }
 
 
-/** Not documented yet. */
 class CalendarNotification {
   /**
    * The method used to deliver the notification. Possible values are:
@@ -3020,7 +3010,6 @@
 }
 
 
-/** Not documented yet. */
 class Channel {
   /** The address where notifications are delivered for this channel. */
   core.String address;
@@ -3137,7 +3126,6 @@
 }
 
 
-/** Not documented yet. */
 class ColorDefinition {
   /** The background color associated with this color definition. */
   core.String background;
@@ -3173,7 +3161,6 @@
 }
 
 
-/** Not documented yet. */
 class Colors {
   /**
    * Palette of calendar colors, mapping from the color ID to its definition. A
@@ -3203,10 +3190,10 @@
 
   Colors.fromJson(core.Map _json) {
     if (_json.containsKey("calendar")) {
-      calendar = common_internal.mapMap(_json["calendar"], (item) => new ColorDefinition.fromJson(item));
+      calendar = commons.mapMap(_json["calendar"], (item) => new ColorDefinition.fromJson(item));
     }
     if (_json.containsKey("event")) {
-      event = common_internal.mapMap(_json["event"], (item) => new ColorDefinition.fromJson(item));
+      event = commons.mapMap(_json["event"], (item) => new ColorDefinition.fromJson(item));
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -3219,10 +3206,10 @@
   core.Map toJson() {
     var _json = new core.Map();
     if (calendar != null) {
-      _json["calendar"] = common_internal.mapMap(calendar, (item) => (item).toJson());
+      _json["calendar"] = commons.mapMap(calendar, (item) => (item).toJson());
     }
     if (event != null) {
-      _json["event"] = common_internal.mapMap(event, (item) => (item).toJson());
+      _json["event"] = commons.mapMap(event, (item) => (item).toJson());
     }
     if (kind != null) {
       _json["kind"] = kind;
@@ -3235,7 +3222,6 @@
 }
 
 
-/** Not documented yet. */
 class Error {
   /** Domain, or broad category, of the error. */
   core.String domain;
@@ -3601,7 +3587,6 @@
 }
 
 
-/** Not documented yet. */
 class Event {
   /**
    * Whether anyone can invite themselves to the event. Optional. The default is
@@ -4035,7 +4020,6 @@
 }
 
 
-/** Not documented yet. */
 class EventAttachment {
 
   EventAttachment();
@@ -4050,7 +4034,6 @@
 }
 
 
-/** Not documented yet. */
 class EventAttendee {
   /** Number of additional guests. Optional. The default is 0. */
   core.int additionalGuests;
@@ -4170,7 +4153,6 @@
 }
 
 
-/** Not documented yet. */
 class EventDateTime {
   /** The date, in the format "yyyy-mm-dd", if this is an all-day event. */
   core.DateTime date;
@@ -4222,7 +4204,6 @@
 }
 
 
-/** Not documented yet. */
 class EventReminder {
   /**
    * The method used by this reminder. Possible values are:
@@ -4263,7 +4244,6 @@
 }
 
 
-/** Not documented yet. */
 class Events {
   /**
    * The user's access role for this calendar. Read-only. Possible values are:
@@ -4403,7 +4383,6 @@
 }
 
 
-/** Not documented yet. */
 class FreeBusyCalendar {
   /**
    * List of time ranges during which this calendar should be regarded as busy.
@@ -4438,7 +4417,6 @@
 }
 
 
-/** Not documented yet. */
 class FreeBusyGroup {
   /** List of calendars' identifiers within a group. */
   core.List<core.String> calendars;
@@ -4471,7 +4449,6 @@
 }
 
 
-/** Not documented yet. */
 class FreeBusyRequest {
   /**
    * Maximal number of calendars for which FreeBusy information is to be
@@ -4547,7 +4524,6 @@
 }
 
 
-/** Not documented yet. */
 class FreeBusyRequestItem {
   /** The identifier of a calendar or a group. */
   core.String id;
@@ -4571,7 +4547,6 @@
 }
 
 
-/** Not documented yet. */
 class FreeBusyResponse {
   /** List of free/busy information for calendars. */
   core.Map<core.String, FreeBusyCalendar> calendars;
@@ -4593,10 +4568,10 @@
 
   FreeBusyResponse.fromJson(core.Map _json) {
     if (_json.containsKey("calendars")) {
-      calendars = common_internal.mapMap(_json["calendars"], (item) => new FreeBusyCalendar.fromJson(item));
+      calendars = commons.mapMap(_json["calendars"], (item) => new FreeBusyCalendar.fromJson(item));
     }
     if (_json.containsKey("groups")) {
-      groups = common_internal.mapMap(_json["groups"], (item) => new FreeBusyGroup.fromJson(item));
+      groups = commons.mapMap(_json["groups"], (item) => new FreeBusyGroup.fromJson(item));
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -4612,10 +4587,10 @@
   core.Map toJson() {
     var _json = new core.Map();
     if (calendars != null) {
-      _json["calendars"] = common_internal.mapMap(calendars, (item) => (item).toJson());
+      _json["calendars"] = commons.mapMap(calendars, (item) => (item).toJson());
     }
     if (groups != null) {
-      _json["groups"] = common_internal.mapMap(groups, (item) => (item).toJson());
+      _json["groups"] = commons.mapMap(groups, (item) => (item).toJson());
     }
     if (kind != null) {
       _json["kind"] = kind;
@@ -4631,7 +4606,6 @@
 }
 
 
-/** Not documented yet. */
 class Setting {
   /** ETag of the resource. */
   core.String etag;
@@ -4685,7 +4659,6 @@
 }
 
 
-/** Not documented yet. */
 class Settings {
   /** Etag of the collection. */
   core.String etag;
@@ -4752,7 +4725,6 @@
 }
 
 
-/** Not documented yet. */
 class TimePeriod {
   /** The (exclusive) end of the time period. */
   core.DateTime end;
@@ -4783,5 +4755,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/civicinfo/us_v1.dart b/generated/googleapis/lib/civicinfo/us_v1.dart
deleted file mode 100644
index 9b7fbea..0000000
--- a/generated/googleapis/lib/civicinfo/us_v1.dart
+++ /dev/null
@@ -1,1805 +0,0 @@
-library googleapis.civicinfo.us_v1;
-
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
-
-import "package:crypto/crypto.dart" as crypto;
-import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
-
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
-
-/** An API for accessing civic information. */
-class CivicinfoApi {
-
-  final common_internal.ApiRequester _requester;
-
-  DivisionsResourceApi get divisions => new DivisionsResourceApi(_requester);
-  ElectionsResourceApi get elections => new ElectionsResourceApi(_requester);
-  RepresentativesResourceApi get representatives => new RepresentativesResourceApi(_requester);
-
-  CivicinfoApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "civicinfo/us_v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
-}
-
-
-/** Not documented yet. */
-class DivisionsResourceApi {
-  final common_internal.ApiRequester _requester;
-
-  DivisionsResourceApi(common_internal.ApiRequester client) : 
-      _requester = client;
-
-  /**
-   * Searches for political divisions by their natural name or OCD ID.
-   *
-   * Request parameters:
-   *
-   * [query] - The search query. Queries can cover any parts of a OCD ID or a
-   * human readable division name. All words given in the query are treated as
-   * required patterns. In addition to that, most query operators of the Apache
-   * Lucene library are supported. See
-   * http://lucene.apache.org/core/2_9_4/queryparsersyntax.html
-   *
-   * Completes with a [DivisionSearchResponse].
-   *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
-   * error.
-   *
-   * If the used [http.Client] completes with an error when making a REST call,
-   * this method  will complete with the same error.
-   */
-  async.Future<DivisionSearchResponse> search({core.String query}) {
-    var _url = null;
-    var _queryParams = new core.Map();
-    var _uploadMedia = null;
-    var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
-    var _body = null;
-
-    if (query != null) {
-      _queryParams["query"] = [query];
-    }
-
-
-    _url = 'representatives/division_search';
-
-    var _response = _requester.request(_url,
-                                       "GET",
-                                       body: _body,
-                                       queryParams: _queryParams,
-                                       uploadOptions: _uploadOptions,
-                                       uploadMedia: _uploadMedia,
-                                       downloadOptions: _downloadOptions);
-    return _response.then((data) => new DivisionSearchResponse.fromJson(data));
-  }
-
-}
-
-
-/** Not documented yet. */
-class ElectionsResourceApi {
-  final common_internal.ApiRequester _requester;
-
-  ElectionsResourceApi(common_internal.ApiRequester client) : 
-      _requester = client;
-
-  /**
-   * List of available elections to query.
-   *
-   * Request parameters:
-   *
-   * Completes with a [ElectionsQueryResponse].
-   *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
-   * error.
-   *
-   * If the used [http.Client] completes with an error when making a REST call,
-   * this method  will complete with the same error.
-   */
-  async.Future<ElectionsQueryResponse> electionQuery() {
-    var _url = null;
-    var _queryParams = new core.Map();
-    var _uploadMedia = null;
-    var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
-    var _body = null;
-
-
-
-    _url = 'elections';
-
-    var _response = _requester.request(_url,
-                                       "GET",
-                                       body: _body,
-                                       queryParams: _queryParams,
-                                       uploadOptions: _uploadOptions,
-                                       uploadMedia: _uploadMedia,
-                                       downloadOptions: _downloadOptions);
-    return _response.then((data) => new ElectionsQueryResponse.fromJson(data));
-  }
-
-  /**
-   * Looks up information relevant to a voter based on the voter's registered
-   * address.
-   *
-   * [request] - The metadata request object.
-   *
-   * Request parameters:
-   *
-   * [electionId] - The unique ID of the election to look up. A list of election
-   * IDs can be obtained at
-   * https://www.googleapis.com/civicinfo/{version}/elections
-   *
-   * [officialOnly] - If set to true, only data from official state sources will
-   * be returned.
-   *
-   * Completes with a [VoterInfoResponse].
-   *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
-   * error.
-   *
-   * If the used [http.Client] completes with an error when making a REST call,
-   * this method  will complete with the same error.
-   */
-  async.Future<VoterInfoResponse> voterInfoQuery(VoterInfoRequest request, core.String electionId, {core.bool officialOnly}) {
-    var _url = null;
-    var _queryParams = new core.Map();
-    var _uploadMedia = null;
-    var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
-    var _body = null;
-
-    if (request != null) {
-      _body = convert.JSON.encode((request).toJson());
-    }
-    if (electionId == null) {
-      throw new core.ArgumentError("Parameter electionId is required.");
-    }
-    if (officialOnly != null) {
-      _queryParams["officialOnly"] = ["${officialOnly}"];
-    }
-
-
-    _url = 'voterinfo/' + common_internal.Escaper.ecapeVariable('$electionId') + '/lookup';
-
-    var _response = _requester.request(_url,
-                                       "POST",
-                                       body: _body,
-                                       queryParams: _queryParams,
-                                       uploadOptions: _uploadOptions,
-                                       uploadMedia: _uploadMedia,
-                                       downloadOptions: _downloadOptions);
-    return _response.then((data) => new VoterInfoResponse.fromJson(data));
-  }
-
-}
-
-
-/** Not documented yet. */
-class RepresentativesResourceApi {
-  final common_internal.ApiRequester _requester;
-
-  RepresentativesResourceApi(common_internal.ApiRequester client) : 
-      _requester = client;
-
-  /**
-   * Looks up political geography and representative information based on an
-   * address or Open Civic Data division identifier.
-   *
-   * [request] - The metadata request object.
-   *
-   * Request parameters:
-   *
-   * [includeOffices] - Whether to return information about offices and
-   * officials. If false, only the top-level district information will be
-   * returned.
-   *
-   * [ocdId] - The division to look up. May only be specified if the address
-   * field is not given in the request body.
-   *
-   * [recursive] - When ocd_id is supplied, return all divisions which are
-   * hierarchically nested within the queried division. For example, if querying
-   * ocd-division/country:us/district:dc, this would also return all DC's wards
-   * and ANCs.
-   *
-   * Completes with a [RepresentativeInfoResponse].
-   *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
-   * error.
-   *
-   * If the used [http.Client] completes with an error when making a REST call,
-   * this method  will complete with the same error.
-   */
-  async.Future<RepresentativeInfoResponse> representativeInfoQuery(RepresentativeInfoRequest request, {core.bool includeOffices, core.String ocdId, core.bool recursive}) {
-    var _url = null;
-    var _queryParams = new core.Map();
-    var _uploadMedia = null;
-    var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
-    var _body = null;
-
-    if (request != null) {
-      _body = convert.JSON.encode((request).toJson());
-    }
-    if (includeOffices != null) {
-      _queryParams["includeOffices"] = ["${includeOffices}"];
-    }
-    if (ocdId != null) {
-      _queryParams["ocdId"] = [ocdId];
-    }
-    if (recursive != null) {
-      _queryParams["recursive"] = ["${recursive}"];
-    }
-
-
-    _url = 'representatives/lookup';
-
-    var _response = _requester.request(_url,
-                                       "POST",
-                                       body: _body,
-                                       queryParams: _queryParams,
-                                       uploadOptions: _uploadOptions,
-                                       uploadMedia: _uploadMedia,
-                                       downloadOptions: _downloadOptions);
-    return _response.then((data) => new RepresentativeInfoResponse.fromJson(data));
-  }
-
-}
-
-
-
-/** Describes information about a regional election administrative area. */
-class AdministrationRegion {
-  /** The election administration body for this area. */
-  AdministrativeBody electionAdministrationBody;
-
-  /**
-   * An ID for this object. IDs may change in future requests and should not be
-   * cached. Access to this field requires special access that can be requested
-   * from the Request more link on the Quotas page.
-   */
-  core.String id;
-
-  /**
-   * The city or county that provides election information for this voter. This
-   * object can have the same elements as state.
-   */
-  AdministrationRegion localJurisdiction;
-
-  /** The name of the jurisdiction. */
-  core.String name;
-
-  /**
-   * A list of sources for this area. If multiple sources are listed the data
-   * has been aggregated from those sources.
-   */
-  core.List<Source> sources;
-
-
-  AdministrationRegion();
-
-  AdministrationRegion.fromJson(core.Map _json) {
-    if (_json.containsKey("electionAdministrationBody")) {
-      electionAdministrationBody = new AdministrativeBody.fromJson(_json["electionAdministrationBody"]);
-    }
-    if (_json.containsKey("id")) {
-      id = _json["id"];
-    }
-    if (_json.containsKey("local_jurisdiction")) {
-      localJurisdiction = new AdministrationRegion.fromJson(_json["local_jurisdiction"]);
-    }
-    if (_json.containsKey("name")) {
-      name = _json["name"];
-    }
-    if (_json.containsKey("sources")) {
-      sources = _json["sources"].map((value) => new Source.fromJson(value)).toList();
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (electionAdministrationBody != null) {
-      _json["electionAdministrationBody"] = (electionAdministrationBody).toJson();
-    }
-    if (id != null) {
-      _json["id"] = id;
-    }
-    if (localJurisdiction != null) {
-      _json["local_jurisdiction"] = (localJurisdiction).toJson();
-    }
-    if (name != null) {
-      _json["name"] = name;
-    }
-    if (sources != null) {
-      _json["sources"] = sources.map((value) => (value).toJson()).toList();
-    }
-    return _json;
-  }
-}
-
-
-/**
- * Information about an election administrative body (e.g. County Board of
- * Elections).
- */
-class AdministrativeBody {
-  /**
-   * A URL provided by this administrative body for information on absentee
-   * voting.
-   */
-  core.String absenteeVotingInfoUrl;
-
-  /**
-   * A URL provided by this administrative body to give contest information to
-   * the voter.
-   */
-  core.String ballotInfoUrl;
-
-  /** The mailing address of this administrative body. */
-  SimpleAddressType correspondenceAddress;
-
-  /**
-   * A URL provided by this administrative body for looking up general election
-   * information.
-   */
-  core.String electionInfoUrl;
-
-  /** The election officials for this election administrative body. */
-  core.List<ElectionOfficial> electionOfficials;
-
-  /**
-   * A URL provided by this administrative body for confirming that the voter is
-   * registered to vote.
-   */
-  core.String electionRegistrationConfirmationUrl;
-
-  /**
-   * A URL provided by this administrative body for looking up how to register
-   * to vote.
-   */
-  core.String electionRegistrationUrl;
-
-  /**
-   * A URL provided by this administrative body describing election rules to the
-   * voter.
-   */
-  core.String electionRulesUrl;
-
-  /** A description of the hours of operation for this administrative body. */
-  core.String hoursOfOperation;
-
-  /** The name of this election administrative body. */
-  core.String name;
-
-  /** The physical address of this administrative body. */
-  SimpleAddressType physicalAddress;
-
-  /** A description of the services this administrative body may provide. */
-  core.List<core.String> voterServices;
-
-  /**
-   * A URL provided by this administrative body for looking up where to vote.
-   */
-  core.String votingLocationFinderUrl;
-
-
-  AdministrativeBody();
-
-  AdministrativeBody.fromJson(core.Map _json) {
-    if (_json.containsKey("absenteeVotingInfoUrl")) {
-      absenteeVotingInfoUrl = _json["absenteeVotingInfoUrl"];
-    }
-    if (_json.containsKey("ballotInfoUrl")) {
-      ballotInfoUrl = _json["ballotInfoUrl"];
-    }
-    if (_json.containsKey("correspondenceAddress")) {
-      correspondenceAddress = new SimpleAddressType.fromJson(_json["correspondenceAddress"]);
-    }
-    if (_json.containsKey("electionInfoUrl")) {
-      electionInfoUrl = _json["electionInfoUrl"];
-    }
-    if (_json.containsKey("electionOfficials")) {
-      electionOfficials = _json["electionOfficials"].map((value) => new ElectionOfficial.fromJson(value)).toList();
-    }
-    if (_json.containsKey("electionRegistrationConfirmationUrl")) {
-      electionRegistrationConfirmationUrl = _json["electionRegistrationConfirmationUrl"];
-    }
-    if (_json.containsKey("electionRegistrationUrl")) {
-      electionRegistrationUrl = _json["electionRegistrationUrl"];
-    }
-    if (_json.containsKey("electionRulesUrl")) {
-      electionRulesUrl = _json["electionRulesUrl"];
-    }
-    if (_json.containsKey("hoursOfOperation")) {
-      hoursOfOperation = _json["hoursOfOperation"];
-    }
-    if (_json.containsKey("name")) {
-      name = _json["name"];
-    }
-    if (_json.containsKey("physicalAddress")) {
-      physicalAddress = new SimpleAddressType.fromJson(_json["physicalAddress"]);
-    }
-    if (_json.containsKey("voter_services")) {
-      voterServices = _json["voter_services"];
-    }
-    if (_json.containsKey("votingLocationFinderUrl")) {
-      votingLocationFinderUrl = _json["votingLocationFinderUrl"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (absenteeVotingInfoUrl != null) {
-      _json["absenteeVotingInfoUrl"] = absenteeVotingInfoUrl;
-    }
-    if (ballotInfoUrl != null) {
-      _json["ballotInfoUrl"] = ballotInfoUrl;
-    }
-    if (correspondenceAddress != null) {
-      _json["correspondenceAddress"] = (correspondenceAddress).toJson();
-    }
-    if (electionInfoUrl != null) {
-      _json["electionInfoUrl"] = electionInfoUrl;
-    }
-    if (electionOfficials != null) {
-      _json["electionOfficials"] = electionOfficials.map((value) => (value).toJson()).toList();
-    }
-    if (electionRegistrationConfirmationUrl != null) {
-      _json["electionRegistrationConfirmationUrl"] = electionRegistrationConfirmationUrl;
-    }
-    if (electionRegistrationUrl != null) {
-      _json["electionRegistrationUrl"] = electionRegistrationUrl;
-    }
-    if (electionRulesUrl != null) {
-      _json["electionRulesUrl"] = electionRulesUrl;
-    }
-    if (hoursOfOperation != null) {
-      _json["hoursOfOperation"] = hoursOfOperation;
-    }
-    if (name != null) {
-      _json["name"] = name;
-    }
-    if (physicalAddress != null) {
-      _json["physicalAddress"] = (physicalAddress).toJson();
-    }
-    if (voterServices != null) {
-      _json["voter_services"] = voterServices;
-    }
-    if (votingLocationFinderUrl != null) {
-      _json["votingLocationFinderUrl"] = votingLocationFinderUrl;
-    }
-    return _json;
-  }
-}
-
-
-/** Information about a candidate running for elected office. */
-class Candidate {
-  /** The URL for the candidate's campaign web site. */
-  core.String candidateUrl;
-
-  /** A list of known (social) media channels for this candidate. */
-  core.List<Channel> channels;
-
-  /** The email address for the candidate's campaign. */
-  core.String email;
-
-  /** The candidate's name. */
-  core.String name;
-
-  /** The order the candidate appears on the ballot for this contest. */
-  core.String orderOnBallot;
-
-  /** The full name of the party the candidate is a member of. */
-  core.String party;
-
-  /** The voice phone number for the candidate's campaign office. */
-  core.String phone;
-
-  /** A URL for a photo of the candidate. */
-  core.String photoUrl;
-
-
-  Candidate();
-
-  Candidate.fromJson(core.Map _json) {
-    if (_json.containsKey("candidateUrl")) {
-      candidateUrl = _json["candidateUrl"];
-    }
-    if (_json.containsKey("channels")) {
-      channels = _json["channels"].map((value) => new Channel.fromJson(value)).toList();
-    }
-    if (_json.containsKey("email")) {
-      email = _json["email"];
-    }
-    if (_json.containsKey("name")) {
-      name = _json["name"];
-    }
-    if (_json.containsKey("orderOnBallot")) {
-      orderOnBallot = _json["orderOnBallot"];
-    }
-    if (_json.containsKey("party")) {
-      party = _json["party"];
-    }
-    if (_json.containsKey("phone")) {
-      phone = _json["phone"];
-    }
-    if (_json.containsKey("photoUrl")) {
-      photoUrl = _json["photoUrl"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (candidateUrl != null) {
-      _json["candidateUrl"] = candidateUrl;
-    }
-    if (channels != null) {
-      _json["channels"] = channels.map((value) => (value).toJson()).toList();
-    }
-    if (email != null) {
-      _json["email"] = email;
-    }
-    if (name != null) {
-      _json["name"] = name;
-    }
-    if (orderOnBallot != null) {
-      _json["orderOnBallot"] = orderOnBallot;
-    }
-    if (party != null) {
-      _json["party"] = party;
-    }
-    if (phone != null) {
-      _json["phone"] = phone;
-    }
-    if (photoUrl != null) {
-      _json["photoUrl"] = photoUrl;
-    }
-    return _json;
-  }
-}
-
-
-/** A social media or web channel for a candidate. */
-class Channel {
-  /** The unique public identifier for the candidate's channel. */
-  core.String id;
-
-  /**
-   * The type of channel. The following is a list of types of channels, but is
-   * not exhaustive. More channel types may be added at a later time. One of:
-   * GooglePlus, YouTube, Facebook, Twitter
-   */
-  core.String type;
-
-
-  Channel();
-
-  Channel.fromJson(core.Map _json) {
-    if (_json.containsKey("id")) {
-      id = _json["id"];
-    }
-    if (_json.containsKey("type")) {
-      type = _json["type"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (id != null) {
-      _json["id"] = id;
-    }
-    if (type != null) {
-      _json["type"] = type;
-    }
-    return _json;
-  }
-}
-
-
-/** Information about a contest that appears on a voter's ballot. */
-class Contest {
-  /**
-   * A number specifying the position of this contest on the voter's ballot.
-   */
-  core.String ballotPlacement;
-
-  /** The candidate choices for this contest. */
-  core.List<Candidate> candidates;
-
-  /** Information about the electoral district that this contest is in. */
-  ElectoralDistrict district;
-
-  /**
-   * A description of any additional eligibility requirements for voting in this
-   * contest.
-   */
-  core.String electorateSpecifications;
-
-  /**
-   * An ID for this object. IDs may change in future requests and should not be
-   * cached. Access to this field requires special access that can be requested
-   * from the Request more link on the Quotas page.
-   */
-  core.String id;
-
-  /**
-   * The level of office for this contest. One of: federal, state, county, city,
-   * other
-   */
-  core.String level;
-
-  /**
-   * The number of candidates that will be elected to office in this contest.
-   */
-  core.String numberElected;
-
-  /** The number of candidates that a voter may vote for in this contest. */
-  core.String numberVotingFor;
-
-  /** The name of the office for this contest. */
-  core.String office;
-
-  /** If this is a partisan election, the name of the party it is for. */
-  core.String primaryParty;
-
-  /**
-   * A brief description of the referendum. This field is only populated for
-   * contests of type 'Referendum'.
-   */
-  core.String referendumSubtitle;
-
-  /**
-   * The title of the referendum (e.g. 'Proposition 42'). This field is only
-   * populated for contests of type 'Referendum'.
-   */
-  core.String referendumTitle;
-
-  /**
-   * A link to the referendum. This field is only populated for contests of type
-   * 'Referendum'.
-   */
-  core.String referendumUrl;
-
-  /**
-   * A list of sources for this contest. If multiple sources are listed, the
-   * data has been aggregated from those sources.
-   */
-  core.List<Source> sources;
-
-  /**
-   * "Yes" or "No" depending on whether this a contest being held outside the
-   * normal election cycle.
-   */
-  core.String special;
-
-  /**
-   * The type of contest. Usually this will be 'General', 'Primary', or
-   * 'Run-off' for contests with candidates. For referenda this will be
-   * 'Referendum'.
-   */
-  core.String type;
-
-
-  Contest();
-
-  Contest.fromJson(core.Map _json) {
-    if (_json.containsKey("ballotPlacement")) {
-      ballotPlacement = _json["ballotPlacement"];
-    }
-    if (_json.containsKey("candidates")) {
-      candidates = _json["candidates"].map((value) => new Candidate.fromJson(value)).toList();
-    }
-    if (_json.containsKey("district")) {
-      district = new ElectoralDistrict.fromJson(_json["district"]);
-    }
-    if (_json.containsKey("electorateSpecifications")) {
-      electorateSpecifications = _json["electorateSpecifications"];
-    }
-    if (_json.containsKey("id")) {
-      id = _json["id"];
-    }
-    if (_json.containsKey("level")) {
-      level = _json["level"];
-    }
-    if (_json.containsKey("numberElected")) {
-      numberElected = _json["numberElected"];
-    }
-    if (_json.containsKey("numberVotingFor")) {
-      numberVotingFor = _json["numberVotingFor"];
-    }
-    if (_json.containsKey("office")) {
-      office = _json["office"];
-    }
-    if (_json.containsKey("primaryParty")) {
-      primaryParty = _json["primaryParty"];
-    }
-    if (_json.containsKey("referendumSubtitle")) {
-      referendumSubtitle = _json["referendumSubtitle"];
-    }
-    if (_json.containsKey("referendumTitle")) {
-      referendumTitle = _json["referendumTitle"];
-    }
-    if (_json.containsKey("referendumUrl")) {
-      referendumUrl = _json["referendumUrl"];
-    }
-    if (_json.containsKey("sources")) {
-      sources = _json["sources"].map((value) => new Source.fromJson(value)).toList();
-    }
-    if (_json.containsKey("special")) {
-      special = _json["special"];
-    }
-    if (_json.containsKey("type")) {
-      type = _json["type"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (ballotPlacement != null) {
-      _json["ballotPlacement"] = ballotPlacement;
-    }
-    if (candidates != null) {
-      _json["candidates"] = candidates.map((value) => (value).toJson()).toList();
-    }
-    if (district != null) {
-      _json["district"] = (district).toJson();
-    }
-    if (electorateSpecifications != null) {
-      _json["electorateSpecifications"] = electorateSpecifications;
-    }
-    if (id != null) {
-      _json["id"] = id;
-    }
-    if (level != null) {
-      _json["level"] = level;
-    }
-    if (numberElected != null) {
-      _json["numberElected"] = numberElected;
-    }
-    if (numberVotingFor != null) {
-      _json["numberVotingFor"] = numberVotingFor;
-    }
-    if (office != null) {
-      _json["office"] = office;
-    }
-    if (primaryParty != null) {
-      _json["primaryParty"] = primaryParty;
-    }
-    if (referendumSubtitle != null) {
-      _json["referendumSubtitle"] = referendumSubtitle;
-    }
-    if (referendumTitle != null) {
-      _json["referendumTitle"] = referendumTitle;
-    }
-    if (referendumUrl != null) {
-      _json["referendumUrl"] = referendumUrl;
-    }
-    if (sources != null) {
-      _json["sources"] = sources.map((value) => (value).toJson()).toList();
-    }
-    if (special != null) {
-      _json["special"] = special;
-    }
-    if (type != null) {
-      _json["type"] = type;
-    }
-    return _json;
-  }
-}
-
-
-/** The result of a division search query. */
-class DivisionSearchResponse {
-  /**
-   * Identifies what kind of resource this is. Value: the fixed string
-   * "civicinfo#divisionSearchResponse".
-   */
-  core.String kind;
-
-  /** Not documented yet. */
-  core.List<DivisionSearchResult> results;
-
-  /**
-   * The result of the request. One of: success, addressUnparseable,
-   * noAddressParameter, internalLookupFailure
-   */
-  core.String status;
-
-
-  DivisionSearchResponse();
-
-  DivisionSearchResponse.fromJson(core.Map _json) {
-    if (_json.containsKey("kind")) {
-      kind = _json["kind"];
-    }
-    if (_json.containsKey("results")) {
-      results = _json["results"].map((value) => new DivisionSearchResult.fromJson(value)).toList();
-    }
-    if (_json.containsKey("status")) {
-      status = _json["status"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (kind != null) {
-      _json["kind"] = kind;
-    }
-    if (results != null) {
-      _json["results"] = results.map((value) => (value).toJson()).toList();
-    }
-    if (status != null) {
-      _json["status"] = status;
-    }
-    return _json;
-  }
-}
-
-
-/**
- * Represents a political geographic division that matches the requested query.
- */
-class DivisionSearchResult {
-  /**
-   * Other Open Civic Data identifiers that refer to the same division -- for
-   * example, those that refer to other political divisions whose boundaries are
-   * defined to be coterminous with this one. For example,
-   * ocd-division/country:us/state:wy will include an alias of
-   * ocd-division/country:us/state:wy/cd:1, since Wyoming has only one
-   * Congressional district.
-   */
-  core.List<core.String> aliases;
-
-  /** The name of the division. */
-  core.String name;
-
-  /** The unique Open Civic Data identifier for this division. */
-  core.String ocdId;
-
-
-  DivisionSearchResult();
-
-  DivisionSearchResult.fromJson(core.Map _json) {
-    if (_json.containsKey("aliases")) {
-      aliases = _json["aliases"];
-    }
-    if (_json.containsKey("name")) {
-      name = _json["name"];
-    }
-    if (_json.containsKey("ocdId")) {
-      ocdId = _json["ocdId"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (aliases != null) {
-      _json["aliases"] = aliases;
-    }
-    if (name != null) {
-      _json["name"] = name;
-    }
-    if (ocdId != null) {
-      _json["ocdId"] = ocdId;
-    }
-    return _json;
-  }
-}
-
-
-/** Information about the election that was queried. */
-class Election {
-  /** Day of the election in YYYY-MM-DD format. */
-  core.String electionDay;
-
-  /** The unique ID of this election. */
-  core.String id;
-
-  /** A displayable name for the election. */
-  core.String name;
-
-
-  Election();
-
-  Election.fromJson(core.Map _json) {
-    if (_json.containsKey("electionDay")) {
-      electionDay = _json["electionDay"];
-    }
-    if (_json.containsKey("id")) {
-      id = _json["id"];
-    }
-    if (_json.containsKey("name")) {
-      name = _json["name"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (electionDay != null) {
-      _json["electionDay"] = electionDay;
-    }
-    if (id != null) {
-      _json["id"] = id;
-    }
-    if (name != null) {
-      _json["name"] = name;
-    }
-    return _json;
-  }
-}
-
-
-/** Information about individual election officials. */
-class ElectionOfficial {
-  /** The email address of the election official. */
-  core.String emailAddress;
-
-  /** The fax number of the election official. */
-  core.String faxNumber;
-
-  /** The full name of the election official. */
-  core.String name;
-
-  /** The office phone number of the election official. */
-  core.String officePhoneNumber;
-
-  /** The title of the election official. */
-  core.String title;
-
-
-  ElectionOfficial();
-
-  ElectionOfficial.fromJson(core.Map _json) {
-    if (_json.containsKey("emailAddress")) {
-      emailAddress = _json["emailAddress"];
-    }
-    if (_json.containsKey("faxNumber")) {
-      faxNumber = _json["faxNumber"];
-    }
-    if (_json.containsKey("name")) {
-      name = _json["name"];
-    }
-    if (_json.containsKey("officePhoneNumber")) {
-      officePhoneNumber = _json["officePhoneNumber"];
-    }
-    if (_json.containsKey("title")) {
-      title = _json["title"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (emailAddress != null) {
-      _json["emailAddress"] = emailAddress;
-    }
-    if (faxNumber != null) {
-      _json["faxNumber"] = faxNumber;
-    }
-    if (name != null) {
-      _json["name"] = name;
-    }
-    if (officePhoneNumber != null) {
-      _json["officePhoneNumber"] = officePhoneNumber;
-    }
-    if (title != null) {
-      _json["title"] = title;
-    }
-    return _json;
-  }
-}
-
-
-/** The list of elections available for this version of the API. */
-class ElectionsQueryResponse {
-  /** A list of available elections */
-  core.List<Election> elections;
-
-  /**
-   * Identifies what kind of resource this is. Value: the fixed string
-   * "civicinfo#electionsQueryResponse".
-   */
-  core.String kind;
-
-
-  ElectionsQueryResponse();
-
-  ElectionsQueryResponse.fromJson(core.Map _json) {
-    if (_json.containsKey("elections")) {
-      elections = _json["elections"].map((value) => new Election.fromJson(value)).toList();
-    }
-    if (_json.containsKey("kind")) {
-      kind = _json["kind"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (elections != null) {
-      _json["elections"] = elections.map((value) => (value).toJson()).toList();
-    }
-    if (kind != null) {
-      _json["kind"] = kind;
-    }
-    return _json;
-  }
-}
-
-
-/** Describes the geographic scope of a contest. */
-class ElectoralDistrict {
-  /**
-   * An identifier for this district, relative to its scope. For example, the
-   * 34th State Senate district would have id "34" and a scope of stateUpper.
-   */
-  core.String id;
-
-  /** The name of the district. */
-  core.String name;
-
-  /**
-   * The geographic scope of this district. If unspecified the district's
-   * geography is not known. One of: national, statewide, congressional,
-   * stateUpper, stateLower, countywide, judicial, schoolBoard, cityWide,
-   * township, countyCouncil, cityCouncil, ward, special
-   */
-  core.String scope;
-
-
-  ElectoralDistrict();
-
-  ElectoralDistrict.fromJson(core.Map _json) {
-    if (_json.containsKey("id")) {
-      id = _json["id"];
-    }
-    if (_json.containsKey("name")) {
-      name = _json["name"];
-    }
-    if (_json.containsKey("scope")) {
-      scope = _json["scope"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (id != null) {
-      _json["id"] = id;
-    }
-    if (name != null) {
-      _json["name"] = name;
-    }
-    if (scope != null) {
-      _json["scope"] = scope;
-    }
-    return _json;
-  }
-}
-
-
-/** Describes a political geography. */
-class GeographicDivision {
-  /**
-   * Any other valid OCD IDs that refer to the same division.
-   *
-   * Because OCD IDs are meant to be human-readable and at least somewhat
-   * predictable, there are occasionally several identifiers for a single
-   * division. These identifiers are defined to be equivalent to one another,
-   * and one is always indicated as the primary identifier. The primary
-   * identifier will be returned in ocd_id above, and any other equivalent valid
-   * identifiers will be returned in this list.
-   *
-   * For example, if this division's OCD ID is
-   * ocd-division/country:us/district:dc, this will contain
-   * ocd-division/country:us/state:dc.
-   */
-  core.List<core.String> alsoKnownAs;
-
-  /** The name of the division. */
-  core.String name;
-
-  /**
-   * List of keys in the offices object, one for each office elected from this
-   * division. Will only be present if includeOffices was true (or absent) in
-   * the request.
-   */
-  core.List<core.String> officeIds;
-
-  /**
-   * The geographic scope of the division. If unspecified, the division's
-   * geography is not known. One of: national, statewide, congressional,
-   * stateUpper, stateLower, countywide, judicial, schoolBoard, cityWide,
-   * township, countyCouncil, cityCouncil, ward, special
-   */
-  core.String scope;
-
-
-  GeographicDivision();
-
-  GeographicDivision.fromJson(core.Map _json) {
-    if (_json.containsKey("alsoKnownAs")) {
-      alsoKnownAs = _json["alsoKnownAs"];
-    }
-    if (_json.containsKey("name")) {
-      name = _json["name"];
-    }
-    if (_json.containsKey("officeIds")) {
-      officeIds = _json["officeIds"];
-    }
-    if (_json.containsKey("scope")) {
-      scope = _json["scope"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (alsoKnownAs != null) {
-      _json["alsoKnownAs"] = alsoKnownAs;
-    }
-    if (name != null) {
-      _json["name"] = name;
-    }
-    if (officeIds != null) {
-      _json["officeIds"] = officeIds;
-    }
-    if (scope != null) {
-      _json["scope"] = scope;
-    }
-    return _json;
-  }
-}
-
-
-/** Information about an Office held by one or more Officials. */
-class Office {
-  /** The OCD ID of the division with which this office is associated. */
-  core.String divisionId;
-
-  /**
-   * The level of this elected office. One of: federal, state, county, city,
-   * other
-   */
-  core.String level;
-
-  /** The human-readable name of the office. */
-  core.String name;
-
-  /**
-   * List of keys in the officials object of people who presently hold this
-   * office.
-   */
-  core.List<core.String> officialIds;
-
-  /**
-   * A list of sources for this office. If multiple sources are listed, the data
-   * has been aggregated from those sources.
-   */
-  core.List<Source> sources;
-
-
-  Office();
-
-  Office.fromJson(core.Map _json) {
-    if (_json.containsKey("divisionId")) {
-      divisionId = _json["divisionId"];
-    }
-    if (_json.containsKey("level")) {
-      level = _json["level"];
-    }
-    if (_json.containsKey("name")) {
-      name = _json["name"];
-    }
-    if (_json.containsKey("officialIds")) {
-      officialIds = _json["officialIds"];
-    }
-    if (_json.containsKey("sources")) {
-      sources = _json["sources"].map((value) => new Source.fromJson(value)).toList();
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (divisionId != null) {
-      _json["divisionId"] = divisionId;
-    }
-    if (level != null) {
-      _json["level"] = level;
-    }
-    if (name != null) {
-      _json["name"] = name;
-    }
-    if (officialIds != null) {
-      _json["officialIds"] = officialIds;
-    }
-    if (sources != null) {
-      _json["sources"] = sources.map((value) => (value).toJson()).toList();
-    }
-    return _json;
-  }
-}
-
-
-/** Information about a person holding an elected office. */
-class Official {
-  /** Addresses at which to contact the official. */
-  core.List<SimpleAddressType> address;
-
-  /** A list of known (social) media channels for this official. */
-  core.List<Channel> channels;
-
-  /** The direct email addresses for the official. */
-  core.List<core.String> emails;
-
-  /** The official's name. */
-  core.String name;
-
-  /** The full name of the party the official belongs to. */
-  core.String party;
-
-  /** The official's public contact phone numbers. */
-  core.List<core.String> phones;
-
-  /** A URL for a photo of the official. */
-  core.String photoUrl;
-
-  /** The official's public website URLs. */
-  core.List<core.String> urls;
-
-
-  Official();
-
-  Official.fromJson(core.Map _json) {
-    if (_json.containsKey("address")) {
-      address = _json["address"].map((value) => new SimpleAddressType.fromJson(value)).toList();
-    }
-    if (_json.containsKey("channels")) {
-      channels = _json["channels"].map((value) => new Channel.fromJson(value)).toList();
-    }
-    if (_json.containsKey("emails")) {
-      emails = _json["emails"];
-    }
-    if (_json.containsKey("name")) {
-      name = _json["name"];
-    }
-    if (_json.containsKey("party")) {
-      party = _json["party"];
-    }
-    if (_json.containsKey("phones")) {
-      phones = _json["phones"];
-    }
-    if (_json.containsKey("photoUrl")) {
-      photoUrl = _json["photoUrl"];
-    }
-    if (_json.containsKey("urls")) {
-      urls = _json["urls"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (address != null) {
-      _json["address"] = address.map((value) => (value).toJson()).toList();
-    }
-    if (channels != null) {
-      _json["channels"] = channels.map((value) => (value).toJson()).toList();
-    }
-    if (emails != null) {
-      _json["emails"] = emails;
-    }
-    if (name != null) {
-      _json["name"] = name;
-    }
-    if (party != null) {
-      _json["party"] = party;
-    }
-    if (phones != null) {
-      _json["phones"] = phones;
-    }
-    if (photoUrl != null) {
-      _json["photoUrl"] = photoUrl;
-    }
-    if (urls != null) {
-      _json["urls"] = urls;
-    }
-    return _json;
-  }
-}
-
-
-/**
- * A location where a voter can vote. This may be an early vote site, an
- * election day voting location, or a drop off location for a completed ballot.
- */
-class PollingLocation {
-  /** The address of the location. */
-  SimpleAddressType address;
-
-  /**
-   * The last date that this early vote site or drop off location may be used.
-   * This field is not populated for polling locations.
-   */
-  core.String endDate;
-
-  /**
-   * An ID for this object. IDs may change in future requests and should not be
-   * cached. Access to this field requires special access that can be requested
-   * from the Request more link on the Quotas page.
-   */
-  core.String id;
-
-  /**
-   * The name of the early vote site or drop off location. This field is not
-   * populated for polling locations.
-   */
-  core.String name;
-
-  /**
-   * Notes about this location (e.g. accessibility ramp or entrance to use).
-   */
-  core.String notes;
-
-  /** A description of when this location is open. */
-  core.String pollingHours;
-
-  /**
-   * A list of sources for this location. If multiple sources are listed the
-   * data has been aggregated from those sources.
-   */
-  core.List<Source> sources;
-
-  /**
-   * The first date that this early vote site or drop off location may be used.
-   * This field is not populated for polling locations.
-   */
-  core.String startDate;
-
-  /**
-   * The services provided by this early vote site or drop off location. This
-   * field is not populated for polling locations.
-   */
-  core.String voterServices;
-
-
-  PollingLocation();
-
-  PollingLocation.fromJson(core.Map _json) {
-    if (_json.containsKey("address")) {
-      address = new SimpleAddressType.fromJson(_json["address"]);
-    }
-    if (_json.containsKey("endDate")) {
-      endDate = _json["endDate"];
-    }
-    if (_json.containsKey("id")) {
-      id = _json["id"];
-    }
-    if (_json.containsKey("name")) {
-      name = _json["name"];
-    }
-    if (_json.containsKey("notes")) {
-      notes = _json["notes"];
-    }
-    if (_json.containsKey("pollingHours")) {
-      pollingHours = _json["pollingHours"];
-    }
-    if (_json.containsKey("sources")) {
-      sources = _json["sources"].map((value) => new Source.fromJson(value)).toList();
-    }
-    if (_json.containsKey("startDate")) {
-      startDate = _json["startDate"];
-    }
-    if (_json.containsKey("voterServices")) {
-      voterServices = _json["voterServices"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (address != null) {
-      _json["address"] = (address).toJson();
-    }
-    if (endDate != null) {
-      _json["endDate"] = endDate;
-    }
-    if (id != null) {
-      _json["id"] = id;
-    }
-    if (name != null) {
-      _json["name"] = name;
-    }
-    if (notes != null) {
-      _json["notes"] = notes;
-    }
-    if (pollingHours != null) {
-      _json["pollingHours"] = pollingHours;
-    }
-    if (sources != null) {
-      _json["sources"] = sources.map((value) => (value).toJson()).toList();
-    }
-    if (startDate != null) {
-      _json["startDate"] = startDate;
-    }
-    if (voterServices != null) {
-      _json["voterServices"] = voterServices;
-    }
-    return _json;
-  }
-}
-
-
-/**
- * A request for political geography and representative information for an
- * address.
- */
-class RepresentativeInfoRequest {
-  /**
-   * The address to look up. May only be specified if the field ocdId is not
-   * given in the URL.
-   */
-  core.String address;
-
-
-  RepresentativeInfoRequest();
-
-  RepresentativeInfoRequest.fromJson(core.Map _json) {
-    if (_json.containsKey("address")) {
-      address = _json["address"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (address != null) {
-      _json["address"] = address;
-    }
-    return _json;
-  }
-}
-
-
-/** The result of a representative info lookup query. */
-class RepresentativeInfoResponse {
-  /** Political geographic divisions that contain the requested address. */
-  core.Map<core.String, GeographicDivision> divisions;
-
-  /**
-   * Identifies what kind of resource this is. Value: the fixed string
-   * "civicinfo#representativeInfoResponse".
-   */
-  core.String kind;
-
-  /** The normalized version of the requested address */
-  SimpleAddressType normalizedInput;
-
-  /**
-   * Elected offices referenced by the divisions listed above. Will only be
-   * present if includeOffices was true in the request.
-   */
-  core.Map<core.String, Office> offices;
-
-  /**
-   * Officials holding the offices listed above. Will only be present if
-   * includeOffices was true in the request.
-   */
-  core.Map<core.String, Official> officials;
-
-  /**
-   * The result of the request. One of: success, noStreetSegmentFound,
-   * addressUnparseable, noAddressParameter, multipleStreetSegmentsFound,
-   * electionOver, electionUnknown, internalLookupFailure,
-   * RequestedBothAddressAndOcdId
-   */
-  core.String status;
-
-
-  RepresentativeInfoResponse();
-
-  RepresentativeInfoResponse.fromJson(core.Map _json) {
-    if (_json.containsKey("divisions")) {
-      divisions = common_internal.mapMap(_json["divisions"], (item) => new GeographicDivision.fromJson(item));
-    }
-    if (_json.containsKey("kind")) {
-      kind = _json["kind"];
-    }
-    if (_json.containsKey("normalizedInput")) {
-      normalizedInput = new SimpleAddressType.fromJson(_json["normalizedInput"]);
-    }
-    if (_json.containsKey("offices")) {
-      offices = common_internal.mapMap(_json["offices"], (item) => new Office.fromJson(item));
-    }
-    if (_json.containsKey("officials")) {
-      officials = common_internal.mapMap(_json["officials"], (item) => new Official.fromJson(item));
-    }
-    if (_json.containsKey("status")) {
-      status = _json["status"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (divisions != null) {
-      _json["divisions"] = common_internal.mapMap(divisions, (item) => (item).toJson());
-    }
-    if (kind != null) {
-      _json["kind"] = kind;
-    }
-    if (normalizedInput != null) {
-      _json["normalizedInput"] = (normalizedInput).toJson();
-    }
-    if (offices != null) {
-      _json["offices"] = common_internal.mapMap(offices, (item) => (item).toJson());
-    }
-    if (officials != null) {
-      _json["officials"] = common_internal.mapMap(officials, (item) => (item).toJson());
-    }
-    if (status != null) {
-      _json["status"] = status;
-    }
-    return _json;
-  }
-}
-
-
-/** A simple representation of an address. */
-class SimpleAddressType {
-  /** The city or town for the address. */
-  core.String city;
-
-  /** The street name and number of this address. */
-  core.String line1;
-
-  /** The second line the address, if needed. */
-  core.String line2;
-
-  /** The third line of the address, if needed. */
-  core.String line3;
-
-  /** The name of the location. */
-  core.String locationName;
-
-  /** The US two letter state abbreviation of the address. */
-  core.String state;
-
-  /** The US Postal Zip Code of the address. */
-  core.String zip;
-
-
-  SimpleAddressType();
-
-  SimpleAddressType.fromJson(core.Map _json) {
-    if (_json.containsKey("city")) {
-      city = _json["city"];
-    }
-    if (_json.containsKey("line1")) {
-      line1 = _json["line1"];
-    }
-    if (_json.containsKey("line2")) {
-      line2 = _json["line2"];
-    }
-    if (_json.containsKey("line3")) {
-      line3 = _json["line3"];
-    }
-    if (_json.containsKey("locationName")) {
-      locationName = _json["locationName"];
-    }
-    if (_json.containsKey("state")) {
-      state = _json["state"];
-    }
-    if (_json.containsKey("zip")) {
-      zip = _json["zip"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (city != null) {
-      _json["city"] = city;
-    }
-    if (line1 != null) {
-      _json["line1"] = line1;
-    }
-    if (line2 != null) {
-      _json["line2"] = line2;
-    }
-    if (line3 != null) {
-      _json["line3"] = line3;
-    }
-    if (locationName != null) {
-      _json["locationName"] = locationName;
-    }
-    if (state != null) {
-      _json["state"] = state;
-    }
-    if (zip != null) {
-      _json["zip"] = zip;
-    }
-    return _json;
-  }
-}
-
-
-/**
- * Contains information about the data source for the element containing it.
- */
-class Source {
-  /** The name of the data source. */
-  core.String name;
-
-  /** Whether this data comes from an official government source. */
-  core.bool official;
-
-
-  Source();
-
-  Source.fromJson(core.Map _json) {
-    if (_json.containsKey("name")) {
-      name = _json["name"];
-    }
-    if (_json.containsKey("official")) {
-      official = _json["official"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (name != null) {
-      _json["name"] = name;
-    }
-    if (official != null) {
-      _json["official"] = official;
-    }
-    return _json;
-  }
-}
-
-
-/** A request for information about a voter. */
-class VoterInfoRequest {
-  /** The registered address of the voter to look up. */
-  core.String address;
-
-
-  VoterInfoRequest();
-
-  VoterInfoRequest.fromJson(core.Map _json) {
-    if (_json.containsKey("address")) {
-      address = _json["address"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (address != null) {
-      _json["address"] = address;
-    }
-    return _json;
-  }
-}
-
-
-/** The result of a voter info lookup query. */
-class VoterInfoResponse {
-  /** Contests that will appear on the voter's ballot. */
-  core.List<Contest> contests;
-
-  /**
-   * Locations where a voter is eligible to drop off a completed ballot. The
-   * voter must have received and completed a ballot prior to arriving at the
-   * location. The location may not have ballots available on the premises.
-   * These locations could be open on or before election day as indicated in the
-   * pollingHours field.
-   */
-  core.List<PollingLocation> dropOffLocations;
-
-  /**
-   * Locations where the voter is eligible to vote early, prior to election day.
-   */
-  core.List<PollingLocation> earlyVoteSites;
-
-  /** The election that was queried. */
-  Election election;
-
-  /**
-   * Identifies what kind of resource this is. Value: the fixed string
-   * "civicinfo#voterInfoResponse".
-   */
-  core.String kind;
-
-  /** The normalized version of the requested address */
-  SimpleAddressType normalizedInput;
-
-  /** Locations where the voter is eligible to vote on election day. */
-  core.List<PollingLocation> pollingLocations;
-
-  /** Not documented yet. */
-  core.String precinctId;
-
-  /**
-   * Local Election Information for the state that the voter votes in. For the
-   * US, there will only be one element in this array.
-   */
-  core.List<AdministrationRegion> state;
-
-  /**
-   * The result of the request. One of: success, noStreetSegmentFound,
-   * addressUnparseable, noAddressParameter, multipleStreetSegmentsFound,
-   * electionOver, electionUnknown, internalLookupFailure
-   */
-  core.String status;
-
-
-  VoterInfoResponse();
-
-  VoterInfoResponse.fromJson(core.Map _json) {
-    if (_json.containsKey("contests")) {
-      contests = _json["contests"].map((value) => new Contest.fromJson(value)).toList();
-    }
-    if (_json.containsKey("dropOffLocations")) {
-      dropOffLocations = _json["dropOffLocations"].map((value) => new PollingLocation.fromJson(value)).toList();
-    }
-    if (_json.containsKey("earlyVoteSites")) {
-      earlyVoteSites = _json["earlyVoteSites"].map((value) => new PollingLocation.fromJson(value)).toList();
-    }
-    if (_json.containsKey("election")) {
-      election = new Election.fromJson(_json["election"]);
-    }
-    if (_json.containsKey("kind")) {
-      kind = _json["kind"];
-    }
-    if (_json.containsKey("normalizedInput")) {
-      normalizedInput = new SimpleAddressType.fromJson(_json["normalizedInput"]);
-    }
-    if (_json.containsKey("pollingLocations")) {
-      pollingLocations = _json["pollingLocations"].map((value) => new PollingLocation.fromJson(value)).toList();
-    }
-    if (_json.containsKey("precinctId")) {
-      precinctId = _json["precinctId"];
-    }
-    if (_json.containsKey("state")) {
-      state = _json["state"].map((value) => new AdministrationRegion.fromJson(value)).toList();
-    }
-    if (_json.containsKey("status")) {
-      status = _json["status"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (contests != null) {
-      _json["contests"] = contests.map((value) => (value).toJson()).toList();
-    }
-    if (dropOffLocations != null) {
-      _json["dropOffLocations"] = dropOffLocations.map((value) => (value).toJson()).toList();
-    }
-    if (earlyVoteSites != null) {
-      _json["earlyVoteSites"] = earlyVoteSites.map((value) => (value).toJson()).toList();
-    }
-    if (election != null) {
-      _json["election"] = (election).toJson();
-    }
-    if (kind != null) {
-      _json["kind"] = kind;
-    }
-    if (normalizedInput != null) {
-      _json["normalizedInput"] = (normalizedInput).toJson();
-    }
-    if (pollingLocations != null) {
-      _json["pollingLocations"] = pollingLocations.map((value) => (value).toJson()).toList();
-    }
-    if (precinctId != null) {
-      _json["precinctId"] = precinctId;
-    }
-    if (state != null) {
-      _json["state"] = state.map((value) => (value).toJson()).toList();
-    }
-    if (status != null) {
-      _json["status"] = status;
-    }
-    return _json;
-  }
-}
-
-
diff --git a/generated/googleapis/lib/civicinfo/v1.dart b/generated/googleapis/lib/civicinfo/v1.dart
deleted file mode 100644
index 48022f2..0000000
--- a/generated/googleapis/lib/civicinfo/v1.dart
+++ /dev/null
@@ -1,1805 +0,0 @@
-library googleapis.civicinfo.v1;
-
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
-
-import "package:crypto/crypto.dart" as crypto;
-import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
-
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
-
-/** An API for accessing civic information. */
-class CivicinfoApi {
-
-  final common_internal.ApiRequester _requester;
-
-  DivisionsResourceApi get divisions => new DivisionsResourceApi(_requester);
-  ElectionsResourceApi get elections => new ElectionsResourceApi(_requester);
-  RepresentativesResourceApi get representatives => new RepresentativesResourceApi(_requester);
-
-  CivicinfoApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "civicinfo/v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
-}
-
-
-/** Not documented yet. */
-class DivisionsResourceApi {
-  final common_internal.ApiRequester _requester;
-
-  DivisionsResourceApi(common_internal.ApiRequester client) : 
-      _requester = client;
-
-  /**
-   * Searches for political divisions by their natural name or OCD ID.
-   *
-   * Request parameters:
-   *
-   * [query] - The search query. Queries can cover any parts of a OCD ID or a
-   * human readable division name. All words given in the query are treated as
-   * required patterns. In addition to that, most query operators of the Apache
-   * Lucene library are supported. See
-   * http://lucene.apache.org/core/2_9_4/queryparsersyntax.html
-   *
-   * Completes with a [DivisionSearchResponse].
-   *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
-   * error.
-   *
-   * If the used [http.Client] completes with an error when making a REST call,
-   * this method  will complete with the same error.
-   */
-  async.Future<DivisionSearchResponse> search({core.String query}) {
-    var _url = null;
-    var _queryParams = new core.Map();
-    var _uploadMedia = null;
-    var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
-    var _body = null;
-
-    if (query != null) {
-      _queryParams["query"] = [query];
-    }
-
-
-    _url = 'representatives/division_search';
-
-    var _response = _requester.request(_url,
-                                       "GET",
-                                       body: _body,
-                                       queryParams: _queryParams,
-                                       uploadOptions: _uploadOptions,
-                                       uploadMedia: _uploadMedia,
-                                       downloadOptions: _downloadOptions);
-    return _response.then((data) => new DivisionSearchResponse.fromJson(data));
-  }
-
-}
-
-
-/** Not documented yet. */
-class ElectionsResourceApi {
-  final common_internal.ApiRequester _requester;
-
-  ElectionsResourceApi(common_internal.ApiRequester client) : 
-      _requester = client;
-
-  /**
-   * List of available elections to query.
-   *
-   * Request parameters:
-   *
-   * Completes with a [ElectionsQueryResponse].
-   *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
-   * error.
-   *
-   * If the used [http.Client] completes with an error when making a REST call,
-   * this method  will complete with the same error.
-   */
-  async.Future<ElectionsQueryResponse> electionQuery() {
-    var _url = null;
-    var _queryParams = new core.Map();
-    var _uploadMedia = null;
-    var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
-    var _body = null;
-
-
-
-    _url = 'elections';
-
-    var _response = _requester.request(_url,
-                                       "GET",
-                                       body: _body,
-                                       queryParams: _queryParams,
-                                       uploadOptions: _uploadOptions,
-                                       uploadMedia: _uploadMedia,
-                                       downloadOptions: _downloadOptions);
-    return _response.then((data) => new ElectionsQueryResponse.fromJson(data));
-  }
-
-  /**
-   * Looks up information relevant to a voter based on the voter's registered
-   * address.
-   *
-   * [request] - The metadata request object.
-   *
-   * Request parameters:
-   *
-   * [electionId] - The unique ID of the election to look up. A list of election
-   * IDs can be obtained at
-   * https://www.googleapis.com/civicinfo/{version}/elections
-   *
-   * [officialOnly] - If set to true, only data from official state sources will
-   * be returned.
-   *
-   * Completes with a [VoterInfoResponse].
-   *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
-   * error.
-   *
-   * If the used [http.Client] completes with an error when making a REST call,
-   * this method  will complete with the same error.
-   */
-  async.Future<VoterInfoResponse> voterInfoQuery(VoterInfoRequest request, core.String electionId, {core.bool officialOnly}) {
-    var _url = null;
-    var _queryParams = new core.Map();
-    var _uploadMedia = null;
-    var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
-    var _body = null;
-
-    if (request != null) {
-      _body = convert.JSON.encode((request).toJson());
-    }
-    if (electionId == null) {
-      throw new core.ArgumentError("Parameter electionId is required.");
-    }
-    if (officialOnly != null) {
-      _queryParams["officialOnly"] = ["${officialOnly}"];
-    }
-
-
-    _url = 'voterinfo/' + common_internal.Escaper.ecapeVariable('$electionId') + '/lookup';
-
-    var _response = _requester.request(_url,
-                                       "POST",
-                                       body: _body,
-                                       queryParams: _queryParams,
-                                       uploadOptions: _uploadOptions,
-                                       uploadMedia: _uploadMedia,
-                                       downloadOptions: _downloadOptions);
-    return _response.then((data) => new VoterInfoResponse.fromJson(data));
-  }
-
-}
-
-
-/** Not documented yet. */
-class RepresentativesResourceApi {
-  final common_internal.ApiRequester _requester;
-
-  RepresentativesResourceApi(common_internal.ApiRequester client) : 
-      _requester = client;
-
-  /**
-   * Looks up political geography and representative information based on an
-   * address or Open Civic Data division identifier.
-   *
-   * [request] - The metadata request object.
-   *
-   * Request parameters:
-   *
-   * [includeOffices] - Whether to return information about offices and
-   * officials. If false, only the top-level district information will be
-   * returned.
-   *
-   * [ocdId] - The division to look up. May only be specified if the address
-   * field is not given in the request body.
-   *
-   * [recursive] - When ocd_id is supplied, return all divisions which are
-   * hierarchically nested within the queried division. For example, if querying
-   * ocd-division/country:us/district:dc, this would also return all DC's wards
-   * and ANCs.
-   *
-   * Completes with a [RepresentativeInfoResponse].
-   *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
-   * error.
-   *
-   * If the used [http.Client] completes with an error when making a REST call,
-   * this method  will complete with the same error.
-   */
-  async.Future<RepresentativeInfoResponse> representativeInfoQuery(RepresentativeInfoRequest request, {core.bool includeOffices, core.String ocdId, core.bool recursive}) {
-    var _url = null;
-    var _queryParams = new core.Map();
-    var _uploadMedia = null;
-    var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
-    var _body = null;
-
-    if (request != null) {
-      _body = convert.JSON.encode((request).toJson());
-    }
-    if (includeOffices != null) {
-      _queryParams["includeOffices"] = ["${includeOffices}"];
-    }
-    if (ocdId != null) {
-      _queryParams["ocdId"] = [ocdId];
-    }
-    if (recursive != null) {
-      _queryParams["recursive"] = ["${recursive}"];
-    }
-
-
-    _url = 'representatives/lookup';
-
-    var _response = _requester.request(_url,
-                                       "POST",
-                                       body: _body,
-                                       queryParams: _queryParams,
-                                       uploadOptions: _uploadOptions,
-                                       uploadMedia: _uploadMedia,
-                                       downloadOptions: _downloadOptions);
-    return _response.then((data) => new RepresentativeInfoResponse.fromJson(data));
-  }
-
-}
-
-
-
-/** Describes information about a regional election administrative area. */
-class AdministrationRegion {
-  /** The election administration body for this area. */
-  AdministrativeBody electionAdministrationBody;
-
-  /**
-   * An ID for this object. IDs may change in future requests and should not be
-   * cached. Access to this field requires special access that can be requested
-   * from the Request more link on the Quotas page.
-   */
-  core.String id;
-
-  /**
-   * The city or county that provides election information for this voter. This
-   * object can have the same elements as state.
-   */
-  AdministrationRegion localJurisdiction;
-
-  /** The name of the jurisdiction. */
-  core.String name;
-
-  /**
-   * A list of sources for this area. If multiple sources are listed the data
-   * has been aggregated from those sources.
-   */
-  core.List<Source> sources;
-
-
-  AdministrationRegion();
-
-  AdministrationRegion.fromJson(core.Map _json) {
-    if (_json.containsKey("electionAdministrationBody")) {
-      electionAdministrationBody = new AdministrativeBody.fromJson(_json["electionAdministrationBody"]);
-    }
-    if (_json.containsKey("id")) {
-      id = _json["id"];
-    }
-    if (_json.containsKey("local_jurisdiction")) {
-      localJurisdiction = new AdministrationRegion.fromJson(_json["local_jurisdiction"]);
-    }
-    if (_json.containsKey("name")) {
-      name = _json["name"];
-    }
-    if (_json.containsKey("sources")) {
-      sources = _json["sources"].map((value) => new Source.fromJson(value)).toList();
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (electionAdministrationBody != null) {
-      _json["electionAdministrationBody"] = (electionAdministrationBody).toJson();
-    }
-    if (id != null) {
-      _json["id"] = id;
-    }
-    if (localJurisdiction != null) {
-      _json["local_jurisdiction"] = (localJurisdiction).toJson();
-    }
-    if (name != null) {
-      _json["name"] = name;
-    }
-    if (sources != null) {
-      _json["sources"] = sources.map((value) => (value).toJson()).toList();
-    }
-    return _json;
-  }
-}
-
-
-/**
- * Information about an election administrative body (e.g. County Board of
- * Elections).
- */
-class AdministrativeBody {
-  /**
-   * A URL provided by this administrative body for information on absentee
-   * voting.
-   */
-  core.String absenteeVotingInfoUrl;
-
-  /**
-   * A URL provided by this administrative body to give contest information to
-   * the voter.
-   */
-  core.String ballotInfoUrl;
-
-  /** The mailing address of this administrative body. */
-  SimpleAddressType correspondenceAddress;
-
-  /**
-   * A URL provided by this administrative body for looking up general election
-   * information.
-   */
-  core.String electionInfoUrl;
-
-  /** The election officials for this election administrative body. */
-  core.List<ElectionOfficial> electionOfficials;
-
-  /**
-   * A URL provided by this administrative body for confirming that the voter is
-   * registered to vote.
-   */
-  core.String electionRegistrationConfirmationUrl;
-
-  /**
-   * A URL provided by this administrative body for looking up how to register
-   * to vote.
-   */
-  core.String electionRegistrationUrl;
-
-  /**
-   * A URL provided by this administrative body describing election rules to the
-   * voter.
-   */
-  core.String electionRulesUrl;
-
-  /** A description of the hours of operation for this administrative body. */
-  core.String hoursOfOperation;
-
-  /** The name of this election administrative body. */
-  core.String name;
-
-  /** The physical address of this administrative body. */
-  SimpleAddressType physicalAddress;
-
-  /** A description of the services this administrative body may provide. */
-  core.List<core.String> voterServices;
-
-  /**
-   * A URL provided by this administrative body for looking up where to vote.
-   */
-  core.String votingLocationFinderUrl;
-
-
-  AdministrativeBody();
-
-  AdministrativeBody.fromJson(core.Map _json) {
-    if (_json.containsKey("absenteeVotingInfoUrl")) {
-      absenteeVotingInfoUrl = _json["absenteeVotingInfoUrl"];
-    }
-    if (_json.containsKey("ballotInfoUrl")) {
-      ballotInfoUrl = _json["ballotInfoUrl"];
-    }
-    if (_json.containsKey("correspondenceAddress")) {
-      correspondenceAddress = new SimpleAddressType.fromJson(_json["correspondenceAddress"]);
-    }
-    if (_json.containsKey("electionInfoUrl")) {
-      electionInfoUrl = _json["electionInfoUrl"];
-    }
-    if (_json.containsKey("electionOfficials")) {
-      electionOfficials = _json["electionOfficials"].map((value) => new ElectionOfficial.fromJson(value)).toList();
-    }
-    if (_json.containsKey("electionRegistrationConfirmationUrl")) {
-      electionRegistrationConfirmationUrl = _json["electionRegistrationConfirmationUrl"];
-    }
-    if (_json.containsKey("electionRegistrationUrl")) {
-      electionRegistrationUrl = _json["electionRegistrationUrl"];
-    }
-    if (_json.containsKey("electionRulesUrl")) {
-      electionRulesUrl = _json["electionRulesUrl"];
-    }
-    if (_json.containsKey("hoursOfOperation")) {
-      hoursOfOperation = _json["hoursOfOperation"];
-    }
-    if (_json.containsKey("name")) {
-      name = _json["name"];
-    }
-    if (_json.containsKey("physicalAddress")) {
-      physicalAddress = new SimpleAddressType.fromJson(_json["physicalAddress"]);
-    }
-    if (_json.containsKey("voter_services")) {
-      voterServices = _json["voter_services"];
-    }
-    if (_json.containsKey("votingLocationFinderUrl")) {
-      votingLocationFinderUrl = _json["votingLocationFinderUrl"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (absenteeVotingInfoUrl != null) {
-      _json["absenteeVotingInfoUrl"] = absenteeVotingInfoUrl;
-    }
-    if (ballotInfoUrl != null) {
-      _json["ballotInfoUrl"] = ballotInfoUrl;
-    }
-    if (correspondenceAddress != null) {
-      _json["correspondenceAddress"] = (correspondenceAddress).toJson();
-    }
-    if (electionInfoUrl != null) {
-      _json["electionInfoUrl"] = electionInfoUrl;
-    }
-    if (electionOfficials != null) {
-      _json["electionOfficials"] = electionOfficials.map((value) => (value).toJson()).toList();
-    }
-    if (electionRegistrationConfirmationUrl != null) {
-      _json["electionRegistrationConfirmationUrl"] = electionRegistrationConfirmationUrl;
-    }
-    if (electionRegistrationUrl != null) {
-      _json["electionRegistrationUrl"] = electionRegistrationUrl;
-    }
-    if (electionRulesUrl != null) {
-      _json["electionRulesUrl"] = electionRulesUrl;
-    }
-    if (hoursOfOperation != null) {
-      _json["hoursOfOperation"] = hoursOfOperation;
-    }
-    if (name != null) {
-      _json["name"] = name;
-    }
-    if (physicalAddress != null) {
-      _json["physicalAddress"] = (physicalAddress).toJson();
-    }
-    if (voterServices != null) {
-      _json["voter_services"] = voterServices;
-    }
-    if (votingLocationFinderUrl != null) {
-      _json["votingLocationFinderUrl"] = votingLocationFinderUrl;
-    }
-    return _json;
-  }
-}
-
-
-/** Information about a candidate running for elected office. */
-class Candidate {
-  /** The URL for the candidate's campaign web site. */
-  core.String candidateUrl;
-
-  /** A list of known (social) media channels for this candidate. */
-  core.List<Channel> channels;
-
-  /** The email address for the candidate's campaign. */
-  core.String email;
-
-  /** The candidate's name. */
-  core.String name;
-
-  /** The order the candidate appears on the ballot for this contest. */
-  core.String orderOnBallot;
-
-  /** The full name of the party the candidate is a member of. */
-  core.String party;
-
-  /** The voice phone number for the candidate's campaign office. */
-  core.String phone;
-
-  /** A URL for a photo of the candidate. */
-  core.String photoUrl;
-
-
-  Candidate();
-
-  Candidate.fromJson(core.Map _json) {
-    if (_json.containsKey("candidateUrl")) {
-      candidateUrl = _json["candidateUrl"];
-    }
-    if (_json.containsKey("channels")) {
-      channels = _json["channels"].map((value) => new Channel.fromJson(value)).toList();
-    }
-    if (_json.containsKey("email")) {
-      email = _json["email"];
-    }
-    if (_json.containsKey("name")) {
-      name = _json["name"];
-    }
-    if (_json.containsKey("orderOnBallot")) {
-      orderOnBallot = _json["orderOnBallot"];
-    }
-    if (_json.containsKey("party")) {
-      party = _json["party"];
-    }
-    if (_json.containsKey("phone")) {
-      phone = _json["phone"];
-    }
-    if (_json.containsKey("photoUrl")) {
-      photoUrl = _json["photoUrl"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (candidateUrl != null) {
-      _json["candidateUrl"] = candidateUrl;
-    }
-    if (channels != null) {
-      _json["channels"] = channels.map((value) => (value).toJson()).toList();
-    }
-    if (email != null) {
-      _json["email"] = email;
-    }
-    if (name != null) {
-      _json["name"] = name;
-    }
-    if (orderOnBallot != null) {
-      _json["orderOnBallot"] = orderOnBallot;
-    }
-    if (party != null) {
-      _json["party"] = party;
-    }
-    if (phone != null) {
-      _json["phone"] = phone;
-    }
-    if (photoUrl != null) {
-      _json["photoUrl"] = photoUrl;
-    }
-    return _json;
-  }
-}
-
-
-/** A social media or web channel for a candidate. */
-class Channel {
-  /** The unique public identifier for the candidate's channel. */
-  core.String id;
-
-  /**
-   * The type of channel. The following is a list of types of channels, but is
-   * not exhaustive. More channel types may be added at a later time. One of:
-   * GooglePlus, YouTube, Facebook, Twitter
-   */
-  core.String type;
-
-
-  Channel();
-
-  Channel.fromJson(core.Map _json) {
-    if (_json.containsKey("id")) {
-      id = _json["id"];
-    }
-    if (_json.containsKey("type")) {
-      type = _json["type"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (id != null) {
-      _json["id"] = id;
-    }
-    if (type != null) {
-      _json["type"] = type;
-    }
-    return _json;
-  }
-}
-
-
-/** Information about a contest that appears on a voter's ballot. */
-class Contest {
-  /**
-   * A number specifying the position of this contest on the voter's ballot.
-   */
-  core.String ballotPlacement;
-
-  /** The candidate choices for this contest. */
-  core.List<Candidate> candidates;
-
-  /** Information about the electoral district that this contest is in. */
-  ElectoralDistrict district;
-
-  /**
-   * A description of any additional eligibility requirements for voting in this
-   * contest.
-   */
-  core.String electorateSpecifications;
-
-  /**
-   * An ID for this object. IDs may change in future requests and should not be
-   * cached. Access to this field requires special access that can be requested
-   * from the Request more link on the Quotas page.
-   */
-  core.String id;
-
-  /**
-   * The level of office for this contest. One of: federal, state, county, city,
-   * other
-   */
-  core.String level;
-
-  /**
-   * The number of candidates that will be elected to office in this contest.
-   */
-  core.String numberElected;
-
-  /** The number of candidates that a voter may vote for in this contest. */
-  core.String numberVotingFor;
-
-  /** The name of the office for this contest. */
-  core.String office;
-
-  /** If this is a partisan election, the name of the party it is for. */
-  core.String primaryParty;
-
-  /**
-   * A brief description of the referendum. This field is only populated for
-   * contests of type 'Referendum'.
-   */
-  core.String referendumSubtitle;
-
-  /**
-   * The title of the referendum (e.g. 'Proposition 42'). This field is only
-   * populated for contests of type 'Referendum'.
-   */
-  core.String referendumTitle;
-
-  /**
-   * A link to the referendum. This field is only populated for contests of type
-   * 'Referendum'.
-   */
-  core.String referendumUrl;
-
-  /**
-   * A list of sources for this contest. If multiple sources are listed, the
-   * data has been aggregated from those sources.
-   */
-  core.List<Source> sources;
-
-  /**
-   * "Yes" or "No" depending on whether this a contest being held outside the
-   * normal election cycle.
-   */
-  core.String special;
-
-  /**
-   * The type of contest. Usually this will be 'General', 'Primary', or
-   * 'Run-off' for contests with candidates. For referenda this will be
-   * 'Referendum'.
-   */
-  core.String type;
-
-
-  Contest();
-
-  Contest.fromJson(core.Map _json) {
-    if (_json.containsKey("ballotPlacement")) {
-      ballotPlacement = _json["ballotPlacement"];
-    }
-    if (_json.containsKey("candidates")) {
-      candidates = _json["candidates"].map((value) => new Candidate.fromJson(value)).toList();
-    }
-    if (_json.containsKey("district")) {
-      district = new ElectoralDistrict.fromJson(_json["district"]);
-    }
-    if (_json.containsKey("electorateSpecifications")) {
-      electorateSpecifications = _json["electorateSpecifications"];
-    }
-    if (_json.containsKey("id")) {
-      id = _json["id"];
-    }
-    if (_json.containsKey("level")) {
-      level = _json["level"];
-    }
-    if (_json.containsKey("numberElected")) {
-      numberElected = _json["numberElected"];
-    }
-    if (_json.containsKey("numberVotingFor")) {
-      numberVotingFor = _json["numberVotingFor"];
-    }
-    if (_json.containsKey("office")) {
-      office = _json["office"];
-    }
-    if (_json.containsKey("primaryParty")) {
-      primaryParty = _json["primaryParty"];
-    }
-    if (_json.containsKey("referendumSubtitle")) {
-      referendumSubtitle = _json["referendumSubtitle"];
-    }
-    if (_json.containsKey("referendumTitle")) {
-      referendumTitle = _json["referendumTitle"];
-    }
-    if (_json.containsKey("referendumUrl")) {
-      referendumUrl = _json["referendumUrl"];
-    }
-    if (_json.containsKey("sources")) {
-      sources = _json["sources"].map((value) => new Source.fromJson(value)).toList();
-    }
-    if (_json.containsKey("special")) {
-      special = _json["special"];
-    }
-    if (_json.containsKey("type")) {
-      type = _json["type"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (ballotPlacement != null) {
-      _json["ballotPlacement"] = ballotPlacement;
-    }
-    if (candidates != null) {
-      _json["candidates"] = candidates.map((value) => (value).toJson()).toList();
-    }
-    if (district != null) {
-      _json["district"] = (district).toJson();
-    }
-    if (electorateSpecifications != null) {
-      _json["electorateSpecifications"] = electorateSpecifications;
-    }
-    if (id != null) {
-      _json["id"] = id;
-    }
-    if (level != null) {
-      _json["level"] = level;
-    }
-    if (numberElected != null) {
-      _json["numberElected"] = numberElected;
-    }
-    if (numberVotingFor != null) {
-      _json["numberVotingFor"] = numberVotingFor;
-    }
-    if (office != null) {
-      _json["office"] = office;
-    }
-    if (primaryParty != null) {
-      _json["primaryParty"] = primaryParty;
-    }
-    if (referendumSubtitle != null) {
-      _json["referendumSubtitle"] = referendumSubtitle;
-    }
-    if (referendumTitle != null) {
-      _json["referendumTitle"] = referendumTitle;
-    }
-    if (referendumUrl != null) {
-      _json["referendumUrl"] = referendumUrl;
-    }
-    if (sources != null) {
-      _json["sources"] = sources.map((value) => (value).toJson()).toList();
-    }
-    if (special != null) {
-      _json["special"] = special;
-    }
-    if (type != null) {
-      _json["type"] = type;
-    }
-    return _json;
-  }
-}
-
-
-/** The result of a division search query. */
-class DivisionSearchResponse {
-  /**
-   * Identifies what kind of resource this is. Value: the fixed string
-   * "civicinfo#divisionSearchResponse".
-   */
-  core.String kind;
-
-  /** Not documented yet. */
-  core.List<DivisionSearchResult> results;
-
-  /**
-   * The result of the request. One of: success, addressUnparseable,
-   * noAddressParameter, internalLookupFailure
-   */
-  core.String status;
-
-
-  DivisionSearchResponse();
-
-  DivisionSearchResponse.fromJson(core.Map _json) {
-    if (_json.containsKey("kind")) {
-      kind = _json["kind"];
-    }
-    if (_json.containsKey("results")) {
-      results = _json["results"].map((value) => new DivisionSearchResult.fromJson(value)).toList();
-    }
-    if (_json.containsKey("status")) {
-      status = _json["status"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (kind != null) {
-      _json["kind"] = kind;
-    }
-    if (results != null) {
-      _json["results"] = results.map((value) => (value).toJson()).toList();
-    }
-    if (status != null) {
-      _json["status"] = status;
-    }
-    return _json;
-  }
-}
-
-
-/**
- * Represents a political geographic division that matches the requested query.
- */
-class DivisionSearchResult {
-  /**
-   * Other Open Civic Data identifiers that refer to the same division -- for
-   * example, those that refer to other political divisions whose boundaries are
-   * defined to be coterminous with this one. For example,
-   * ocd-division/country:us/state:wy will include an alias of
-   * ocd-division/country:us/state:wy/cd:1, since Wyoming has only one
-   * Congressional district.
-   */
-  core.List<core.String> aliases;
-
-  /** The name of the division. */
-  core.String name;
-
-  /** The unique Open Civic Data identifier for this division. */
-  core.String ocdId;
-
-
-  DivisionSearchResult();
-
-  DivisionSearchResult.fromJson(core.Map _json) {
-    if (_json.containsKey("aliases")) {
-      aliases = _json["aliases"];
-    }
-    if (_json.containsKey("name")) {
-      name = _json["name"];
-    }
-    if (_json.containsKey("ocdId")) {
-      ocdId = _json["ocdId"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (aliases != null) {
-      _json["aliases"] = aliases;
-    }
-    if (name != null) {
-      _json["name"] = name;
-    }
-    if (ocdId != null) {
-      _json["ocdId"] = ocdId;
-    }
-    return _json;
-  }
-}
-
-
-/** Information about the election that was queried. */
-class Election {
-  /** Day of the election in YYYY-MM-DD format. */
-  core.String electionDay;
-
-  /** The unique ID of this election. */
-  core.String id;
-
-  /** A displayable name for the election. */
-  core.String name;
-
-
-  Election();
-
-  Election.fromJson(core.Map _json) {
-    if (_json.containsKey("electionDay")) {
-      electionDay = _json["electionDay"];
-    }
-    if (_json.containsKey("id")) {
-      id = _json["id"];
-    }
-    if (_json.containsKey("name")) {
-      name = _json["name"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (electionDay != null) {
-      _json["electionDay"] = electionDay;
-    }
-    if (id != null) {
-      _json["id"] = id;
-    }
-    if (name != null) {
-      _json["name"] = name;
-    }
-    return _json;
-  }
-}
-
-
-/** Information about individual election officials. */
-class ElectionOfficial {
-  /** The email address of the election official. */
-  core.String emailAddress;
-
-  /** The fax number of the election official. */
-  core.String faxNumber;
-
-  /** The full name of the election official. */
-  core.String name;
-
-  /** The office phone number of the election official. */
-  core.String officePhoneNumber;
-
-  /** The title of the election official. */
-  core.String title;
-
-
-  ElectionOfficial();
-
-  ElectionOfficial.fromJson(core.Map _json) {
-    if (_json.containsKey("emailAddress")) {
-      emailAddress = _json["emailAddress"];
-    }
-    if (_json.containsKey("faxNumber")) {
-      faxNumber = _json["faxNumber"];
-    }
-    if (_json.containsKey("name")) {
-      name = _json["name"];
-    }
-    if (_json.containsKey("officePhoneNumber")) {
-      officePhoneNumber = _json["officePhoneNumber"];
-    }
-    if (_json.containsKey("title")) {
-      title = _json["title"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (emailAddress != null) {
-      _json["emailAddress"] = emailAddress;
-    }
-    if (faxNumber != null) {
-      _json["faxNumber"] = faxNumber;
-    }
-    if (name != null) {
-      _json["name"] = name;
-    }
-    if (officePhoneNumber != null) {
-      _json["officePhoneNumber"] = officePhoneNumber;
-    }
-    if (title != null) {
-      _json["title"] = title;
-    }
-    return _json;
-  }
-}
-
-
-/** The list of elections available for this version of the API. */
-class ElectionsQueryResponse {
-  /** A list of available elections */
-  core.List<Election> elections;
-
-  /**
-   * Identifies what kind of resource this is. Value: the fixed string
-   * "civicinfo#electionsQueryResponse".
-   */
-  core.String kind;
-
-
-  ElectionsQueryResponse();
-
-  ElectionsQueryResponse.fromJson(core.Map _json) {
-    if (_json.containsKey("elections")) {
-      elections = _json["elections"].map((value) => new Election.fromJson(value)).toList();
-    }
-    if (_json.containsKey("kind")) {
-      kind = _json["kind"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (elections != null) {
-      _json["elections"] = elections.map((value) => (value).toJson()).toList();
-    }
-    if (kind != null) {
-      _json["kind"] = kind;
-    }
-    return _json;
-  }
-}
-
-
-/** Describes the geographic scope of a contest. */
-class ElectoralDistrict {
-  /**
-   * An identifier for this district, relative to its scope. For example, the
-   * 34th State Senate district would have id "34" and a scope of stateUpper.
-   */
-  core.String id;
-
-  /** The name of the district. */
-  core.String name;
-
-  /**
-   * The geographic scope of this district. If unspecified the district's
-   * geography is not known. One of: national, statewide, congressional,
-   * stateUpper, stateLower, countywide, judicial, schoolBoard, cityWide,
-   * township, countyCouncil, cityCouncil, ward, special
-   */
-  core.String scope;
-
-
-  ElectoralDistrict();
-
-  ElectoralDistrict.fromJson(core.Map _json) {
-    if (_json.containsKey("id")) {
-      id = _json["id"];
-    }
-    if (_json.containsKey("name")) {
-      name = _json["name"];
-    }
-    if (_json.containsKey("scope")) {
-      scope = _json["scope"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (id != null) {
-      _json["id"] = id;
-    }
-    if (name != null) {
-      _json["name"] = name;
-    }
-    if (scope != null) {
-      _json["scope"] = scope;
-    }
-    return _json;
-  }
-}
-
-
-/** Describes a political geography. */
-class GeographicDivision {
-  /**
-   * Any other valid OCD IDs that refer to the same division.
-   *
-   * Because OCD IDs are meant to be human-readable and at least somewhat
-   * predictable, there are occasionally several identifiers for a single
-   * division. These identifiers are defined to be equivalent to one another,
-   * and one is always indicated as the primary identifier. The primary
-   * identifier will be returned in ocd_id above, and any other equivalent valid
-   * identifiers will be returned in this list.
-   *
-   * For example, if this division's OCD ID is
-   * ocd-division/country:us/district:dc, this will contain
-   * ocd-division/country:us/state:dc.
-   */
-  core.List<core.String> alsoKnownAs;
-
-  /** The name of the division. */
-  core.String name;
-
-  /**
-   * List of keys in the offices object, one for each office elected from this
-   * division. Will only be present if includeOffices was true (or absent) in
-   * the request.
-   */
-  core.List<core.String> officeIds;
-
-  /**
-   * The geographic scope of the division. If unspecified, the division's
-   * geography is not known. One of: national, statewide, congressional,
-   * stateUpper, stateLower, countywide, judicial, schoolBoard, cityWide,
-   * township, countyCouncil, cityCouncil, ward, special
-   */
-  core.String scope;
-
-
-  GeographicDivision();
-
-  GeographicDivision.fromJson(core.Map _json) {
-    if (_json.containsKey("alsoKnownAs")) {
-      alsoKnownAs = _json["alsoKnownAs"];
-    }
-    if (_json.containsKey("name")) {
-      name = _json["name"];
-    }
-    if (_json.containsKey("officeIds")) {
-      officeIds = _json["officeIds"];
-    }
-    if (_json.containsKey("scope")) {
-      scope = _json["scope"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (alsoKnownAs != null) {
-      _json["alsoKnownAs"] = alsoKnownAs;
-    }
-    if (name != null) {
-      _json["name"] = name;
-    }
-    if (officeIds != null) {
-      _json["officeIds"] = officeIds;
-    }
-    if (scope != null) {
-      _json["scope"] = scope;
-    }
-    return _json;
-  }
-}
-
-
-/** Information about an Office held by one or more Officials. */
-class Office {
-  /** The OCD ID of the division with which this office is associated. */
-  core.String divisionId;
-
-  /**
-   * The level of this elected office. One of: federal, state, county, city,
-   * other
-   */
-  core.String level;
-
-  /** The human-readable name of the office. */
-  core.String name;
-
-  /**
-   * List of keys in the officials object of people who presently hold this
-   * office.
-   */
-  core.List<core.String> officialIds;
-
-  /**
-   * A list of sources for this office. If multiple sources are listed, the data
-   * has been aggregated from those sources.
-   */
-  core.List<Source> sources;
-
-
-  Office();
-
-  Office.fromJson(core.Map _json) {
-    if (_json.containsKey("divisionId")) {
-      divisionId = _json["divisionId"];
-    }
-    if (_json.containsKey("level")) {
-      level = _json["level"];
-    }
-    if (_json.containsKey("name")) {
-      name = _json["name"];
-    }
-    if (_json.containsKey("officialIds")) {
-      officialIds = _json["officialIds"];
-    }
-    if (_json.containsKey("sources")) {
-      sources = _json["sources"].map((value) => new Source.fromJson(value)).toList();
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (divisionId != null) {
-      _json["divisionId"] = divisionId;
-    }
-    if (level != null) {
-      _json["level"] = level;
-    }
-    if (name != null) {
-      _json["name"] = name;
-    }
-    if (officialIds != null) {
-      _json["officialIds"] = officialIds;
-    }
-    if (sources != null) {
-      _json["sources"] = sources.map((value) => (value).toJson()).toList();
-    }
-    return _json;
-  }
-}
-
-
-/** Information about a person holding an elected office. */
-class Official {
-  /** Addresses at which to contact the official. */
-  core.List<SimpleAddressType> address;
-
-  /** A list of known (social) media channels for this official. */
-  core.List<Channel> channels;
-
-  /** The direct email addresses for the official. */
-  core.List<core.String> emails;
-
-  /** The official's name. */
-  core.String name;
-
-  /** The full name of the party the official belongs to. */
-  core.String party;
-
-  /** The official's public contact phone numbers. */
-  core.List<core.String> phones;
-
-  /** A URL for a photo of the official. */
-  core.String photoUrl;
-
-  /** The official's public website URLs. */
-  core.List<core.String> urls;
-
-
-  Official();
-
-  Official.fromJson(core.Map _json) {
-    if (_json.containsKey("address")) {
-      address = _json["address"].map((value) => new SimpleAddressType.fromJson(value)).toList();
-    }
-    if (_json.containsKey("channels")) {
-      channels = _json["channels"].map((value) => new Channel.fromJson(value)).toList();
-    }
-    if (_json.containsKey("emails")) {
-      emails = _json["emails"];
-    }
-    if (_json.containsKey("name")) {
-      name = _json["name"];
-    }
-    if (_json.containsKey("party")) {
-      party = _json["party"];
-    }
-    if (_json.containsKey("phones")) {
-      phones = _json["phones"];
-    }
-    if (_json.containsKey("photoUrl")) {
-      photoUrl = _json["photoUrl"];
-    }
-    if (_json.containsKey("urls")) {
-      urls = _json["urls"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (address != null) {
-      _json["address"] = address.map((value) => (value).toJson()).toList();
-    }
-    if (channels != null) {
-      _json["channels"] = channels.map((value) => (value).toJson()).toList();
-    }
-    if (emails != null) {
-      _json["emails"] = emails;
-    }
-    if (name != null) {
-      _json["name"] = name;
-    }
-    if (party != null) {
-      _json["party"] = party;
-    }
-    if (phones != null) {
-      _json["phones"] = phones;
-    }
-    if (photoUrl != null) {
-      _json["photoUrl"] = photoUrl;
-    }
-    if (urls != null) {
-      _json["urls"] = urls;
-    }
-    return _json;
-  }
-}
-
-
-/**
- * A location where a voter can vote. This may be an early vote site, an
- * election day voting location, or a drop off location for a completed ballot.
- */
-class PollingLocation {
-  /** The address of the location. */
-  SimpleAddressType address;
-
-  /**
-   * The last date that this early vote site or drop off location may be used.
-   * This field is not populated for polling locations.
-   */
-  core.String endDate;
-
-  /**
-   * An ID for this object. IDs may change in future requests and should not be
-   * cached. Access to this field requires special access that can be requested
-   * from the Request more link on the Quotas page.
-   */
-  core.String id;
-
-  /**
-   * The name of the early vote site or drop off location. This field is not
-   * populated for polling locations.
-   */
-  core.String name;
-
-  /**
-   * Notes about this location (e.g. accessibility ramp or entrance to use).
-   */
-  core.String notes;
-
-  /** A description of when this location is open. */
-  core.String pollingHours;
-
-  /**
-   * A list of sources for this location. If multiple sources are listed the
-   * data has been aggregated from those sources.
-   */
-  core.List<Source> sources;
-
-  /**
-   * The first date that this early vote site or drop off location may be used.
-   * This field is not populated for polling locations.
-   */
-  core.String startDate;
-
-  /**
-   * The services provided by this early vote site or drop off location. This
-   * field is not populated for polling locations.
-   */
-  core.String voterServices;
-
-
-  PollingLocation();
-
-  PollingLocation.fromJson(core.Map _json) {
-    if (_json.containsKey("address")) {
-      address = new SimpleAddressType.fromJson(_json["address"]);
-    }
-    if (_json.containsKey("endDate")) {
-      endDate = _json["endDate"];
-    }
-    if (_json.containsKey("id")) {
-      id = _json["id"];
-    }
-    if (_json.containsKey("name")) {
-      name = _json["name"];
-    }
-    if (_json.containsKey("notes")) {
-      notes = _json["notes"];
-    }
-    if (_json.containsKey("pollingHours")) {
-      pollingHours = _json["pollingHours"];
-    }
-    if (_json.containsKey("sources")) {
-      sources = _json["sources"].map((value) => new Source.fromJson(value)).toList();
-    }
-    if (_json.containsKey("startDate")) {
-      startDate = _json["startDate"];
-    }
-    if (_json.containsKey("voterServices")) {
-      voterServices = _json["voterServices"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (address != null) {
-      _json["address"] = (address).toJson();
-    }
-    if (endDate != null) {
-      _json["endDate"] = endDate;
-    }
-    if (id != null) {
-      _json["id"] = id;
-    }
-    if (name != null) {
-      _json["name"] = name;
-    }
-    if (notes != null) {
-      _json["notes"] = notes;
-    }
-    if (pollingHours != null) {
-      _json["pollingHours"] = pollingHours;
-    }
-    if (sources != null) {
-      _json["sources"] = sources.map((value) => (value).toJson()).toList();
-    }
-    if (startDate != null) {
-      _json["startDate"] = startDate;
-    }
-    if (voterServices != null) {
-      _json["voterServices"] = voterServices;
-    }
-    return _json;
-  }
-}
-
-
-/**
- * A request for political geography and representative information for an
- * address.
- */
-class RepresentativeInfoRequest {
-  /**
-   * The address to look up. May only be specified if the field ocdId is not
-   * given in the URL.
-   */
-  core.String address;
-
-
-  RepresentativeInfoRequest();
-
-  RepresentativeInfoRequest.fromJson(core.Map _json) {
-    if (_json.containsKey("address")) {
-      address = _json["address"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (address != null) {
-      _json["address"] = address;
-    }
-    return _json;
-  }
-}
-
-
-/** The result of a representative info lookup query. */
-class RepresentativeInfoResponse {
-  /** Political geographic divisions that contain the requested address. */
-  core.Map<core.String, GeographicDivision> divisions;
-
-  /**
-   * Identifies what kind of resource this is. Value: the fixed string
-   * "civicinfo#representativeInfoResponse".
-   */
-  core.String kind;
-
-  /** The normalized version of the requested address */
-  SimpleAddressType normalizedInput;
-
-  /**
-   * Elected offices referenced by the divisions listed above. Will only be
-   * present if includeOffices was true in the request.
-   */
-  core.Map<core.String, Office> offices;
-
-  /**
-   * Officials holding the offices listed above. Will only be present if
-   * includeOffices was true in the request.
-   */
-  core.Map<core.String, Official> officials;
-
-  /**
-   * The result of the request. One of: success, noStreetSegmentFound,
-   * addressUnparseable, noAddressParameter, multipleStreetSegmentsFound,
-   * electionOver, electionUnknown, internalLookupFailure,
-   * RequestedBothAddressAndOcdId
-   */
-  core.String status;
-
-
-  RepresentativeInfoResponse();
-
-  RepresentativeInfoResponse.fromJson(core.Map _json) {
-    if (_json.containsKey("divisions")) {
-      divisions = common_internal.mapMap(_json["divisions"], (item) => new GeographicDivision.fromJson(item));
-    }
-    if (_json.containsKey("kind")) {
-      kind = _json["kind"];
-    }
-    if (_json.containsKey("normalizedInput")) {
-      normalizedInput = new SimpleAddressType.fromJson(_json["normalizedInput"]);
-    }
-    if (_json.containsKey("offices")) {
-      offices = common_internal.mapMap(_json["offices"], (item) => new Office.fromJson(item));
-    }
-    if (_json.containsKey("officials")) {
-      officials = common_internal.mapMap(_json["officials"], (item) => new Official.fromJson(item));
-    }
-    if (_json.containsKey("status")) {
-      status = _json["status"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (divisions != null) {
-      _json["divisions"] = common_internal.mapMap(divisions, (item) => (item).toJson());
-    }
-    if (kind != null) {
-      _json["kind"] = kind;
-    }
-    if (normalizedInput != null) {
-      _json["normalizedInput"] = (normalizedInput).toJson();
-    }
-    if (offices != null) {
-      _json["offices"] = common_internal.mapMap(offices, (item) => (item).toJson());
-    }
-    if (officials != null) {
-      _json["officials"] = common_internal.mapMap(officials, (item) => (item).toJson());
-    }
-    if (status != null) {
-      _json["status"] = status;
-    }
-    return _json;
-  }
-}
-
-
-/** A simple representation of an address. */
-class SimpleAddressType {
-  /** The city or town for the address. */
-  core.String city;
-
-  /** The street name and number of this address. */
-  core.String line1;
-
-  /** The second line the address, if needed. */
-  core.String line2;
-
-  /** The third line of the address, if needed. */
-  core.String line3;
-
-  /** The name of the location. */
-  core.String locationName;
-
-  /** The US two letter state abbreviation of the address. */
-  core.String state;
-
-  /** The US Postal Zip Code of the address. */
-  core.String zip;
-
-
-  SimpleAddressType();
-
-  SimpleAddressType.fromJson(core.Map _json) {
-    if (_json.containsKey("city")) {
-      city = _json["city"];
-    }
-    if (_json.containsKey("line1")) {
-      line1 = _json["line1"];
-    }
-    if (_json.containsKey("line2")) {
-      line2 = _json["line2"];
-    }
-    if (_json.containsKey("line3")) {
-      line3 = _json["line3"];
-    }
-    if (_json.containsKey("locationName")) {
-      locationName = _json["locationName"];
-    }
-    if (_json.containsKey("state")) {
-      state = _json["state"];
-    }
-    if (_json.containsKey("zip")) {
-      zip = _json["zip"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (city != null) {
-      _json["city"] = city;
-    }
-    if (line1 != null) {
-      _json["line1"] = line1;
-    }
-    if (line2 != null) {
-      _json["line2"] = line2;
-    }
-    if (line3 != null) {
-      _json["line3"] = line3;
-    }
-    if (locationName != null) {
-      _json["locationName"] = locationName;
-    }
-    if (state != null) {
-      _json["state"] = state;
-    }
-    if (zip != null) {
-      _json["zip"] = zip;
-    }
-    return _json;
-  }
-}
-
-
-/**
- * Contains information about the data source for the element containing it.
- */
-class Source {
-  /** The name of the data source. */
-  core.String name;
-
-  /** Whether this data comes from an official government source. */
-  core.bool official;
-
-
-  Source();
-
-  Source.fromJson(core.Map _json) {
-    if (_json.containsKey("name")) {
-      name = _json["name"];
-    }
-    if (_json.containsKey("official")) {
-      official = _json["official"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (name != null) {
-      _json["name"] = name;
-    }
-    if (official != null) {
-      _json["official"] = official;
-    }
-    return _json;
-  }
-}
-
-
-/** A request for information about a voter. */
-class VoterInfoRequest {
-  /** The registered address of the voter to look up. */
-  core.String address;
-
-
-  VoterInfoRequest();
-
-  VoterInfoRequest.fromJson(core.Map _json) {
-    if (_json.containsKey("address")) {
-      address = _json["address"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (address != null) {
-      _json["address"] = address;
-    }
-    return _json;
-  }
-}
-
-
-/** The result of a voter info lookup query. */
-class VoterInfoResponse {
-  /** Contests that will appear on the voter's ballot. */
-  core.List<Contest> contests;
-
-  /**
-   * Locations where a voter is eligible to drop off a completed ballot. The
-   * voter must have received and completed a ballot prior to arriving at the
-   * location. The location may not have ballots available on the premises.
-   * These locations could be open on or before election day as indicated in the
-   * pollingHours field.
-   */
-  core.List<PollingLocation> dropOffLocations;
-
-  /**
-   * Locations where the voter is eligible to vote early, prior to election day.
-   */
-  core.List<PollingLocation> earlyVoteSites;
-
-  /** The election that was queried. */
-  Election election;
-
-  /**
-   * Identifies what kind of resource this is. Value: the fixed string
-   * "civicinfo#voterInfoResponse".
-   */
-  core.String kind;
-
-  /** The normalized version of the requested address */
-  SimpleAddressType normalizedInput;
-
-  /** Locations where the voter is eligible to vote on election day. */
-  core.List<PollingLocation> pollingLocations;
-
-  /** Not documented yet. */
-  core.String precinctId;
-
-  /**
-   * Local Election Information for the state that the voter votes in. For the
-   * US, there will only be one element in this array.
-   */
-  core.List<AdministrationRegion> state;
-
-  /**
-   * The result of the request. One of: success, noStreetSegmentFound,
-   * addressUnparseable, noAddressParameter, multipleStreetSegmentsFound,
-   * electionOver, electionUnknown, internalLookupFailure
-   */
-  core.String status;
-
-
-  VoterInfoResponse();
-
-  VoterInfoResponse.fromJson(core.Map _json) {
-    if (_json.containsKey("contests")) {
-      contests = _json["contests"].map((value) => new Contest.fromJson(value)).toList();
-    }
-    if (_json.containsKey("dropOffLocations")) {
-      dropOffLocations = _json["dropOffLocations"].map((value) => new PollingLocation.fromJson(value)).toList();
-    }
-    if (_json.containsKey("earlyVoteSites")) {
-      earlyVoteSites = _json["earlyVoteSites"].map((value) => new PollingLocation.fromJson(value)).toList();
-    }
-    if (_json.containsKey("election")) {
-      election = new Election.fromJson(_json["election"]);
-    }
-    if (_json.containsKey("kind")) {
-      kind = _json["kind"];
-    }
-    if (_json.containsKey("normalizedInput")) {
-      normalizedInput = new SimpleAddressType.fromJson(_json["normalizedInput"]);
-    }
-    if (_json.containsKey("pollingLocations")) {
-      pollingLocations = _json["pollingLocations"].map((value) => new PollingLocation.fromJson(value)).toList();
-    }
-    if (_json.containsKey("precinctId")) {
-      precinctId = _json["precinctId"];
-    }
-    if (_json.containsKey("state")) {
-      state = _json["state"].map((value) => new AdministrationRegion.fromJson(value)).toList();
-    }
-    if (_json.containsKey("status")) {
-      status = _json["status"];
-    }
-  }
-
-  core.Map toJson() {
-    var _json = new core.Map();
-    if (contests != null) {
-      _json["contests"] = contests.map((value) => (value).toJson()).toList();
-    }
-    if (dropOffLocations != null) {
-      _json["dropOffLocations"] = dropOffLocations.map((value) => (value).toJson()).toList();
-    }
-    if (earlyVoteSites != null) {
-      _json["earlyVoteSites"] = earlyVoteSites.map((value) => (value).toJson()).toList();
-    }
-    if (election != null) {
-      _json["election"] = (election).toJson();
-    }
-    if (kind != null) {
-      _json["kind"] = kind;
-    }
-    if (normalizedInput != null) {
-      _json["normalizedInput"] = (normalizedInput).toJson();
-    }
-    if (pollingLocations != null) {
-      _json["pollingLocations"] = pollingLocations.map((value) => (value).toJson()).toList();
-    }
-    if (precinctId != null) {
-      _json["precinctId"] = precinctId;
-    }
-    if (state != null) {
-      _json["state"] = state.map((value) => (value).toJson()).toList();
-    }
-    if (status != null) {
-      _json["status"] = status;
-    }
-    return _json;
-  }
-}
-
-
diff --git a/generated/googleapis/lib/civicinfo/v2.dart b/generated/googleapis/lib/civicinfo/v2.dart
index 7cd7ff3..5fb6424 100644
--- a/generated/googleapis/lib/civicinfo/v2.dart
+++ b/generated/googleapis/lib/civicinfo/v2.dart
@@ -1,37 +1,39 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.civicinfo.v2;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client civicinfo/v2';
 
 /** An API for accessing civic information. */
 class CivicinfoApi {
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   DivisionsResourceApi get divisions => new DivisionsResourceApi(_requester);
   ElectionsResourceApi get elections => new ElectionsResourceApi(_requester);
   RepresentativesResourceApi get representatives => new RepresentativesResourceApi(_requester);
 
   CivicinfoApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "civicinfo/v2/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class DivisionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  DivisionsResourceApi(common_internal.ApiRequester client) : 
+  DivisionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -47,7 +49,7 @@
    *
    * Completes with a [DivisionSearchResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -58,7 +60,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (query != null) {
@@ -81,11 +83,10 @@
 }
 
 
-/** Not documented yet. */
 class ElectionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ElectionsResourceApi(common_internal.ApiRequester client) : 
+  ElectionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -95,7 +96,7 @@
    *
    * Completes with a [ElectionsQueryResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -106,7 +107,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -140,7 +141,7 @@
    *
    * Completes with a [VoterInfoResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -151,7 +152,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (address == null) {
@@ -181,11 +182,10 @@
 }
 
 
-/** Not documented yet. */
 class RepresentativesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  RepresentativesResourceApi(common_internal.ApiRequester client) : 
+  RepresentativesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -211,7 +211,7 @@
    *
    * Completes with a [RepresentativeInfoResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -222,7 +222,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (address != null) {
@@ -274,7 +274,7 @@
    *
    * Completes with a [RepresentativeInfoData].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -285,7 +285,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (ocdId == null) {
@@ -302,7 +302,7 @@
     }
 
 
-    _url = 'representatives/' + common_internal.Escaper.ecapeVariable('$ocdId');
+    _url = 'representatives/' + commons.Escaper.ecapeVariable('$ocdId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -879,7 +879,6 @@
    */
   core.String kind;
 
-  /** Not documented yet. */
   core.List<DivisionSearchResult> results;
 
 
@@ -1498,7 +1497,6 @@
 }
 
 
-/** Not documented yet. */
 class RepresentativeInfoData {
   /** Political geographic divisions that contain the requested address. */
   core.Map<core.String, GeographicDivision> divisions;
@@ -1520,7 +1518,7 @@
 
   RepresentativeInfoData.fromJson(core.Map _json) {
     if (_json.containsKey("divisions")) {
-      divisions = common_internal.mapMap(_json["divisions"], (item) => new GeographicDivision.fromJson(item));
+      divisions = commons.mapMap(_json["divisions"], (item) => new GeographicDivision.fromJson(item));
     }
     if (_json.containsKey("offices")) {
       offices = _json["offices"].map((value) => new Office.fromJson(value)).toList();
@@ -1533,7 +1531,7 @@
   core.Map toJson() {
     var _json = new core.Map();
     if (divisions != null) {
-      _json["divisions"] = common_internal.mapMap(divisions, (item) => (item).toJson());
+      _json["divisions"] = commons.mapMap(divisions, (item) => (item).toJson());
     }
     if (offices != null) {
       _json["offices"] = offices.map((value) => (value).toJson()).toList();
@@ -1577,7 +1575,7 @@
 
   RepresentativeInfoResponse.fromJson(core.Map _json) {
     if (_json.containsKey("divisions")) {
-      divisions = common_internal.mapMap(_json["divisions"], (item) => new GeographicDivision.fromJson(item));
+      divisions = commons.mapMap(_json["divisions"], (item) => new GeographicDivision.fromJson(item));
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -1596,7 +1594,7 @@
   core.Map toJson() {
     var _json = new core.Map();
     if (divisions != null) {
-      _json["divisions"] = common_internal.mapMap(divisions, (item) => (item).toJson());
+      _json["divisions"] = commons.mapMap(divisions, (item) => (item).toJson());
     }
     if (kind != null) {
       _json["kind"] = kind;
@@ -1769,7 +1767,6 @@
   /** Locations where the voter is eligible to vote on election day. */
   core.List<PollingLocation> pollingLocations;
 
-  /** Not documented yet. */
   core.String precinctId;
 
   /**
@@ -1849,5 +1846,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/cloudsearch/v1.dart b/generated/googleapis/lib/cloudsearch/v1.dart
new file mode 100644
index 0000000..9c1d1b1
--- /dev/null
+++ b/generated/googleapis/lib/cloudsearch/v1.dart
@@ -0,0 +1,994 @@
+// This is a generated file (see the discoveryapis_generator project).
+
+library googleapis.cloudsearch.v1;
+
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
+
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
+import 'package:http/http.dart' as http;
+
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client cloudsearch/v1';
+
+/**
+ * The Google Cloud Search API defines an application interface to index
+ * documents that contain structured data and to search those indexes. It
+ * supports full text search.
+ */
+class CloudsearchApi {
+  /** View and manage your data across Google Cloud Platform services */
+  static const CloudPlatformScope = "https://www.googleapis.com/auth/cloud-platform";
+
+  /** FOR TESTING ONLY */
+  static const CloudsearchScope = "https://www.googleapis.com/auth/cloudsearch";
+
+  /** View your email address */
+  static const UserinfoEmailScope = "https://www.googleapis.com/auth/userinfo.email";
+
+
+  final commons.ApiRequester _requester;
+
+  ProjectsResourceApi get projects => new ProjectsResourceApi(_requester);
+
+  CloudsearchApi(http.Client client, {core.String rootUrl: "https://cloudsearch.googleapis.com/", core.String servicePath: ""}) :
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
+}
+
+
+class ProjectsResourceApi {
+  final commons.ApiRequester _requester;
+
+  ProjectsIndexesResourceApi get indexes => new ProjectsIndexesResourceApi(_requester);
+
+  ProjectsResourceApi(commons.ApiRequester client) : 
+      _requester = client;
+}
+
+
+class ProjectsIndexesResourceApi {
+  final commons.ApiRequester _requester;
+
+  ProjectsIndexesDocumentsResourceApi get documents => new ProjectsIndexesDocumentsResourceApi(_requester);
+
+  ProjectsIndexesResourceApi(commons.ApiRequester client) : 
+      _requester = client;
+
+  /**
+   * Lists search indexes belonging to the specified project.
+   *
+   * Request parameters:
+   *
+   * [projectId] - The project from which to retrieve indexes. It cannot be the
+   * empty string.
+   *
+   * [indexNamePrefix] - The prefix of the index name. It is used to list all
+   * indexes with names that have this prefix.
+   *
+   * [pageSize] - The maximum number of indexes to return per page. If not
+   * specified, 100 indexes are returned per page.
+   *
+   * [pageToken] - A `nextPageToken` returned from previous list indexes call as
+   * the starting point for this call. If not specified, list indexes from the
+   * beginning.
+   *
+   * [view] - Specifies which parts of the IndexInfo resource is returned in the
+   * response. If not specified, `ID_ONLY` is used.
+   * Possible string values are:
+   * - "INDEX_VIEW_UNSPECIFIED" : A INDEX_VIEW_UNSPECIFIED.
+   * - "ID_ONLY" : A ID_ONLY.
+   * - "FULL" : A FULL.
+   *
+   * Completes with a [ListIndexesResponse].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<ListIndexesResponse> list(core.String projectId, {core.String indexNamePrefix, core.int pageSize, core.String pageToken, core.String view}) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (projectId == null) {
+      throw new core.ArgumentError("Parameter projectId is required.");
+    }
+    if (indexNamePrefix != null) {
+      _queryParams["indexNamePrefix"] = [indexNamePrefix];
+    }
+    if (pageSize != null) {
+      _queryParams["pageSize"] = ["${pageSize}"];
+    }
+    if (pageToken != null) {
+      _queryParams["pageToken"] = [pageToken];
+    }
+    if (view != null) {
+      _queryParams["view"] = [view];
+    }
+
+
+    _url = 'v1/projects/' + commons.Escaper.ecapeVariable('$projectId') + '/indexes';
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new ListIndexesResponse.fromJson(data));
+  }
+
+  /**
+   * Lists the documents in the named index that match the query.
+   *
+   * Request parameters:
+   *
+   * [projectId] - The project associated with the index for searching document.
+   * It cannot be the empty string.
+   *
+   * [indexId] - The index to search. It cannot be the empty string.
+   *
+   * [query] - The query string in search query syntax. If the query is missing
+   * or empty, all documents are returned.
+   *
+   * [fieldExpressions] - Customized expressions used in `orderBy` or
+   * `returnFields`. The expression can contain fields in `Document`, the
+   * built-in fields ( `_rank`, the document rank, and `_score` if scoring is
+   * enabled) and fields defined in `fieldExpressions`. Each field expression is
+   * represented in a json object with the following fields: * `name`: the name
+   * of the field expression in string. * `expression`: the expression to be
+   * computed. It can be a combination of supported functions encoded in string.
+   * Expressions involving number fields can use the arithmetical operators
+   * (`+`, `-`, `*`, `/`) and the built-in numeric functions (`max`, `min`,
+   * `pow`, `count`, `log`, `abs`). Expressions involving geopoint fields can
+   * use the `geopoint` and `distance` functions. Expressions for text and html
+   * fields can use the `snippet` function. For example: ```
+   * fieldExpressions={name: "TotalPrice", expression: "(Price+Tax)"} ``` ```
+   * fieldExpressions={name: "snippet", expression: "snippet('good times',
+   * content)"} ``` The field expression names can be used in `orderBy` and
+   * `returnFields` after they are defined in `fieldExpressions`.
+   *
+   * [pageSize] - The maximum number of search results to return per page.
+   * Searches perform best when the `pageSize` is kept as small as possible. If
+   * not specified, 10 results are returned per page.
+   *
+   * [pageToken] - A `nextPageToken` returned from previous Search call as the
+   * starting point for this call. Pagination tokens provide better performance
+   * and consistency than offsets, and they cannot be used in combination with
+   * offsets.
+   *
+   * [offset] - Offset is used to move to an arbitrary result, independent of
+   * the previous results. Offsets are inefficient when compared to `pageToken`.
+   * `pageToken` and `offset` cannot be both set. The default value of `offset`
+   * is 0.
+   *
+   * [matchedCountAccuracy] - Minimum accuracy requirement for `matchedCount` in
+   * search response. If specified, `matchedCount` will be accurate up to at
+   * least that number. For example, when set to 100, any `matchedCount <= 100`
+   * is accurate. This option may add considerable latency/expense. By default
+   * (when it is not specified or set to 0), the accuracy is the same as
+   * `pageSize`.
+   *
+   * [orderBy] - Comma-separated list of fields for sorting on the search
+   * result, including fields from `Document`, the built-in fields (`_rank` and
+   * `_score`), and fields defined in `fieldExpressions`. For example:
+   * `orderBy="foo,bar"`. The default sorting order is ascending. To specify
+   * descending order for a field, a suffix `" desc"` should be appended to the
+   * field name. For example: `orderBy="foo desc,bar"`. The default value for
+   * text sort is the empty string, and the default value for numeric sort is 0.
+   * If not specified, the search results are automatically sorted by descending
+   * `_rank`. Sorting by ascending `_rank` is not allowed.
+   *
+   * [scorer] - The scoring function to invoke on a search result for this
+   * query. If `scorer` is not set, scoring is disabled and `_score` is 0 for
+   * all documents in the search result. To enable document relevancy score
+   * based on term frequency, set `"scorer=generic"`.
+   *
+   * [scorerSize] - Maximum number of top retrieved results to score. It is
+   * valid only when `scorer` is set. If not specified, 100 retrieved results
+   * are scored.
+   *
+   * [returnFields] - List of fields to return in `SearchResult` objects. It can
+   * be fields from `Document`, the built-in fields `_rank` and `_score`, and
+   * fields defined in `fieldExpressions`. Use `"*"` to return all fields from
+   * `Document`.
+   *
+   * Completes with a [SearchResponse].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<SearchResponse> search(core.String projectId, core.String indexId, {core.String query, core.List<core.String> fieldExpressions, core.int pageSize, core.String pageToken, core.int offset, core.int matchedCountAccuracy, core.String orderBy, core.String scorer, core.int scorerSize, core.List<core.String> returnFields}) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (projectId == null) {
+      throw new core.ArgumentError("Parameter projectId is required.");
+    }
+    if (indexId == null) {
+      throw new core.ArgumentError("Parameter indexId is required.");
+    }
+    if (query != null) {
+      _queryParams["query"] = [query];
+    }
+    if (fieldExpressions != null) {
+      _queryParams["fieldExpressions"] = fieldExpressions;
+    }
+    if (pageSize != null) {
+      _queryParams["pageSize"] = ["${pageSize}"];
+    }
+    if (pageToken != null) {
+      _queryParams["pageToken"] = [pageToken];
+    }
+    if (offset != null) {
+      _queryParams["offset"] = ["${offset}"];
+    }
+    if (matchedCountAccuracy != null) {
+      _queryParams["matchedCountAccuracy"] = ["${matchedCountAccuracy}"];
+    }
+    if (orderBy != null) {
+      _queryParams["orderBy"] = [orderBy];
+    }
+    if (scorer != null) {
+      _queryParams["scorer"] = [scorer];
+    }
+    if (scorerSize != null) {
+      _queryParams["scorerSize"] = ["${scorerSize}"];
+    }
+    if (returnFields != null) {
+      _queryParams["returnFields"] = returnFields;
+    }
+
+
+    _url = 'v1/projects/' + commons.Escaper.ecapeVariable('$projectId') + '/indexes/' + commons.Escaper.ecapeVariable('$indexId') + '/search';
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new SearchResponse.fromJson(data));
+  }
+
+}
+
+
+class ProjectsIndexesDocumentsResourceApi {
+  final commons.ApiRequester _requester;
+
+  ProjectsIndexesDocumentsResourceApi(commons.ApiRequester client) : 
+      _requester = client;
+
+  /**
+   * Inserts a document for indexing or updates an indexed document. The
+   * returned document contains only the ID of the new document. When `docId` is
+   * absent from the document, it is provided by the server.
+   *
+   * [request] - The metadata request object.
+   *
+   * Request parameters:
+   *
+   * [projectId] - The project associated with the index for adding document. It
+   * cannot be the empty string.
+   *
+   * [indexId] - The index to add document to. It cannot be the empty string.
+   *
+   * Completes with a [Document].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Document> create(Document request, core.String projectId, core.String indexId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (request != null) {
+      _body = convert.JSON.encode((request).toJson());
+    }
+    if (projectId == null) {
+      throw new core.ArgumentError("Parameter projectId is required.");
+    }
+    if (indexId == null) {
+      throw new core.ArgumentError("Parameter indexId is required.");
+    }
+
+
+    _url = 'v1/projects/' + commons.Escaper.ecapeVariable('$projectId') + '/indexes/' + commons.Escaper.ecapeVariable('$indexId') + '/documents';
+
+    var _response = _requester.request(_url,
+                                       "POST",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Document.fromJson(data));
+  }
+
+  /**
+   * Deletes a document from an index.
+   *
+   * Request parameters:
+   *
+   * [projectId] - The project associated with the index for deleting document.
+   * It cannot be the empty string.
+   *
+   * [indexId] - The index from which to delete the document. It cannot be the
+   * empty string.
+   *
+   * [docId] - The document to be deleted. It cannot be the empty string.
+   *
+   * Completes with a [Empty].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Empty> delete(core.String projectId, core.String indexId, core.String docId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (projectId == null) {
+      throw new core.ArgumentError("Parameter projectId is required.");
+    }
+    if (indexId == null) {
+      throw new core.ArgumentError("Parameter indexId is required.");
+    }
+    if (docId == null) {
+      throw new core.ArgumentError("Parameter docId is required.");
+    }
+
+
+    _url = 'v1/projects/' + commons.Escaper.ecapeVariable('$projectId') + '/indexes/' + commons.Escaper.ecapeVariable('$indexId') + '/documents/' + commons.Escaper.ecapeVariable('$docId');
+
+    var _response = _requester.request(_url,
+                                       "DELETE",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Empty.fromJson(data));
+  }
+
+  /**
+   * Retrieves a document from an index.
+   *
+   * Request parameters:
+   *
+   * [projectId] - The project associated with the index for retrieving the
+   * document. It cannot be the empty string.
+   *
+   * [indexId] - The index from which to retrieve the document. It cannot be the
+   * empty string.
+   *
+   * [docId] - The identifier of the document to retrieve. It cannot be the
+   * empty string.
+   *
+   * Completes with a [Document].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Document> get(core.String projectId, core.String indexId, core.String docId) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (projectId == null) {
+      throw new core.ArgumentError("Parameter projectId is required.");
+    }
+    if (indexId == null) {
+      throw new core.ArgumentError("Parameter indexId is required.");
+    }
+    if (docId == null) {
+      throw new core.ArgumentError("Parameter docId is required.");
+    }
+
+
+    _url = 'v1/projects/' + commons.Escaper.ecapeVariable('$projectId') + '/indexes/' + commons.Escaper.ecapeVariable('$indexId') + '/documents/' + commons.Escaper.ecapeVariable('$docId');
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Document.fromJson(data));
+  }
+
+  /**
+   * Lists documents in the specified search index. Intended for batch
+   * processing.
+   *
+   * Request parameters:
+   *
+   * [projectId] - The project associated with the index for listing documents.
+   * It cannot be the empty string.
+   *
+   * [indexId] - The index from which to list the documents. It cannot be the
+   * empty string.
+   *
+   * [pageSize] - The maximum number of documents to return per page. If not
+   * specified, 100 documents are returned per page.
+   *
+   * [pageToken] - A `nextPageToken` returned from previous list documents call
+   * as the starting point for this call. If not specified, list documents from
+   * the beginning.
+   *
+   * [view] - Specifies which part of the document resource is returned in the
+   * response. If not specified, `ID_ONLY` is used.
+   * Possible string values are:
+   * - "DOCUMENT_VIEW_UNSPECIFIED" : A DOCUMENT_VIEW_UNSPECIFIED.
+   * - "ID_ONLY" : A ID_ONLY.
+   * - "FULL" : A FULL.
+   *
+   * Completes with a [ListDocumentsResponse].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<ListDocumentsResponse> list(core.String projectId, core.String indexId, {core.int pageSize, core.String pageToken, core.String view}) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (projectId == null) {
+      throw new core.ArgumentError("Parameter projectId is required.");
+    }
+    if (indexId == null) {
+      throw new core.ArgumentError("Parameter indexId is required.");
+    }
+    if (pageSize != null) {
+      _queryParams["pageSize"] = ["${pageSize}"];
+    }
+    if (pageToken != null) {
+      _queryParams["pageToken"] = [pageToken];
+    }
+    if (view != null) {
+      _queryParams["view"] = [view];
+    }
+
+
+    _url = 'v1/projects/' + commons.Escaper.ecapeVariable('$projectId') + '/indexes/' + commons.Escaper.ecapeVariable('$indexId') + '/documents';
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new ListDocumentsResponse.fromJson(data));
+  }
+
+}
+
+
+
+/** The message representing a document resource. */
+class Document {
+  /**
+   * The unique identifier of the document. It must contain only visible,
+   * printable ASCII characters (ASCII codes 33 through 126 inclusive) and be no
+   * longer than 500 characters. It cannot begin with an exclamation point
+   * ('!'), and it can't begin and end with double underscores ("__"). If
+   * missing, it is automatically assigned for the document.
+   */
+  core.String docId;
+
+  /**
+   * The list of fields in the document. It cannot be the empty list. Each field
+   * has a name and a list of values. The field name is unique to a document and
+   * is case sensitive. The name can only contain ASCII characters. It must
+   * start with a letter and can contain letters, digits, or underscore. It
+   * cannot be longer than 500 characters and cannot be the empty string. A
+   * field can have multiple values with same or different types, however, it
+   * cannot have multiple Timestamp or number values.
+   */
+  core.Map<core.String, FieldValueList> fields;
+
+  /**
+   * A positive integer which determines the default ordering of documents
+   * returned from a search. The rank can be set explicitly when the document is
+   * created. It is a bad idea to assign the same rank to many documents, and
+   * the same rank should never be assigned to more than 10,000 documents. By
+   * default (when it is not specified or set to 0), it is set at the time the
+   * document is created to the number of seconds since January 1, 2011. The
+   * rank can be used in field_expressions, order_by or return_fields in a
+   * search request, where it is referenced as `_rank`.
+   */
+  core.int rank;
+
+
+  Document();
+
+  Document.fromJson(core.Map _json) {
+    if (_json.containsKey("docId")) {
+      docId = _json["docId"];
+    }
+    if (_json.containsKey("fields")) {
+      fields = commons.mapMap(_json["fields"], (item) => new FieldValueList.fromJson(item));
+    }
+    if (_json.containsKey("rank")) {
+      rank = _json["rank"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (docId != null) {
+      _json["docId"] = docId;
+    }
+    if (fields != null) {
+      _json["fields"] = commons.mapMap(fields, (item) => (item).toJson());
+    }
+    if (rank != null) {
+      _json["rank"] = rank;
+    }
+    return _json;
+  }
+}
+
+
+/**
+ * A generic empty message that you can re-use to avoid defining duplicated
+ * empty messages in your APIs. A typical example is to use it as the request or
+ * the response type of an API method. For instance: service Foo { rpc
+ * Bar(google.protobuf.Empty) returns (google.protobuf.Empty); }
+ */
+class Empty {
+
+  Empty();
+
+  Empty.fromJson(core.Map _json) {
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    return _json;
+  }
+}
+
+
+/** Names of indexed fields. */
+class FieldNames {
+  /** The names of fields in which ATOM values are stored. */
+  core.List<core.String> atomFields;
+
+  /** The names of fields in which DATE values are stored. */
+  core.List<core.String> dateFields;
+
+  /** The names of fields in which GEO values are stored. */
+  core.List<core.String> geoFields;
+
+  /** The names of fields in which HTML values are stored. */
+  core.List<core.String> htmlFields;
+
+  /** The names of fields in which NUMBER values are stored. */
+  core.List<core.String> numberFields;
+
+  /** The names of fields in which TEXT values are stored. */
+  core.List<core.String> textFields;
+
+
+  FieldNames();
+
+  FieldNames.fromJson(core.Map _json) {
+    if (_json.containsKey("atomFields")) {
+      atomFields = _json["atomFields"];
+    }
+    if (_json.containsKey("dateFields")) {
+      dateFields = _json["dateFields"];
+    }
+    if (_json.containsKey("geoFields")) {
+      geoFields = _json["geoFields"];
+    }
+    if (_json.containsKey("htmlFields")) {
+      htmlFields = _json["htmlFields"];
+    }
+    if (_json.containsKey("numberFields")) {
+      numberFields = _json["numberFields"];
+    }
+    if (_json.containsKey("textFields")) {
+      textFields = _json["textFields"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (atomFields != null) {
+      _json["atomFields"] = atomFields;
+    }
+    if (dateFields != null) {
+      _json["dateFields"] = dateFields;
+    }
+    if (geoFields != null) {
+      _json["geoFields"] = geoFields;
+    }
+    if (htmlFields != null) {
+      _json["htmlFields"] = htmlFields;
+    }
+    if (numberFields != null) {
+      _json["numberFields"] = numberFields;
+    }
+    if (textFields != null) {
+      _json["textFields"] = textFields;
+    }
+    return _json;
+  }
+}
+
+
+/**
+ * The value of a document field and associated metadata. Exactly one of the
+ * value fields may be set.
+ */
+class FieldValue {
+  /**
+   * The value of a GEO-valued field, represented in string with any of the
+   * listed [ways of writing
+   * coordinates](http://en.wikipedia.org/wiki/Geographic_coordinate_conversion#Ways_of_writing_coordinates)
+   */
+  core.String geoValue;
+
+  /**
+   * The language of a string value. If given, the language must be a valid `ISO
+   * 639-1` code.
+   */
+  core.String lang;
+
+  /** The value of a number-valued field. */
+  core.double numberValue;
+
+  /**
+   * The format of a string value. By default, the string format is `DEFAULT`,
+   * where a format will be automatically detected.
+   * Possible string values are:
+   * - "DEFAULT" : A DEFAULT.
+   * - "ATOM" : A ATOM.
+   * - "TEXT" : A TEXT.
+   * - "HTML" : A HTML.
+   */
+  core.String stringFormat;
+
+  /** The value of a string-valued field. */
+  core.String stringValue;
+
+  /** The value of a timestamp-valued field. */
+  core.String timestampValue;
+
+
+  FieldValue();
+
+  FieldValue.fromJson(core.Map _json) {
+    if (_json.containsKey("geoValue")) {
+      geoValue = _json["geoValue"];
+    }
+    if (_json.containsKey("lang")) {
+      lang = _json["lang"];
+    }
+    if (_json.containsKey("numberValue")) {
+      numberValue = _json["numberValue"];
+    }
+    if (_json.containsKey("stringFormat")) {
+      stringFormat = _json["stringFormat"];
+    }
+    if (_json.containsKey("stringValue")) {
+      stringValue = _json["stringValue"];
+    }
+    if (_json.containsKey("timestampValue")) {
+      timestampValue = _json["timestampValue"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (geoValue != null) {
+      _json["geoValue"] = geoValue;
+    }
+    if (lang != null) {
+      _json["lang"] = lang;
+    }
+    if (numberValue != null) {
+      _json["numberValue"] = numberValue;
+    }
+    if (stringFormat != null) {
+      _json["stringFormat"] = stringFormat;
+    }
+    if (stringValue != null) {
+      _json["stringValue"] = stringValue;
+    }
+    if (timestampValue != null) {
+      _json["timestampValue"] = timestampValue;
+    }
+    return _json;
+  }
+}
+
+
+/** The values of a document field under the same field name. */
+class FieldValueList {
+  /** The list of typed values. */
+  core.List<FieldValue> values;
+
+
+  FieldValueList();
+
+  FieldValueList.fromJson(core.Map _json) {
+    if (_json.containsKey("values")) {
+      values = _json["values"].map((value) => new FieldValue.fromJson(value)).toList();
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (values != null) {
+      _json["values"] = values.map((value) => (value).toJson()).toList();
+    }
+    return _json;
+  }
+}
+
+
+/** Information about an index. */
+class IndexInfo {
+  /**
+   * The index identifier. It cannot be the empty string. It must contain only
+   * visible, printable ASCII characters (ASCII codes 33 through 126 inclusive)
+   * and be no longer than 100 characters. It cannot begin with an exclamation
+   * point ('!'), and it can't begin and end with double underscores ("__").
+   */
+  core.String indexId;
+
+  /** Names of indexed fields. */
+  FieldNames indexedField;
+
+  /** The project associated with the index. It cannot be the empty string. */
+  core.String projectId;
+
+
+  IndexInfo();
+
+  IndexInfo.fromJson(core.Map _json) {
+    if (_json.containsKey("indexId")) {
+      indexId = _json["indexId"];
+    }
+    if (_json.containsKey("indexedField")) {
+      indexedField = new FieldNames.fromJson(_json["indexedField"]);
+    }
+    if (_json.containsKey("projectId")) {
+      projectId = _json["projectId"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (indexId != null) {
+      _json["indexId"] = indexId;
+    }
+    if (indexedField != null) {
+      _json["indexedField"] = (indexedField).toJson();
+    }
+    if (projectId != null) {
+      _json["projectId"] = projectId;
+    }
+    return _json;
+  }
+}
+
+
+/** A response returned from a listing documents request. */
+class ListDocumentsResponse {
+  /** The list of documents. */
+  core.List<Document> documents;
+
+  /**
+   * If there are more results, retrieve them by invoking list documents call
+   * with the same arguments and this `nextPageToken`. If there are no more
+   * results, this field is not set.
+   */
+  core.String nextPageToken;
+
+
+  ListDocumentsResponse();
+
+  ListDocumentsResponse.fromJson(core.Map _json) {
+    if (_json.containsKey("documents")) {
+      documents = _json["documents"].map((value) => new Document.fromJson(value)).toList();
+    }
+    if (_json.containsKey("nextPageToken")) {
+      nextPageToken = _json["nextPageToken"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (documents != null) {
+      _json["documents"] = documents.map((value) => (value).toJson()).toList();
+    }
+    if (nextPageToken != null) {
+      _json["nextPageToken"] = nextPageToken;
+    }
+    return _json;
+  }
+}
+
+
+/** A response returned from a listing indexes request. */
+class ListIndexesResponse {
+  /** The information about available indexes. */
+  core.List<IndexInfo> indexes;
+
+  /**
+   * If there are more results, retrieve them by invoking list indexes call with
+   * the same arguments and this `nextPageToken`. If there are no more results,
+   * this field is not set.
+   */
+  core.String nextPageToken;
+
+
+  ListIndexesResponse();
+
+  ListIndexesResponse.fromJson(core.Map _json) {
+    if (_json.containsKey("indexes")) {
+      indexes = _json["indexes"].map((value) => new IndexInfo.fromJson(value)).toList();
+    }
+    if (_json.containsKey("nextPageToken")) {
+      nextPageToken = _json["nextPageToken"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (indexes != null) {
+      _json["indexes"] = indexes.map((value) => (value).toJson()).toList();
+    }
+    if (nextPageToken != null) {
+      _json["nextPageToken"] = nextPageToken;
+    }
+    return _json;
+  }
+}
+
+
+/** A response returned from a search request. */
+class SearchResponse {
+  /**
+   * The number of documents that match the query. It is greater than or equal
+   * to the number of documents actually returned. This is an approximation and
+   * not an exact count unless it is less than or equal to
+   * `matchedCountAccuracy` in search parameter.
+   */
+  core.String matchedCount;
+
+  /** The list of documents that match the search query. */
+  core.List<SearchResult> results;
+
+
+  SearchResponse();
+
+  SearchResponse.fromJson(core.Map _json) {
+    if (_json.containsKey("matchedCount")) {
+      matchedCount = _json["matchedCount"];
+    }
+    if (_json.containsKey("results")) {
+      results = _json["results"].map((value) => new SearchResult.fromJson(value)).toList();
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (matchedCount != null) {
+      _json["matchedCount"] = matchedCount;
+    }
+    if (results != null) {
+      _json["results"] = results.map((value) => (value).toJson()).toList();
+    }
+    return _json;
+  }
+}
+
+
+/** A document returned in a SearchResponse. */
+class SearchResult {
+  /** The unique identifier of the document. */
+  core.String docId;
+
+  /**
+   * The list of fields in the result. Each field is either from the stored
+   * document, the built-in fields (`_rank`, the document rank, and `_score` if
+   * scoring is enabled), or computed from any extra `fieldExpressions` defined
+   * in the request. For example, if a request contains a `fieldExpressions`
+   * named `"TotalPrice"` and expressed as `"Price + Tax"`, the result will have
+   * a field whose name is `"TotalPrice"` and whose value is set to the computed
+   * sum of the value of field `"Price"` and the value of field `"Tax"`. If a
+   * request contains a `fieldExpressions` named `"snippet"` and expressed as
+   * `"snippet(\"good times\", content)"`, the result will have a field whose
+   * name is `"snippet"` and whose value contains a snippet of text from field
+   * `"content"` matching the query "good times".
+   */
+  core.Map<core.String, FieldValueList> fields;
+
+  /**
+   * If there are more results, retrieve them by invoking search call with the
+   * same arguments and this `nextPageToken`. If there are no more results, this
+   * field is not set.
+   */
+  core.String nextPageToken;
+
+
+  SearchResult();
+
+  SearchResult.fromJson(core.Map _json) {
+    if (_json.containsKey("docId")) {
+      docId = _json["docId"];
+    }
+    if (_json.containsKey("fields")) {
+      fields = commons.mapMap(_json["fields"], (item) => new FieldValueList.fromJson(item));
+    }
+    if (_json.containsKey("nextPageToken")) {
+      nextPageToken = _json["nextPageToken"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (docId != null) {
+      _json["docId"] = docId;
+    }
+    if (fields != null) {
+      _json["fields"] = commons.mapMap(fields, (item) => (item).toJson());
+    }
+    if (nextPageToken != null) {
+      _json["nextPageToken"] = nextPageToken;
+    }
+    return _json;
+  }
+}
diff --git a/generated/googleapis/lib/common/common.dart b/generated/googleapis/lib/common/common.dart
deleted file mode 100644
index 2441aed..0000000
--- a/generated/googleapis/lib/common/common.dart
+++ /dev/null
@@ -1,186 +0,0 @@
-library googleapis.common;
-
-import 'dart:async' as async;
-import 'dart:core' as core;
-import 'dart:collection' as collection;
-/**
- * Represents a media consisting of a stream of bytes, a content type and a
- * length.
- */
-class Media {
-  final async.Stream<core.List<core.int>> stream;
-  final core.String contentType;
-  final core.int length;
-
-  /**
-   * Creates a new [Media] with a byte [stream] of length [length] with a
-   * [contentType].
-   *
-   * When uploading media, [length] can only be null if [ResumableUploadOptions]
-   * is used.
-   */
-  Media(this.stream, this.length,
-        {this.contentType: "application/octet-stream"}) {
-    if (stream == null || contentType == null) {
-      throw new core.ArgumentError(
-          'Arguments stream, contentType and length must not be null.');
-    }
-    if (length != null && length < 0) {
-      throw new core.ArgumentError('A negative content length is not allowed');
-    }
-  }
-}
-
-
-/**
- * Represents options for uploading a [Media].
- */
-class UploadOptions {
-  /** Use either simple uploads (only media) or multipart for media+metadata */
-  static const UploadOptions Default = const UploadOptions();
-
-  /** Make resumable uploads */
-  static final ResumableUploadOptions Resumable = new ResumableUploadOptions();
-
-  const UploadOptions();
-}
-
-
-/**
- * Specifies options for resumable uploads.
- */
-class ResumableUploadOptions extends UploadOptions {
-  static final core.Function ExponentialBackoff = (core.int failedAttempts) {
-    // Do not retry more than 5 times.
-    if (failedAttempts > 5) return null;
-
-    // Wait for 2^(failedAttempts-1) seconds, before retrying.
-    // i.e. 1 second, 2 seconds, 4 seconds, ...
-    return new core.Duration(seconds: 1 << (failedAttempts - 1));
-  };
-
-  /**
-   * Maximum number of upload attempts per chunk.
-   */
-  final core.int numberOfAttempts;
-
-  /**
-   * Preferred size (in bytes) of a uploaded chunk.
-   * Must be a multiple of 256 KB.
-   *
-   * The default is 1 MB.
-   */
-  final core.int chunkSize;
-
-  /**
-   * Function for determining the [core.Duration] to wait before making the
-   * next attempt. See [ExponentialBackoff] for an example.
-   */
-  final core.Function backoffFunction;
-
-  ResumableUploadOptions({this.numberOfAttempts: 3,
-                          this.chunkSize: 1024 * 1024,
-                          core.Function backoffFunction})
-      : backoffFunction = backoffFunction == null ?
-          ExponentialBackoff : backoffFunction {
-    // See e.g. here:
-    // https://developers.google.com/maps-engine/documentation/resumable-upload
-    //
-    // Chunk size restriction:
-    // There are some chunk size restrictions based on the size of the file you
-    // are uploading. Files larger than 256 KB (256 x 1024 bytes) must have
-    // chunk sizes that are multiples of 256 KB. For files smaller than 256 KB,
-    // there are no restrictions. In either case, the final chunk has no
-    // limitations; you can simply transfer the remaining bytes. If you use
-    // chunking, it is important to keep the chunk size as large as possible
-    // to keep the upload efficient.
-    //
-    if (numberOfAttempts < 1 || (chunkSize % (256 * 1024)) != 0) {
-      throw new core.ArgumentError('Invalid arguments.');
-    }
-  }
-}
-
-
-/**
- * Represents options for downloading media.
- *
- * For partial downloads, see [PartialDownloadOptions].
- */
-class DownloadOptions {
-  /** Download only metadata. */
-  static const DownloadOptions Metadata = const DownloadOptions();
-
-  /** Download full media. */
-  static final PartialDownloadOptions FullMedia =
-      new PartialDownloadOptions(new ByteRange(0, -1));
-
-  const DownloadOptions();
-
-  /** Indicates whether metadata should be downloaded. */
-  core.bool get isMetadataDownload => true;
-}
-
-
-/**
- * Options for downloading a [Media].
- */
-class PartialDownloadOptions extends DownloadOptions {
-  /** The range of bytes to be downloaded */
-  final ByteRange range;
-
-  PartialDownloadOptions(this.range);
-
-  core.bool get isMetadataDownload => false;
-
-  /**
-   * `true` if this is a full download and `false` if this is a partial
-   * download.
-   */
-  core.bool get isFullDownload => range.start == 0 && range.end == -1;
-}
-
-
-/**
- * Specifies a range of media.
- */
-class ByteRange {
-  /** First byte of media. */
-  final core.int start;
-
-  /** Last byte of media (inclusive) */
-  final core.int end;
-
-  /** Length of this range (i.e. number of bytes) */
-  core.int get length => end - start + 1;
-
-  ByteRange(this.start, this.end) {
-    if (!(start == 0  && end == -1 || start >= 0 && end > start)) {
-      throw new core.ArgumentError('Invalid media range [$start, $end]');
-    }
-  }
-}
-
-
-/**
- * Represents a general error reported by the API endpoint.
- */
-class ApiRequestError extends core.Error {
-  final core.String message;
-
-  ApiRequestError(this.message);
-
-  core.String toString() => 'ApiRequestError(message: $message)';
-}
-
-/**
- * Represents a specific error reported by the API endpoint.
- */
-class DetailedApiRequestError extends ApiRequestError {
-  final core.int status;
-
-  DetailedApiRequestError(this.status, core.String message) : super(message);
-
-  core.String toString()
-      => 'DetailedApiRequestError(status: $status, message: $message)';
-}
diff --git a/generated/googleapis/lib/compute/v1.dart b/generated/googleapis/lib/compute/v1.dart
index 89e4a68..64ec8d2 100644
--- a/generated/googleapis/lib/compute/v1.dart
+++ b/generated/googleapis/lib/compute/v1.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.compute.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client compute/v1';
 
 /** API for the Google Compute Engine service. */
 class ComputeApi {
@@ -34,7 +37,7 @@
   static const DevstorageReadWriteScope = "https://www.googleapis.com/auth/devstorage.read_write";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AddressesResourceApi get addresses => new AddressesResourceApi(_requester);
   BackendServicesResourceApi get backendServices => new BackendServicesResourceApi(_requester);
@@ -60,20 +63,21 @@
   TargetHttpProxiesResourceApi get targetHttpProxies => new TargetHttpProxiesResourceApi(_requester);
   TargetInstancesResourceApi get targetInstances => new TargetInstancesResourceApi(_requester);
   TargetPoolsResourceApi get targetPools => new TargetPoolsResourceApi(_requester);
+  TargetVpnGatewaysResourceApi get targetVpnGateways => new TargetVpnGatewaysResourceApi(_requester);
   UrlMapsResourceApi get urlMaps => new UrlMapsResourceApi(_requester);
+  VpnTunnelsResourceApi get vpnTunnels => new VpnTunnelsResourceApi(_requester);
   ZoneOperationsResourceApi get zoneOperations => new ZoneOperationsResourceApi(_requester);
   ZonesResourceApi get zones => new ZonesResourceApi(_requester);
 
   ComputeApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "compute/v1/projects/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class AddressesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AddressesResourceApi(common_internal.ApiRequester client) : 
+  AddressesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -81,7 +85,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -96,7 +100,7 @@
    *
    * Completes with a [AddressAggregatedList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -107,7 +111,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -124,7 +128,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/aggregated/addresses';
+    _url = commons.Escaper.ecapeVariable('$project') + '/aggregated/addresses';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -141,11 +145,11 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [region] - Name of the region scoping this request.
+   * [region] - The name of the region for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * [address] - Name of the address resource to delete.
@@ -153,7 +157,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -164,7 +168,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -178,7 +182,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/regions/' + common_internal.Escaper.ecapeVariable('$region') + '/addresses/' + common_internal.Escaper.ecapeVariable('$address');
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/addresses/' + commons.Escaper.ecapeVariable('$address');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -195,11 +199,11 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [region] - Name of the region scoping this request.
+   * [region] - The name of the region for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * [address] - Name of the address resource to return.
@@ -207,7 +211,7 @@
    *
    * Completes with a [Address].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -218,7 +222,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -232,7 +236,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/regions/' + common_internal.Escaper.ecapeVariable('$region') + '/addresses/' + common_internal.Escaper.ecapeVariable('$address');
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/addresses/' + commons.Escaper.ecapeVariable('$address');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -252,16 +256,16 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [region] - Name of the region scoping this request.
+   * [region] - The name of the region for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -272,7 +276,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -286,7 +290,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/regions/' + common_internal.Escaper.ecapeVariable('$region') + '/addresses';
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/addresses';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -304,11 +308,11 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [region] - Name of the region scoping this request.
+   * [region] - The name of the region for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * [filter] - Optional. Filter expression for filtering listed resources.
@@ -322,7 +326,7 @@
    *
    * Completes with a [AddressList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -333,7 +337,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -353,7 +357,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/regions/' + common_internal.Escaper.ecapeVariable('$region') + '/addresses';
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/addresses';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -368,11 +372,10 @@
 }
 
 
-/** Not documented yet. */
 class BackendServicesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  BackendServicesResourceApi(common_internal.ApiRequester client) : 
+  BackendServicesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -389,7 +392,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -400,7 +403,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -411,7 +414,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/backendServices/' + common_internal.Escaper.ecapeVariable('$backendService');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/backendServices/' + commons.Escaper.ecapeVariable('$backendService');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -437,7 +440,7 @@
    *
    * Completes with a [BackendService].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -448,7 +451,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -459,7 +462,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/backendServices/' + common_internal.Escaper.ecapeVariable('$backendService');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/backendServices/' + commons.Escaper.ecapeVariable('$backendService');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -488,7 +491,7 @@
    *
    * Completes with a [BackendServiceGroupHealth].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -499,7 +502,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -513,7 +516,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/backendServices/' + common_internal.Escaper.ecapeVariable('$backendService') + '/getHealth';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/backendServices/' + commons.Escaper.ecapeVariable('$backendService') + '/getHealth';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -539,7 +542,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -550,7 +553,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -561,7 +564,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/backendServices';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/backendServices';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -594,7 +597,7 @@
    *
    * Completes with a [BackendServiceList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -605,7 +608,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -622,7 +625,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/backendServices';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/backendServices';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -651,7 +654,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -662,7 +665,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -676,7 +679,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/backendServices/' + common_internal.Escaper.ecapeVariable('$backendService');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/backendServices/' + commons.Escaper.ecapeVariable('$backendService');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -704,7 +707,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -715,7 +718,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -729,7 +732,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/backendServices/' + common_internal.Escaper.ecapeVariable('$backendService');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/backendServices/' + commons.Escaper.ecapeVariable('$backendService');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -744,11 +747,10 @@
 }
 
 
-/** Not documented yet. */
 class DiskTypesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  DiskTypesResourceApi(common_internal.ApiRequester client) : 
+  DiskTypesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -756,7 +758,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -771,7 +773,7 @@
    *
    * Completes with a [DiskTypeAggregatedList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -782,7 +784,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -799,7 +801,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/aggregated/diskTypes';
+    _url = commons.Escaper.ecapeVariable('$project') + '/aggregated/diskTypes';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -816,11 +818,11 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [zone] - Name of the zone scoping this request.
+   * [zone] - The name of the zone for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * [diskType] - Name of the disk type resource to return.
@@ -828,7 +830,7 @@
    *
    * Completes with a [DiskType].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -839,7 +841,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -853,7 +855,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/diskTypes/' + common_internal.Escaper.ecapeVariable('$diskType');
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/diskTypes/' + commons.Escaper.ecapeVariable('$diskType');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -871,11 +873,11 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [zone] - Name of the zone scoping this request.
+   * [zone] - The name of the zone for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * [filter] - Optional. Filter expression for filtering listed resources.
@@ -889,7 +891,7 @@
    *
    * Completes with a [DiskTypeList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -900,7 +902,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -920,7 +922,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/diskTypes';
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/diskTypes';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -935,11 +937,10 @@
 }
 
 
-/** Not documented yet. */
 class DisksResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  DisksResourceApi(common_internal.ApiRequester client) : 
+  DisksResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -947,7 +948,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -962,7 +963,7 @@
    *
    * Completes with a [DiskAggregatedList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -973,7 +974,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -990,7 +991,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/aggregated/disks';
+    _url = commons.Escaper.ecapeVariable('$project') + '/aggregated/disks';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1003,25 +1004,25 @@
   }
 
   /**
-   * Not documented yet.
+   * Creates a snapshot of this disk.
    *
    * [request] - The metadata request object.
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [zone] - Name of the zone scoping this request.
+   * [zone] - The name of the zone for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
-   * [disk] - Name of the persistent disk resource to snapshot.
+   * [disk] - Name of the persistent disk to snapshot.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1032,7 +1033,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1049,7 +1050,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/disks/' + common_internal.Escaper.ecapeVariable('$disk') + '/createSnapshot';
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/disks/' + commons.Escaper.ecapeVariable('$disk') + '/createSnapshot';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1062,23 +1063,23 @@
   }
 
   /**
-   * Deletes the specified persistent disk resource.
+   * Deletes the specified persistent disk.
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [zone] - Name of the zone scoping this request.
+   * [zone] - The name of the zone for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
-   * [disk] - Name of the persistent disk resource to delete.
+   * [disk] - Name of the persistent disk to delete.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1089,7 +1090,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -1103,7 +1104,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/disks/' + common_internal.Escaper.ecapeVariable('$disk');
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/disks/' + commons.Escaper.ecapeVariable('$disk');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1116,23 +1117,23 @@
   }
 
   /**
-   * Returns the specified persistent disk resource.
+   * Returns a specified persistent disk.
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [zone] - Name of the zone scoping this request.
+   * [zone] - The name of the zone for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
-   * [disk] - Name of the persistent disk resource to return.
+   * [disk] - Name of the persistent disk to return.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * Completes with a [Disk].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1143,7 +1144,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -1157,7 +1158,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/disks/' + common_internal.Escaper.ecapeVariable('$disk');
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/disks/' + commons.Escaper.ecapeVariable('$disk');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1170,25 +1171,25 @@
   }
 
   /**
-   * Creates a persistent disk resource in the specified project using the data
-   * included in the request.
+   * Creates a persistent disk in the specified project using the data included
+   * in the request.
    *
    * [request] - The metadata request object.
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [zone] - Name of the zone scoping this request.
+   * [zone] - The name of the zone for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * [sourceImage] - Optional. Source image to restore onto a disk.
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1199,7 +1200,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1216,7 +1217,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/disks';
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/disks';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1229,16 +1230,15 @@
   }
 
   /**
-   * Retrieves the list of persistent disk resources contained within the
-   * specified zone.
+   * Retrieves the list of persistent disks contained within the specified zone.
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [zone] - Name of the zone scoping this request.
+   * [zone] - The name of the zone for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * [filter] - Optional. Filter expression for filtering listed resources.
@@ -1252,7 +1252,7 @@
    *
    * Completes with a [DiskList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1263,7 +1263,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -1283,7 +1283,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/disks';
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/disks';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1298,11 +1298,10 @@
 }
 
 
-/** Not documented yet. */
 class FirewallsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  FirewallsResourceApi(common_internal.ApiRequester client) : 
+  FirewallsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1310,7 +1309,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -1319,7 +1318,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1330,7 +1329,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -1341,7 +1340,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/firewalls/' + common_internal.Escaper.ecapeVariable('$firewall');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/firewalls/' + commons.Escaper.ecapeVariable('$firewall');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1358,7 +1357,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -1367,7 +1366,7 @@
    *
    * Completes with a [Firewall].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1378,7 +1377,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -1389,7 +1388,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/firewalls/' + common_internal.Escaper.ecapeVariable('$firewall');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/firewalls/' + commons.Escaper.ecapeVariable('$firewall');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1409,13 +1408,13 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1426,7 +1425,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1437,7 +1436,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/firewalls';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/firewalls';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1455,7 +1454,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -1470,7 +1469,7 @@
    *
    * Completes with a [FirewallList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1481,7 +1480,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -1498,7 +1497,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/firewalls';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/firewalls';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1518,7 +1517,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -1527,7 +1526,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1538,7 +1537,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1552,7 +1551,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/firewalls/' + common_internal.Escaper.ecapeVariable('$firewall');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/firewalls/' + commons.Escaper.ecapeVariable('$firewall');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1572,7 +1571,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -1581,7 +1580,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1592,7 +1591,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1606,7 +1605,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/firewalls/' + common_internal.Escaper.ecapeVariable('$firewall');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/firewalls/' + commons.Escaper.ecapeVariable('$firewall');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1621,11 +1620,10 @@
 }
 
 
-/** Not documented yet. */
 class ForwardingRulesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ForwardingRulesResourceApi(common_internal.ApiRequester client) : 
+  ForwardingRulesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1648,7 +1646,7 @@
    *
    * Completes with a [ForwardingRuleAggregatedList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1659,7 +1657,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -1676,7 +1674,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/aggregated/forwardingRules';
+    _url = commons.Escaper.ecapeVariable('$project') + '/aggregated/forwardingRules';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1705,7 +1703,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1716,7 +1714,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -1730,7 +1728,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/regions/' + common_internal.Escaper.ecapeVariable('$region') + '/forwardingRules/' + common_internal.Escaper.ecapeVariable('$forwardingRule');
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/forwardingRules/' + commons.Escaper.ecapeVariable('$forwardingRule');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1759,7 +1757,7 @@
    *
    * Completes with a [ForwardingRule].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1770,7 +1768,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -1784,7 +1782,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/regions/' + common_internal.Escaper.ecapeVariable('$region') + '/forwardingRules/' + common_internal.Escaper.ecapeVariable('$forwardingRule');
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/forwardingRules/' + commons.Escaper.ecapeVariable('$forwardingRule');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1813,7 +1811,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1824,7 +1822,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1838,7 +1836,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/regions/' + common_internal.Escaper.ecapeVariable('$region') + '/forwardingRules';
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/forwardingRules';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1874,7 +1872,7 @@
    *
    * Completes with a [ForwardingRuleList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1885,7 +1883,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -1905,7 +1903,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/regions/' + common_internal.Escaper.ecapeVariable('$region') + '/forwardingRules';
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/forwardingRules';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1937,7 +1935,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1948,7 +1946,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1965,7 +1963,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/regions/' + common_internal.Escaper.ecapeVariable('$region') + '/forwardingRules/' + common_internal.Escaper.ecapeVariable('$forwardingRule') + '/setTarget';
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/forwardingRules/' + commons.Escaper.ecapeVariable('$forwardingRule') + '/setTarget';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1980,11 +1978,10 @@
 }
 
 
-/** Not documented yet. */
 class GlobalAddressesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  GlobalAddressesResourceApi(common_internal.ApiRequester client) : 
+  GlobalAddressesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1992,7 +1989,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -2001,7 +1998,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2012,7 +2009,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -2023,7 +2020,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/addresses/' + common_internal.Escaper.ecapeVariable('$address');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/addresses/' + commons.Escaper.ecapeVariable('$address');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -2040,7 +2037,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -2049,7 +2046,7 @@
    *
    * Completes with a [Address].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2060,7 +2057,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -2071,7 +2068,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/addresses/' + common_internal.Escaper.ecapeVariable('$address');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/addresses/' + commons.Escaper.ecapeVariable('$address');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2091,13 +2088,13 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2108,7 +2105,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2119,7 +2116,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/addresses';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/addresses';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2136,7 +2133,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -2151,7 +2148,7 @@
    *
    * Completes with a [AddressList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2162,7 +2159,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -2179,7 +2176,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/addresses';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/addresses';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2194,11 +2191,10 @@
 }
 
 
-/** Not documented yet. */
 class GlobalForwardingRulesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  GlobalForwardingRulesResourceApi(common_internal.ApiRequester client) : 
+  GlobalForwardingRulesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2215,7 +2211,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2226,7 +2222,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -2237,7 +2233,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/forwardingRules/' + common_internal.Escaper.ecapeVariable('$forwardingRule');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/forwardingRules/' + commons.Escaper.ecapeVariable('$forwardingRule');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -2263,7 +2259,7 @@
    *
    * Completes with a [ForwardingRule].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2274,7 +2270,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -2285,7 +2281,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/forwardingRules/' + common_internal.Escaper.ecapeVariable('$forwardingRule');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/forwardingRules/' + commons.Escaper.ecapeVariable('$forwardingRule');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2311,7 +2307,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2322,7 +2318,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2333,7 +2329,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/forwardingRules';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/forwardingRules';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2366,7 +2362,7 @@
    *
    * Completes with a [ForwardingRuleList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2377,7 +2373,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -2394,7 +2390,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/forwardingRules';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/forwardingRules';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2423,7 +2419,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2434,7 +2430,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2448,7 +2444,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/forwardingRules/' + common_internal.Escaper.ecapeVariable('$forwardingRule') + '/setTarget';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/forwardingRules/' + commons.Escaper.ecapeVariable('$forwardingRule') + '/setTarget';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2463,11 +2459,10 @@
 }
 
 
-/** Not documented yet. */
 class GlobalOperationsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  GlobalOperationsResourceApi(common_internal.ApiRequester client) : 
+  GlobalOperationsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2475,7 +2470,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -2490,7 +2485,7 @@
    *
    * Completes with a [OperationAggregatedList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2501,7 +2496,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -2518,7 +2513,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/aggregated/operations';
+    _url = commons.Escaper.ecapeVariable('$project') + '/aggregated/operations';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2535,14 +2530,14 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
    * [operation] - Name of the operation resource to delete.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2553,7 +2548,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -2565,7 +2560,7 @@
 
     _downloadOptions = null;
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/operations/' + common_internal.Escaper.ecapeVariable('$operation');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/operations/' + commons.Escaper.ecapeVariable('$operation');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -2582,7 +2577,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -2591,7 +2586,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2602,7 +2597,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -2613,7 +2608,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/operations/' + common_internal.Escaper.ecapeVariable('$operation');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/operations/' + commons.Escaper.ecapeVariable('$operation');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2631,7 +2626,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -2646,7 +2641,7 @@
    *
    * Completes with a [OperationList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2657,7 +2652,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -2674,7 +2669,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/operations';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/operations';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2689,11 +2684,10 @@
 }
 
 
-/** Not documented yet. */
 class HttpHealthChecksResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  HttpHealthChecksResourceApi(common_internal.ApiRequester client) : 
+  HttpHealthChecksResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2710,7 +2704,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2721,7 +2715,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -2732,7 +2726,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/httpHealthChecks/' + common_internal.Escaper.ecapeVariable('$httpHealthCheck');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/httpHealthChecks/' + commons.Escaper.ecapeVariable('$httpHealthCheck');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -2758,7 +2752,7 @@
    *
    * Completes with a [HttpHealthCheck].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2769,7 +2763,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -2780,7 +2774,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/httpHealthChecks/' + common_internal.Escaper.ecapeVariable('$httpHealthCheck');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/httpHealthChecks/' + commons.Escaper.ecapeVariable('$httpHealthCheck');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2806,7 +2800,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2817,7 +2811,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2828,7 +2822,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/httpHealthChecks';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/httpHealthChecks';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2861,7 +2855,7 @@
    *
    * Completes with a [HttpHealthCheckList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2872,7 +2866,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -2889,7 +2883,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/httpHealthChecks';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/httpHealthChecks';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2918,7 +2912,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2929,7 +2923,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2943,7 +2937,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/httpHealthChecks/' + common_internal.Escaper.ecapeVariable('$httpHealthCheck');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/httpHealthChecks/' + commons.Escaper.ecapeVariable('$httpHealthCheck');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -2972,7 +2966,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2983,7 +2977,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2997,7 +2991,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/httpHealthChecks/' + common_internal.Escaper.ecapeVariable('$httpHealthCheck');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/httpHealthChecks/' + commons.Escaper.ecapeVariable('$httpHealthCheck');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -3012,11 +3006,10 @@
 }
 
 
-/** Not documented yet. */
 class ImagesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ImagesResourceApi(common_internal.ApiRequester client) : 
+  ImagesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3024,7 +3017,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -3033,7 +3026,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3044,7 +3037,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -3055,7 +3048,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/images/' + common_internal.Escaper.ecapeVariable('$image');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/images/' + commons.Escaper.ecapeVariable('$image');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -3068,14 +3061,15 @@
   }
 
   /**
-   * Sets the deprecation status of an image. If no message body is given,
-   * clears the deprecation status instead.
+   * Sets the deprecation status of an image.
+   *
+   * If an empty request body is given, clears the deprecation status instead.
    *
    * [request] - The metadata request object.
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -3084,7 +3078,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3095,7 +3089,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3109,7 +3103,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/images/' + common_internal.Escaper.ecapeVariable('$image') + '/deprecate';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/images/' + commons.Escaper.ecapeVariable('$image') + '/deprecate';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -3126,7 +3120,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -3135,7 +3129,7 @@
    *
    * Completes with a [Image].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3146,7 +3140,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -3157,7 +3151,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/images/' + common_internal.Escaper.ecapeVariable('$image');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/images/' + commons.Escaper.ecapeVariable('$image');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3177,13 +3171,13 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3194,7 +3188,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3205,7 +3199,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/images';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/images';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -3222,7 +3216,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -3237,7 +3231,7 @@
    *
    * Completes with a [ImageList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3248,7 +3242,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -3265,7 +3259,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/images';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/images';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3280,11 +3274,10 @@
 }
 
 
-/** Not documented yet. */
 class InstanceTemplatesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  InstanceTemplatesResourceApi(common_internal.ApiRequester client) : 
+  InstanceTemplatesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3301,7 +3294,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3312,7 +3305,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -3323,7 +3316,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/instanceTemplates/' + common_internal.Escaper.ecapeVariable('$instanceTemplate');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/instanceTemplates/' + commons.Escaper.ecapeVariable('$instanceTemplate');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -3349,7 +3342,7 @@
    *
    * Completes with a [InstanceTemplate].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3360,7 +3353,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -3371,7 +3364,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/instanceTemplates/' + common_internal.Escaper.ecapeVariable('$instanceTemplate');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/instanceTemplates/' + commons.Escaper.ecapeVariable('$instanceTemplate');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3397,7 +3390,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3408,7 +3401,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3419,7 +3412,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/instanceTemplates';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/instanceTemplates';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -3452,7 +3445,7 @@
    *
    * Completes with a [InstanceTemplateList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3463,7 +3456,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -3480,7 +3473,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/instanceTemplates';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/instanceTemplates';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3495,11 +3488,10 @@
 }
 
 
-/** Not documented yet. */
 class InstancesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  InstancesResourceApi(common_internal.ApiRequester client) : 
+  InstancesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3509,21 +3501,22 @@
    *
    * Request parameters:
    *
-   * [project] - Project name.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [zone] - Name of the zone scoping this request.
+   * [zone] - The name of the zone for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
-   * [instance] - Instance name.
+   * [instance] - The instance name for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
-   * [networkInterface] - Network interface name.
+   * [networkInterface] - The name of the network interface to add to this
+   * instance.
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3534,7 +3527,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3555,7 +3548,7 @@
     _queryParams["networkInterface"] = [networkInterface];
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/instances/' + common_internal.Escaper.ecapeVariable('$instance') + '/addAccessConfig';
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/instances/' + commons.Escaper.ecapeVariable('$instance') + '/addAccessConfig';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -3568,11 +3561,9 @@
   }
 
   /**
-   * Not documented yet.
-   *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -3587,7 +3578,7 @@
    *
    * Completes with a [InstanceAggregatedList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3598,7 +3589,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -3615,7 +3606,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/aggregated/instances';
+    _url = commons.Escaper.ecapeVariable('$project') + '/aggregated/instances';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3628,17 +3619,17 @@
   }
 
   /**
-   * Attaches a disk resource to an instance.
+   * Attaches a Disk resource to an instance.
    *
    * [request] - The metadata request object.
    *
    * Request parameters:
    *
-   * [project] - Project name.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [zone] - Name of the zone scoping this request.
+   * [zone] - The name of the zone for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * [instance] - Instance name.
@@ -3646,7 +3637,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3657,7 +3648,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3674,7 +3665,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/instances/' + common_internal.Escaper.ecapeVariable('$instance') + '/attachDisk';
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/instances/' + commons.Escaper.ecapeVariable('$instance') + '/attachDisk';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -3687,15 +3678,16 @@
   }
 
   /**
-   * Deletes the specified instance resource.
+   * Deletes the specified Instance resource. For more information, see Shutting
+   * down an instance.
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [zone] - Name of the zone scoping this request.
+   * [zone] - The name of the zone for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * [instance] - Name of the instance resource to delete.
@@ -3703,7 +3695,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3714,7 +3706,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -3728,7 +3720,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/instances/' + common_internal.Escaper.ecapeVariable('$instance');
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/instances/' + commons.Escaper.ecapeVariable('$instance');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -3745,23 +3737,23 @@
    *
    * Request parameters:
    *
-   * [project] - Project name.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [zone] - Name of the zone scoping this request.
+   * [zone] - The name of the zone for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
-   * [instance] - Instance name.
+   * [instance] - The instance name for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
-   * [accessConfig] - Access config name.
+   * [accessConfig] - The name of the access config to delete.
    *
-   * [networkInterface] - Network interface name.
+   * [networkInterface] - The name of the network interface.
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3772,7 +3764,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -3794,7 +3786,7 @@
     _queryParams["networkInterface"] = [networkInterface];
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/instances/' + common_internal.Escaper.ecapeVariable('$instance') + '/deleteAccessConfig';
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/instances/' + commons.Escaper.ecapeVariable('$instance') + '/deleteAccessConfig';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -3811,11 +3803,11 @@
    *
    * Request parameters:
    *
-   * [project] - Project name.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [zone] - Name of the zone scoping this request.
+   * [zone] - The name of the zone for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * [instance] - Instance name.
@@ -3826,7 +3818,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3837,7 +3829,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -3855,7 +3847,7 @@
     _queryParams["deviceName"] = [deviceName];
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/instances/' + common_internal.Escaper.ecapeVariable('$instance') + '/detachDisk';
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/instances/' + commons.Escaper.ecapeVariable('$instance') + '/detachDisk';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -3872,11 +3864,11 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [zone] - Name of the zone scoping this request.
+   * [zone] - The name of the The name of the zone for this request..
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * [instance] - Name of the instance resource to return.
@@ -3884,7 +3876,7 @@
    *
    * Completes with a [Instance].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3895,7 +3887,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -3909,7 +3901,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/instances/' + common_internal.Escaper.ecapeVariable('$instance');
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/instances/' + commons.Escaper.ecapeVariable('$instance');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3926,11 +3918,11 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [zone] - Name of the zone scoping this request.
+   * [zone] - The name of the zone for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * [instance] - Name of the instance scoping this request.
@@ -3938,7 +3930,7 @@
    *
    * Completes with a [SerialPortOutput].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3949,7 +3941,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -3963,7 +3955,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/instances/' + common_internal.Escaper.ecapeVariable('$instance') + '/serialPort';
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/instances/' + commons.Escaper.ecapeVariable('$instance') + '/serialPort';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3983,16 +3975,16 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [zone] - Name of the zone scoping this request.
+   * [zone] - The name of the zone for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4003,7 +3995,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -4017,7 +4009,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/instances';
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/instances';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -4035,11 +4027,11 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [zone] - Name of the zone scoping this request.
+   * [zone] - The name of the zone for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * [filter] - Optional. Filter expression for filtering listed resources.
@@ -4053,7 +4045,7 @@
    *
    * Completes with a [InstanceList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4064,7 +4056,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -4084,7 +4076,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/instances';
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/instances';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -4101,11 +4093,11 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [zone] - Name of the zone scoping this request.
+   * [zone] - The name of the zone for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * [instance] - Name of the instance scoping this request.
@@ -4113,7 +4105,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4124,7 +4116,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -4138,7 +4130,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/instances/' + common_internal.Escaper.ecapeVariable('$instance') + '/reset';
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/instances/' + commons.Escaper.ecapeVariable('$instance') + '/reset';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -4151,29 +4143,29 @@
   }
 
   /**
-   * Sets the auto-delete flag for a disk attached to an instance
+   * Sets the auto-delete flag for a disk attached to an instance.
    *
    * Request parameters:
    *
-   * [project] - Project name.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [zone] - Name of the zone scoping this request.
+   * [zone] - The name of the zone for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
-   * [instance] - Instance name.
+   * [instance] - The instance name.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * [autoDelete] - Whether to auto-delete the disk when the instance is
    * deleted.
    *
-   * [deviceName] - Disk device name to modify.
+   * [deviceName] - The device name of the disk to modify.
    * Value must have pattern "\w[\w.-]{0,254}".
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4184,7 +4176,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -4206,7 +4198,7 @@
     _queryParams["deviceName"] = [deviceName];
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/instances/' + common_internal.Escaper.ecapeVariable('$instance') + '/setDiskAutoDelete';
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/instances/' + commons.Escaper.ecapeVariable('$instance') + '/setDiskAutoDelete';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -4226,11 +4218,11 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [zone] - Name of the zone scoping this request.
+   * [zone] - The name of the zone for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * [instance] - Name of the instance scoping this request.
@@ -4238,7 +4230,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4249,7 +4241,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -4266,7 +4258,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/instances/' + common_internal.Escaper.ecapeVariable('$instance') + '/setMetadata';
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/instances/' + commons.Escaper.ecapeVariable('$instance') + '/setMetadata';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -4285,11 +4277,11 @@
    *
    * Request parameters:
    *
-   * [project] - Project name.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [zone] - Name of the zone scoping this request.
+   * [zone] - The name of the zone for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * [instance] - Instance name.
@@ -4297,7 +4289,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4308,7 +4300,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -4325,7 +4317,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/instances/' + common_internal.Escaper.ecapeVariable('$instance') + '/setScheduling';
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/instances/' + commons.Escaper.ecapeVariable('$instance') + '/setScheduling';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -4344,11 +4336,11 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [zone] - Name of the zone scoping this request.
+   * [zone] - The name of the zone for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * [instance] - Name of the instance scoping this request.
@@ -4356,7 +4348,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4367,7 +4359,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -4384,7 +4376,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/instances/' + common_internal.Escaper.ecapeVariable('$instance') + '/setTags';
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/instances/' + commons.Escaper.ecapeVariable('$instance') + '/setTags';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -4397,15 +4389,16 @@
   }
 
   /**
-   * Starts an instance
+   * This method starts an instance that was stopped using the using the
+   * instances().stop method. For more information, see Restart an instance.
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [zone] - Name of the zone scoping this request.
+   * [zone] - The name of the zone for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * [instance] - Name of the instance resource to start.
@@ -4413,7 +4406,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4424,7 +4417,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -4438,7 +4431,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/instances/' + common_internal.Escaper.ecapeVariable('$instance') + '/start';
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/instances/' + commons.Escaper.ecapeVariable('$instance') + '/start';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -4451,15 +4444,20 @@
   }
 
   /**
-   * Stops an instance
+   * This method stops a running instance, shutting it down cleanly, and allows
+   * you to restart the instance at a later time. Stopped instances do not incur
+   * per-minute, virtual machine usage charges while they are stopped, but any
+   * resources that the virtual machine is using, such as persistent disks and
+   * static IP addresses,will continue to be charged until they are deleted. For
+   * more information, see Stopping an instance.
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [zone] - Name of the zone scoping this request.
+   * [zone] - The name of the zone for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * [instance] - Name of the instance resource to start.
@@ -4467,7 +4465,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4478,7 +4476,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -4492,7 +4490,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/instances/' + common_internal.Escaper.ecapeVariable('$instance') + '/stop';
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/instances/' + commons.Escaper.ecapeVariable('$instance') + '/stop';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -4507,11 +4505,10 @@
 }
 
 
-/** Not documented yet. */
 class LicensesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  LicensesResourceApi(common_internal.ApiRequester client) : 
+  LicensesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -4519,7 +4516,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -4528,7 +4525,7 @@
    *
    * Completes with a [License].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4539,7 +4536,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -4550,7 +4547,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/licenses/' + common_internal.Escaper.ecapeVariable('$license');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/licenses/' + commons.Escaper.ecapeVariable('$license');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -4565,11 +4562,10 @@
 }
 
 
-/** Not documented yet. */
 class MachineTypesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  MachineTypesResourceApi(common_internal.ApiRequester client) : 
+  MachineTypesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -4592,7 +4588,7 @@
    *
    * Completes with a [MachineTypeAggregatedList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4603,7 +4599,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -4620,7 +4616,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/aggregated/machineTypes';
+    _url = commons.Escaper.ecapeVariable('$project') + '/aggregated/machineTypes';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -4641,7 +4637,7 @@
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [zone] - Name of the zone scoping this request.
+   * [zone] - The name of the zone for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * [machineType] - Name of the machine type resource to return.
@@ -4649,7 +4645,7 @@
    *
    * Completes with a [MachineType].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4660,7 +4656,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -4674,7 +4670,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/machineTypes/' + common_internal.Escaper.ecapeVariable('$machineType');
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/machineTypes/' + commons.Escaper.ecapeVariable('$machineType');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -4696,7 +4692,7 @@
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
-   * [zone] - Name of the zone scoping this request.
+   * [zone] - The name of the zone for this request.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
    * [filter] - Optional. Filter expression for filtering listed resources.
@@ -4710,7 +4706,7 @@
    *
    * Completes with a [MachineTypeList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4721,7 +4717,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -4741,7 +4737,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/machineTypes';
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/machineTypes';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -4756,11 +4752,10 @@
 }
 
 
-/** Not documented yet. */
 class NetworksResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  NetworksResourceApi(common_internal.ApiRequester client) : 
+  NetworksResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -4768,7 +4763,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -4777,7 +4772,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4788,7 +4783,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -4799,7 +4794,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/networks/' + common_internal.Escaper.ecapeVariable('$network');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/networks/' + commons.Escaper.ecapeVariable('$network');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -4816,7 +4811,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -4825,7 +4820,7 @@
    *
    * Completes with a [Network].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4836,7 +4831,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -4847,7 +4842,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/networks/' + common_internal.Escaper.ecapeVariable('$network');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/networks/' + commons.Escaper.ecapeVariable('$network');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -4867,13 +4862,13 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4884,7 +4879,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -4895,7 +4890,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/networks';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/networks';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -4912,7 +4907,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -4927,7 +4922,7 @@
    *
    * Completes with a [NetworkList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4938,7 +4933,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -4955,7 +4950,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/networks';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/networks';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -4970,11 +4965,10 @@
 }
 
 
-/** Not documented yet. */
 class ProjectsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ProjectsResourceApi(common_internal.ApiRequester client) : 
+  ProjectsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -4982,13 +4976,13 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project resource to retrieve.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
    * Completes with a [Project].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4999,7 +4993,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -5007,7 +5001,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project');
+    _url = commons.Escaper.ecapeVariable('$project');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -5020,31 +5014,30 @@
   }
 
   /**
-   * Sets metadata common to all instances within the specified project using
-   * the data included in the request.
+   * Moves a persistent disk from one zone to another.
    *
    * [request] - The metadata request object.
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<Operation> setCommonInstanceMetadata(Metadata request, core.String project) {
+  async.Future<Operation> moveDisk(DiskMoveRequest request, core.String project) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -5055,7 +5048,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/setCommonInstanceMetadata';
+    _url = commons.Escaper.ecapeVariable('$project') + '/moveDisk';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -5068,30 +5061,31 @@
   }
 
   /**
-   * Sets usage export location
+   * Moves an instance and its attached persistent disks from one zone to
+   * another.
    *
    * [request] - The metadata request object.
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<Operation> setUsageExportBucket(UsageExportLocation request, core.String project) {
+  async.Future<Operation> moveInstance(InstanceMoveRequest request, core.String project) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -5102,7 +5096,104 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/setUsageExportBucket';
+    _url = commons.Escaper.ecapeVariable('$project') + '/moveInstance';
+
+    var _response = _requester.request(_url,
+                                       "POST",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Operation.fromJson(data));
+  }
+
+  /**
+   * Sets metadata common to all instances within the specified project using
+   * the data included in the request.
+   *
+   * [request] - The metadata request object.
+   *
+   * Request parameters:
+   *
+   * [project] - Project ID for this request.
+   * Value must have pattern
+   * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
+   *
+   * Completes with a [Operation].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Operation> setCommonInstanceMetadata(Metadata request, core.String project) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (request != null) {
+      _body = convert.JSON.encode((request).toJson());
+    }
+    if (project == null) {
+      throw new core.ArgumentError("Parameter project is required.");
+    }
+
+
+    _url = commons.Escaper.ecapeVariable('$project') + '/setCommonInstanceMetadata';
+
+    var _response = _requester.request(_url,
+                                       "POST",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Operation.fromJson(data));
+  }
+
+  /**
+   * Enables the usage export feature and sets the usage export bucket where
+   * reports are stored. If you provide an empty request body using this method,
+   * the usage export feature will be disabled.
+   *
+   * [request] - The metadata request object.
+   *
+   * Request parameters:
+   *
+   * [project] - Project ID for this request.
+   * Value must have pattern
+   * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
+   *
+   * Completes with a [Operation].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Operation> setUsageExportBucket(UsageExportLocation request, core.String project) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (request != null) {
+      _body = convert.JSON.encode((request).toJson());
+    }
+    if (project == null) {
+      throw new core.ArgumentError("Parameter project is required.");
+    }
+
+
+    _url = commons.Escaper.ecapeVariable('$project') + '/setUsageExportBucket';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -5117,11 +5208,10 @@
 }
 
 
-/** Not documented yet. */
 class RegionOperationsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  RegionOperationsResourceApi(common_internal.ApiRequester client) : 
+  RegionOperationsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -5129,7 +5219,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -5139,7 +5229,7 @@
    * [operation] - Name of the operation resource to delete.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5150,7 +5240,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -5165,7 +5255,7 @@
 
     _downloadOptions = null;
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/regions/' + common_internal.Escaper.ecapeVariable('$region') + '/operations/' + common_internal.Escaper.ecapeVariable('$operation');
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/operations/' + commons.Escaper.ecapeVariable('$operation');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -5182,7 +5272,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -5194,7 +5284,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5205,7 +5295,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -5219,7 +5309,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/regions/' + common_internal.Escaper.ecapeVariable('$region') + '/operations/' + common_internal.Escaper.ecapeVariable('$operation');
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/operations/' + commons.Escaper.ecapeVariable('$operation');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -5237,7 +5327,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -5255,7 +5345,7 @@
    *
    * Completes with a [OperationList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5266,7 +5356,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -5286,7 +5376,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/regions/' + common_internal.Escaper.ecapeVariable('$region') + '/operations';
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/operations';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -5301,11 +5391,10 @@
 }
 
 
-/** Not documented yet. */
 class RegionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  RegionsResourceApi(common_internal.ApiRequester client) : 
+  RegionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -5313,7 +5402,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -5322,7 +5411,7 @@
    *
    * Completes with a [Region].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5333,7 +5422,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -5344,7 +5433,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/regions/' + common_internal.Escaper.ecapeVariable('$region');
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -5361,7 +5450,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -5376,7 +5465,7 @@
    *
    * Completes with a [RegionList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5387,7 +5476,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -5404,7 +5493,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/regions';
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -5419,11 +5508,10 @@
 }
 
 
-/** Not documented yet. */
 class RoutesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  RoutesResourceApi(common_internal.ApiRequester client) : 
+  RoutesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -5440,7 +5528,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5451,7 +5539,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -5462,7 +5550,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/routes/' + common_internal.Escaper.ecapeVariable('$route');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/routes/' + commons.Escaper.ecapeVariable('$route');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -5488,7 +5576,7 @@
    *
    * Completes with a [Route].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5499,7 +5587,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -5510,7 +5598,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/routes/' + common_internal.Escaper.ecapeVariable('$route');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/routes/' + commons.Escaper.ecapeVariable('$route');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -5536,7 +5624,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5547,7 +5635,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -5558,7 +5646,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/routes';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/routes';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -5590,7 +5678,7 @@
    *
    * Completes with a [RouteList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5601,7 +5689,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -5618,7 +5706,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/routes';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/routes';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -5633,11 +5721,10 @@
 }
 
 
-/** Not documented yet. */
 class SnapshotsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  SnapshotsResourceApi(common_internal.ApiRequester client) : 
+  SnapshotsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -5654,7 +5741,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5665,7 +5752,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -5676,7 +5763,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/snapshots/' + common_internal.Escaper.ecapeVariable('$snapshot');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/snapshots/' + commons.Escaper.ecapeVariable('$snapshot');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -5702,7 +5789,7 @@
    *
    * Completes with a [Snapshot].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5713,7 +5800,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -5724,7 +5811,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/snapshots/' + common_internal.Escaper.ecapeVariable('$snapshot');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/snapshots/' + commons.Escaper.ecapeVariable('$snapshot');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -5757,7 +5844,7 @@
    *
    * Completes with a [SnapshotList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5768,7 +5855,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -5785,7 +5872,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/snapshots';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/snapshots';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -5800,11 +5887,10 @@
 }
 
 
-/** Not documented yet. */
 class TargetHttpProxiesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  TargetHttpProxiesResourceApi(common_internal.ApiRequester client) : 
+  TargetHttpProxiesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -5821,7 +5907,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5832,7 +5918,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -5843,7 +5929,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/targetHttpProxies/' + common_internal.Escaper.ecapeVariable('$targetHttpProxy');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/targetHttpProxies/' + commons.Escaper.ecapeVariable('$targetHttpProxy');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -5869,7 +5955,7 @@
    *
    * Completes with a [TargetHttpProxy].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5880,7 +5966,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -5891,7 +5977,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/targetHttpProxies/' + common_internal.Escaper.ecapeVariable('$targetHttpProxy');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/targetHttpProxies/' + commons.Escaper.ecapeVariable('$targetHttpProxy');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -5917,7 +6003,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5928,7 +6014,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -5939,7 +6025,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/targetHttpProxies';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/targetHttpProxies';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -5972,7 +6058,7 @@
    *
    * Completes with a [TargetHttpProxyList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5983,7 +6069,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -6000,7 +6086,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/targetHttpProxies';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/targetHttpProxies';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -6029,7 +6115,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6040,7 +6126,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -6054,7 +6140,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/targetHttpProxies/' + common_internal.Escaper.ecapeVariable('$targetHttpProxy') + '/setUrlMap';
+    _url = commons.Escaper.ecapeVariable('$project') + '/targetHttpProxies/' + commons.Escaper.ecapeVariable('$targetHttpProxy') + '/setUrlMap';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -6069,11 +6155,10 @@
 }
 
 
-/** Not documented yet. */
 class TargetInstancesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  TargetInstancesResourceApi(common_internal.ApiRequester client) : 
+  TargetInstancesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -6096,7 +6181,7 @@
    *
    * Completes with a [TargetInstanceAggregatedList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6107,7 +6192,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -6124,7 +6209,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/aggregated/targetInstances';
+    _url = commons.Escaper.ecapeVariable('$project') + '/aggregated/targetInstances';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -6153,7 +6238,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6164,7 +6249,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -6178,7 +6263,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/targetInstances/' + common_internal.Escaper.ecapeVariable('$targetInstance');
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/targetInstances/' + commons.Escaper.ecapeVariable('$targetInstance');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -6207,7 +6292,7 @@
    *
    * Completes with a [TargetInstance].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6218,7 +6303,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -6232,7 +6317,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/targetInstances/' + common_internal.Escaper.ecapeVariable('$targetInstance');
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/targetInstances/' + commons.Escaper.ecapeVariable('$targetInstance');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -6261,7 +6346,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6272,7 +6357,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -6286,7 +6371,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/targetInstances';
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/targetInstances';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -6322,7 +6407,7 @@
    *
    * Completes with a [TargetInstanceList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6333,7 +6418,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -6353,7 +6438,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/targetInstances';
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/targetInstances';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -6368,11 +6453,10 @@
 }
 
 
-/** Not documented yet. */
 class TargetPoolsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  TargetPoolsResourceApi(common_internal.ApiRequester client) : 
+  TargetPoolsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -6395,7 +6479,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6406,7 +6490,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -6423,7 +6507,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/regions/' + common_internal.Escaper.ecapeVariable('$region') + '/targetPools/' + common_internal.Escaper.ecapeVariable('$targetPool') + '/addHealthCheck';
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/targetPools/' + commons.Escaper.ecapeVariable('$targetPool') + '/addHealthCheck';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -6455,7 +6539,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6466,7 +6550,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -6483,7 +6567,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/regions/' + common_internal.Escaper.ecapeVariable('$region') + '/targetPools/' + common_internal.Escaper.ecapeVariable('$targetPool') + '/addInstance';
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/targetPools/' + commons.Escaper.ecapeVariable('$targetPool') + '/addInstance';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -6515,7 +6599,7 @@
    *
    * Completes with a [TargetPoolAggregatedList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6526,7 +6610,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -6543,7 +6627,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/aggregated/targetPools';
+    _url = commons.Escaper.ecapeVariable('$project') + '/aggregated/targetPools';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -6572,7 +6656,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6583,7 +6667,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -6597,7 +6681,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/regions/' + common_internal.Escaper.ecapeVariable('$region') + '/targetPools/' + common_internal.Escaper.ecapeVariable('$targetPool');
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/targetPools/' + commons.Escaper.ecapeVariable('$targetPool');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -6626,7 +6710,7 @@
    *
    * Completes with a [TargetPool].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6637,7 +6721,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -6651,7 +6735,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/regions/' + common_internal.Escaper.ecapeVariable('$region') + '/targetPools/' + common_internal.Escaper.ecapeVariable('$targetPool');
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/targetPools/' + commons.Escaper.ecapeVariable('$targetPool');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -6684,7 +6768,7 @@
    *
    * Completes with a [TargetPoolInstanceHealth].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6695,7 +6779,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -6712,7 +6796,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/regions/' + common_internal.Escaper.ecapeVariable('$region') + '/targetPools/' + common_internal.Escaper.ecapeVariable('$targetPool') + '/getHealth';
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/targetPools/' + commons.Escaper.ecapeVariable('$targetPool') + '/getHealth';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -6741,7 +6825,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6752,7 +6836,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -6766,7 +6850,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/regions/' + common_internal.Escaper.ecapeVariable('$region') + '/targetPools';
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/targetPools';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -6802,7 +6886,7 @@
    *
    * Completes with a [TargetPoolList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6813,7 +6897,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -6833,7 +6917,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/regions/' + common_internal.Escaper.ecapeVariable('$region') + '/targetPools';
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/targetPools';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -6865,7 +6949,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6876,7 +6960,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -6893,7 +6977,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/regions/' + common_internal.Escaper.ecapeVariable('$region') + '/targetPools/' + common_internal.Escaper.ecapeVariable('$targetPool') + '/removeHealthCheck';
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/targetPools/' + commons.Escaper.ecapeVariable('$targetPool') + '/removeHealthCheck';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -6925,7 +7009,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6936,7 +7020,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -6953,7 +7037,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/regions/' + common_internal.Escaper.ecapeVariable('$region') + '/targetPools/' + common_internal.Escaper.ecapeVariable('$targetPool') + '/removeInstance';
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/targetPools/' + commons.Escaper.ecapeVariable('$targetPool') + '/removeInstance';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -6987,7 +7071,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6998,7 +7082,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -7018,7 +7102,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/regions/' + common_internal.Escaper.ecapeVariable('$region') + '/targetPools/' + common_internal.Escaper.ecapeVariable('$targetPool') + '/setBackup';
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/targetPools/' + commons.Escaper.ecapeVariable('$targetPool') + '/setBackup';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -7033,11 +7117,308 @@
 }
 
 
-/** Not documented yet. */
-class UrlMapsResourceApi {
-  final common_internal.ApiRequester _requester;
+class TargetVpnGatewaysResourceApi {
+  final commons.ApiRequester _requester;
 
-  UrlMapsResourceApi(common_internal.ApiRequester client) : 
+  TargetVpnGatewaysResourceApi(commons.ApiRequester client) : 
+      _requester = client;
+
+  /**
+   * Retrieves the list of target VPN gateways grouped by scope.
+   *
+   * Request parameters:
+   *
+   * [project] - Project ID for this request.
+   * Value must have pattern
+   * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
+   *
+   * [filter] - Optional. Filter expression for filtering listed resources.
+   *
+   * [maxResults] - Optional. Maximum count of results to be returned. Maximum
+   * value is 500 and default value is 500.
+   * Value must be between "0" and "500".
+   *
+   * [pageToken] - Optional. Tag returned by a previous list request truncated
+   * by maxResults. Used to continue a previous list request.
+   *
+   * Completes with a [TargetVpnGatewayAggregatedList].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<TargetVpnGatewayAggregatedList> aggregatedList(core.String project, {core.String filter, core.int maxResults, core.String pageToken}) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (project == null) {
+      throw new core.ArgumentError("Parameter project is required.");
+    }
+    if (filter != null) {
+      _queryParams["filter"] = [filter];
+    }
+    if (maxResults != null) {
+      _queryParams["maxResults"] = ["${maxResults}"];
+    }
+    if (pageToken != null) {
+      _queryParams["pageToken"] = [pageToken];
+    }
+
+
+    _url = commons.Escaper.ecapeVariable('$project') + '/aggregated/targetVpnGateways';
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new TargetVpnGatewayAggregatedList.fromJson(data));
+  }
+
+  /**
+   * Deletes the specified TargetVpnGateway resource.
+   *
+   * Request parameters:
+   *
+   * [project] - Project ID for this request.
+   * Value must have pattern
+   * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
+   *
+   * [region] - The name of the region for this request.
+   * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
+   *
+   * [targetVpnGateway] - Name of the TargetVpnGateway resource to delete.
+   * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
+   *
+   * Completes with a [Operation].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Operation> delete(core.String project, core.String region, core.String targetVpnGateway) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (project == null) {
+      throw new core.ArgumentError("Parameter project is required.");
+    }
+    if (region == null) {
+      throw new core.ArgumentError("Parameter region is required.");
+    }
+    if (targetVpnGateway == null) {
+      throw new core.ArgumentError("Parameter targetVpnGateway is required.");
+    }
+
+
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/targetVpnGateways/' + commons.Escaper.ecapeVariable('$targetVpnGateway');
+
+    var _response = _requester.request(_url,
+                                       "DELETE",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Operation.fromJson(data));
+  }
+
+  /**
+   * Returns the specified TargetVpnGateway resource.
+   *
+   * Request parameters:
+   *
+   * [project] - Project ID for this request.
+   * Value must have pattern
+   * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
+   *
+   * [region] - The name of the region for this request.
+   * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
+   *
+   * [targetVpnGateway] - Name of the TargetVpnGateway resource to return.
+   * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
+   *
+   * Completes with a [TargetVpnGateway].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<TargetVpnGateway> get(core.String project, core.String region, core.String targetVpnGateway) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (project == null) {
+      throw new core.ArgumentError("Parameter project is required.");
+    }
+    if (region == null) {
+      throw new core.ArgumentError("Parameter region is required.");
+    }
+    if (targetVpnGateway == null) {
+      throw new core.ArgumentError("Parameter targetVpnGateway is required.");
+    }
+
+
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/targetVpnGateways/' + commons.Escaper.ecapeVariable('$targetVpnGateway');
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new TargetVpnGateway.fromJson(data));
+  }
+
+  /**
+   * Creates a TargetVpnGateway resource in the specified project and region
+   * using the data included in the request.
+   *
+   * [request] - The metadata request object.
+   *
+   * Request parameters:
+   *
+   * [project] - Project ID for this request.
+   * Value must have pattern
+   * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
+   *
+   * [region] - The name of the region for this request.
+   * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
+   *
+   * Completes with a [Operation].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Operation> insert(TargetVpnGateway request, core.String project, core.String region) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (request != null) {
+      _body = convert.JSON.encode((request).toJson());
+    }
+    if (project == null) {
+      throw new core.ArgumentError("Parameter project is required.");
+    }
+    if (region == null) {
+      throw new core.ArgumentError("Parameter region is required.");
+    }
+
+
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/targetVpnGateways';
+
+    var _response = _requester.request(_url,
+                                       "POST",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Operation.fromJson(data));
+  }
+
+  /**
+   * Retrieves the list of TargetVpnGateway resources available to the specified
+   * project and region.
+   *
+   * Request parameters:
+   *
+   * [project] - Project ID for this request.
+   * Value must have pattern
+   * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
+   *
+   * [region] - The name of the region for this request.
+   * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
+   *
+   * [filter] - Optional. Filter expression for filtering listed resources.
+   *
+   * [maxResults] - Optional. Maximum count of results to be returned. Maximum
+   * value is 500 and default value is 500.
+   * Value must be between "0" and "500".
+   *
+   * [pageToken] - Optional. Tag returned by a previous list request truncated
+   * by maxResults. Used to continue a previous list request.
+   *
+   * Completes with a [TargetVpnGatewayList].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<TargetVpnGatewayList> list(core.String project, core.String region, {core.String filter, core.int maxResults, core.String pageToken}) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (project == null) {
+      throw new core.ArgumentError("Parameter project is required.");
+    }
+    if (region == null) {
+      throw new core.ArgumentError("Parameter region is required.");
+    }
+    if (filter != null) {
+      _queryParams["filter"] = [filter];
+    }
+    if (maxResults != null) {
+      _queryParams["maxResults"] = ["${maxResults}"];
+    }
+    if (pageToken != null) {
+      _queryParams["pageToken"] = [pageToken];
+    }
+
+
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/targetVpnGateways';
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new TargetVpnGatewayList.fromJson(data));
+  }
+
+}
+
+
+class UrlMapsResourceApi {
+  final commons.ApiRequester _requester;
+
+  UrlMapsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -7054,7 +7435,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7065,7 +7446,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -7076,7 +7457,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/urlMaps/' + common_internal.Escaper.ecapeVariable('$urlMap');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/urlMaps/' + commons.Escaper.ecapeVariable('$urlMap');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -7102,7 +7483,7 @@
    *
    * Completes with a [UrlMap].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7113,7 +7494,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -7124,7 +7505,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/urlMaps/' + common_internal.Escaper.ecapeVariable('$urlMap');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/urlMaps/' + commons.Escaper.ecapeVariable('$urlMap');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -7150,7 +7531,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7161,7 +7542,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -7172,7 +7553,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/urlMaps';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/urlMaps';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -7204,7 +7585,7 @@
    *
    * Completes with a [UrlMapList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7215,7 +7596,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -7232,7 +7613,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/urlMaps';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/urlMaps';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -7261,7 +7642,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7272,7 +7653,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -7286,7 +7667,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/urlMaps/' + common_internal.Escaper.ecapeVariable('$urlMap');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/urlMaps/' + commons.Escaper.ecapeVariable('$urlMap');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -7314,7 +7695,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7325,7 +7706,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -7339,7 +7720,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/urlMaps/' + common_internal.Escaper.ecapeVariable('$urlMap');
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/urlMaps/' + commons.Escaper.ecapeVariable('$urlMap');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -7369,7 +7750,7 @@
    *
    * Completes with a [UrlMapsValidateResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7380,7 +7761,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -7394,7 +7775,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/global/urlMaps/' + common_internal.Escaper.ecapeVariable('$urlMap') + '/validate';
+    _url = commons.Escaper.ecapeVariable('$project') + '/global/urlMaps/' + commons.Escaper.ecapeVariable('$urlMap') + '/validate';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -7409,11 +7790,308 @@
 }
 
 
-/** Not documented yet. */
-class ZoneOperationsResourceApi {
-  final common_internal.ApiRequester _requester;
+class VpnTunnelsResourceApi {
+  final commons.ApiRequester _requester;
 
-  ZoneOperationsResourceApi(common_internal.ApiRequester client) : 
+  VpnTunnelsResourceApi(commons.ApiRequester client) : 
+      _requester = client;
+
+  /**
+   * Retrieves the list of VPN tunnels grouped by scope.
+   *
+   * Request parameters:
+   *
+   * [project] - Project ID for this request.
+   * Value must have pattern
+   * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
+   *
+   * [filter] - Optional. Filter expression for filtering listed resources.
+   *
+   * [maxResults] - Optional. Maximum count of results to be returned. Maximum
+   * value is 500 and default value is 500.
+   * Value must be between "0" and "500".
+   *
+   * [pageToken] - Optional. Tag returned by a previous list request truncated
+   * by maxResults. Used to continue a previous list request.
+   *
+   * Completes with a [VpnTunnelAggregatedList].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<VpnTunnelAggregatedList> aggregatedList(core.String project, {core.String filter, core.int maxResults, core.String pageToken}) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (project == null) {
+      throw new core.ArgumentError("Parameter project is required.");
+    }
+    if (filter != null) {
+      _queryParams["filter"] = [filter];
+    }
+    if (maxResults != null) {
+      _queryParams["maxResults"] = ["${maxResults}"];
+    }
+    if (pageToken != null) {
+      _queryParams["pageToken"] = [pageToken];
+    }
+
+
+    _url = commons.Escaper.ecapeVariable('$project') + '/aggregated/vpnTunnels';
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new VpnTunnelAggregatedList.fromJson(data));
+  }
+
+  /**
+   * Deletes the specified VpnTunnel resource.
+   *
+   * Request parameters:
+   *
+   * [project] - Project ID for this request.
+   * Value must have pattern
+   * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
+   *
+   * [region] - The name of the region for this request.
+   * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
+   *
+   * [vpnTunnel] - Name of the VpnTunnel resource to delete.
+   * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
+   *
+   * Completes with a [Operation].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Operation> delete(core.String project, core.String region, core.String vpnTunnel) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (project == null) {
+      throw new core.ArgumentError("Parameter project is required.");
+    }
+    if (region == null) {
+      throw new core.ArgumentError("Parameter region is required.");
+    }
+    if (vpnTunnel == null) {
+      throw new core.ArgumentError("Parameter vpnTunnel is required.");
+    }
+
+
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/vpnTunnels/' + commons.Escaper.ecapeVariable('$vpnTunnel');
+
+    var _response = _requester.request(_url,
+                                       "DELETE",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Operation.fromJson(data));
+  }
+
+  /**
+   * Returns the specified VpnTunnel resource.
+   *
+   * Request parameters:
+   *
+   * [project] - Project ID for this request.
+   * Value must have pattern
+   * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
+   *
+   * [region] - The name of the region for this request.
+   * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
+   *
+   * [vpnTunnel] - Name of the VpnTunnel resource to return.
+   * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
+   *
+   * Completes with a [VpnTunnel].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<VpnTunnel> get(core.String project, core.String region, core.String vpnTunnel) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (project == null) {
+      throw new core.ArgumentError("Parameter project is required.");
+    }
+    if (region == null) {
+      throw new core.ArgumentError("Parameter region is required.");
+    }
+    if (vpnTunnel == null) {
+      throw new core.ArgumentError("Parameter vpnTunnel is required.");
+    }
+
+
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/vpnTunnels/' + commons.Escaper.ecapeVariable('$vpnTunnel');
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new VpnTunnel.fromJson(data));
+  }
+
+  /**
+   * Creates a VpnTunnel resource in the specified project and region using the
+   * data included in the request.
+   *
+   * [request] - The metadata request object.
+   *
+   * Request parameters:
+   *
+   * [project] - Project ID for this request.
+   * Value must have pattern
+   * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
+   *
+   * [region] - The name of the region for this request.
+   * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
+   *
+   * Completes with a [Operation].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Operation> insert(VpnTunnel request, core.String project, core.String region) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (request != null) {
+      _body = convert.JSON.encode((request).toJson());
+    }
+    if (project == null) {
+      throw new core.ArgumentError("Parameter project is required.");
+    }
+    if (region == null) {
+      throw new core.ArgumentError("Parameter region is required.");
+    }
+
+
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/vpnTunnels';
+
+    var _response = _requester.request(_url,
+                                       "POST",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Operation.fromJson(data));
+  }
+
+  /**
+   * Retrieves the list of VpnTunnel resources contained in the specified
+   * project and region.
+   *
+   * Request parameters:
+   *
+   * [project] - Project ID for this request.
+   * Value must have pattern
+   * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
+   *
+   * [region] - The name of the region for this request.
+   * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
+   *
+   * [filter] - Optional. Filter expression for filtering listed resources.
+   *
+   * [maxResults] - Optional. Maximum count of results to be returned. Maximum
+   * value is 500 and default value is 500.
+   * Value must be between "0" and "500".
+   *
+   * [pageToken] - Optional. Tag returned by a previous list request truncated
+   * by maxResults. Used to continue a previous list request.
+   *
+   * Completes with a [VpnTunnelList].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<VpnTunnelList> list(core.String project, core.String region, {core.String filter, core.int maxResults, core.String pageToken}) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (project == null) {
+      throw new core.ArgumentError("Parameter project is required.");
+    }
+    if (region == null) {
+      throw new core.ArgumentError("Parameter region is required.");
+    }
+    if (filter != null) {
+      _queryParams["filter"] = [filter];
+    }
+    if (maxResults != null) {
+      _queryParams["maxResults"] = ["${maxResults}"];
+    }
+    if (pageToken != null) {
+      _queryParams["pageToken"] = [pageToken];
+    }
+
+
+    _url = commons.Escaper.ecapeVariable('$project') + '/regions/' + commons.Escaper.ecapeVariable('$region') + '/vpnTunnels';
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new VpnTunnelList.fromJson(data));
+  }
+
+}
+
+
+class ZoneOperationsResourceApi {
+  final commons.ApiRequester _requester;
+
+  ZoneOperationsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -7421,7 +8099,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -7431,7 +8109,7 @@
    * [operation] - Name of the operation resource to delete.
    * Value must have pattern "[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?".
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7442,7 +8120,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -7457,7 +8135,7 @@
 
     _downloadOptions = null;
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/operations/' + common_internal.Escaper.ecapeVariable('$operation');
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/operations/' + commons.Escaper.ecapeVariable('$operation');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -7474,7 +8152,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -7486,7 +8164,7 @@
    *
    * Completes with a [Operation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7497,7 +8175,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -7511,7 +8189,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/operations/' + common_internal.Escaper.ecapeVariable('$operation');
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/operations/' + commons.Escaper.ecapeVariable('$operation');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -7529,7 +8207,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -7547,7 +8225,7 @@
    *
    * Completes with a [OperationList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7558,7 +8236,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -7578,7 +8256,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone') + '/operations';
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone') + '/operations';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -7593,11 +8271,10 @@
 }
 
 
-/** Not documented yet. */
 class ZonesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ZonesResourceApi(common_internal.ApiRequester client) : 
+  ZonesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -7605,7 +8282,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -7614,7 +8291,7 @@
    *
    * Completes with a [Zone].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7625,7 +8302,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -7636,7 +8313,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones/' + common_internal.Escaper.ecapeVariable('$zone');
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones/' + commons.Escaper.ecapeVariable('$zone');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -7653,7 +8330,7 @@
    *
    * Request parameters:
    *
-   * [project] - Name of the project scoping this request.
+   * [project] - Project ID for this request.
    * Value must have pattern
    * "(?:(?:[-a-z0-9]{1,63}\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?))".
    *
@@ -7668,7 +8345,7 @@
    *
    * Completes with a [ZoneList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7679,7 +8356,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -7696,7 +8373,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/zones';
+    _url = commons.Escaper.ecapeVariable('$project') + '/zones';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -7714,7 +8391,10 @@
 
 /** An access configuration attached to an instance's network interface. */
 class AccessConfig {
-  /** Type of the resource. */
+  /**
+   * [Output Only] Type of the resource. Always compute#accessConfig for access
+   * configs.
+   */
   core.String kind;
 
   /** Name of this access configuration. */
@@ -7722,14 +8402,15 @@
 
   /**
    * An external IP address associated with this instance. Specify an unused
-   * static IP address available to the project. If not specified, the external
-   * IP will be drawn from a shared ephemeral pool.
+   * static external IP address available to the project or leave this field
+   * undefined to use an IP from a shared ephemeral IP address pool. If you
+   * specify a static external IP address, it must live in the same region as
+   * the zone of the instance.
    */
   core.String natIP;
 
   /**
-   * Type of configuration. Must be set to "ONE_TO_ONE_NAT". This configures
-   * port-for-port NAT to the internet.
+   * The type of configuration. The default and only option is ONE_TO_ONE_NAT.
    * Possible string values are:
    * - "ONE_TO_ONE_NAT"
    */
@@ -7774,10 +8455,10 @@
 
 /** A reserved address resource. */
 class Address {
-  /** The IP address represented by this resource. */
+  /** The static external IP address represented by this resource. */
   core.String address;
 
-  /** Creation timestamp in RFC3339 text format (output only). */
+  /** [Output Only] Creation timestamp in RFC3339 text format. */
   core.String creationTimestamp;
 
   /**
@@ -7787,37 +8468,47 @@
   core.String description;
 
   /**
-   * Unique identifier for the resource; defined by the server (output only).
+   * [Output Only] Unique identifier for the resource; defined by the server.
    */
   core.String id;
 
-  /** Type of the resource. */
+  /**
+   * [Output Only] Type of the resource. Always compute#address for addresses.
+   */
   core.String kind;
 
   /**
    * Name of the resource; provided by the client when the resource is created.
    * The name must be 1-63 characters long, and comply with RFC1035.
+   * Specifically, the name must be 1-63 characters long and match the regular
+   * expression [a-z]([-a-z0-9]*[a-z0-9])? which means the first character must
+   * be a lowercase letter, and all following characters must be a dash,
+   * lowercase letter, or digit, except the last character, which cannot be a
+   * dash.
    */
   core.String name;
 
   /**
-   * URL of the region where the regional address resides (output only). This
+   * [Output Only] URL of the region where the regional address resides. This
    * field is not applicable to global addresses.
    */
   core.String region;
 
-  /** Server defined URL for the resource (output only). */
+  /** [Output Only] Server defined URL for the resource. */
   core.String selfLink;
 
   /**
-   * The status of the address (output only).
+   * [Output Only] The status of the address, which can be either IN_USE or
+   * RESERVED. An address that is RESERVED is currently reserved and available
+   * to use. An IN_USE address is currently being used by another resource and
+   * is not available.
    * Possible string values are:
    * - "IN_USE"
    * - "RESERVED"
    */
   core.String status;
 
-  /** The resources that are using this address resource. */
+  /** [Output Only] The URLs of the resources that are using this address. */
   core.List<core.String> users;
 
 
@@ -7893,23 +8584,25 @@
 }
 
 
-/** Not documented yet. */
 class AddressAggregatedList {
   /**
-   * Unique identifier for the resource; defined by the server (output only).
+   * [Output Only] Unique identifier for the resource; defined by the server.
    */
   core.String id;
 
-  /** A map of scoped address lists. */
+  /** [Output Only] A map of scoped address lists. */
   core.Map<core.String, AddressesScopedList> items;
 
-  /** Type of resource. */
+  /**
+   * [Output Only] Type of resource. Always compute#addressAggregatedList for
+   * aggregated lists of addresses.
+   */
   core.String kind;
 
-  /** A token used to continue a truncated list request (output only). */
+  /** [Output Only] A token used to continue a truncated list request. */
   core.String nextPageToken;
 
-  /** Server defined URL for this resource (output only). */
+  /** [Output Only] Server defined URL for this resource. */
   core.String selfLink;
 
 
@@ -7920,7 +8613,7 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items = common_internal.mapMap(_json["items"], (item) => new AddressesScopedList.fromJson(item));
+      items = commons.mapMap(_json["items"], (item) => new AddressesScopedList.fromJson(item));
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -7939,7 +8632,7 @@
       _json["id"] = id;
     }
     if (items != null) {
-      _json["items"] = common_internal.mapMap(items, (item) => (item).toJson());
+      _json["items"] = commons.mapMap(items, (item) => (item).toJson());
     }
     if (kind != null) {
       _json["kind"] = kind;
@@ -7958,20 +8651,23 @@
 /** Contains a list of address resources. */
 class AddressList {
   /**
-   * Unique identifier for the resource; defined by the server (output only).
+   * [Output Only] Unique identifier for the resource; defined by the server.
    */
   core.String id;
 
-  /** A list of Address resources. */
+  /** [Output Only] A list of Address resources. */
   core.List<Address> items;
 
-  /** Type of resource. */
+  /**
+   * [Output Only] Type of resource. Always compute#addressList for lists of
+   * addresses.
+   */
   core.String kind;
 
-  /** A token used to continue a truncated list request (output only). */
+  /** [Output Only] A token used to continue a truncated list request. */
   core.String nextPageToken;
 
-  /** Server defined URL for the resource (output only). */
+  /** [Output Only] Server defined URL for the resource. */
   core.String selfLink;
 
 
@@ -8017,12 +8713,11 @@
 }
 
 
-/** Not documented yet. */
 class AddressesScopedListWarningData {
-  /** A key for the warning data. */
+  /** [Output Only] A key for the warning data. */
   core.String key;
 
-  /** A warning data value corresponding to the key. */
+  /** [Output Only] A warning data value corresponding to the key. */
   core.String value;
 
 
@@ -8051,12 +8746,12 @@
 
 
 /**
- * Informational warning which replaces the list of addresses when the list is
- * empty.
+ * [Output Only] Informational warning which replaces the list of addresses when
+ * the list is empty.
  */
 class AddressesScopedListWarning {
   /**
-   * The warning type identifier for this warning.
+   * [Output Only] The warning type identifier for this warning.
    * Possible string values are:
    * - "DEPRECATED_RESOURCE_USED"
    * - "DISK_SIZE_LARGER_THAN_IMAGE_SIZE"
@@ -8069,14 +8764,15 @@
    * - "NO_RESULTS_ON_PAGE"
    * - "REQUIRED_TOS_AGREEMENT"
    * - "RESOURCE_NOT_DELETED"
+   * - "SINGLE_INSTANCE_PROPERTY_TEMPLATE"
    * - "UNREACHABLE"
    */
   core.String code;
 
-  /** Metadata for this warning in 'key: value' format. */
+  /** [Output Only] Metadata for this warning in key: value format. */
   core.List<AddressesScopedListWarningData> data;
 
-  /** Optional human-readable details for this warning. */
+  /** [Output Only] Optional human-readable details for this warning. */
   core.String message;
 
 
@@ -8110,14 +8806,13 @@
 }
 
 
-/** Not documented yet. */
 class AddressesScopedList {
-  /** List of addresses contained in this scope. */
+  /** [Output Only] List of addresses contained in this scope. */
   core.List<Address> addresses;
 
   /**
-   * Informational warning which replaces the list of addresses when the list is
-   * empty.
+   * [Output Only] Informational warning which replaces the list of addresses
+   * when the list is empty.
    */
   AddressesScopedListWarning warning;
 
@@ -8149,63 +8844,82 @@
 /** An instance-attached disk resource. */
 class AttachedDisk {
   /**
-   * Whether the disk will be auto-deleted when the instance is deleted (but not
-   * when the disk is detached from the instance).
+   * Specifies whether the disk will be auto-deleted when the instance is
+   * deleted (but not when the disk is detached from the instance).
    */
   core.bool autoDelete;
 
   /**
-   * Indicates that this is a boot disk. VM will use the first partition of the
-   * disk for its root filesystem.
+   * Indicates that this is a boot disk. The virtual machine will use the first
+   * partition of the disk for its root filesystem.
    */
   core.bool boot;
 
   /**
-   * Persistent disk only; must be unique within the instance when specified.
-   * This represents a unique device name that is reflected into the /dev/ tree
-   * of a Linux operating system running within the instance. If not specified,
-   * a default will be chosen by the system.
+   * Specifies a unique device name of your choice that is reflected into the
+   * /dev/ tree of a Linux operating system running within the instance. This
+   * name can be used to reference the device for mounting, resizing, and so on,
+   * from within the instance.
+   *
+   * If not specified, the server chooses a default device name to apply to this
+   * disk, in the form persistent-disks-x, where x is a number assigned by
+   * Google Compute Engine. This field is only applicable for persistent disks.
    */
   core.String deviceName;
 
   /**
-   * A zero-based index to assign to this disk, where 0 is reserved for the boot
-   * disk. If not specified, the server will choose an appropriate value (output
-   * only).
+   * Assigns a zero-based index to this disk, where 0 is reserved for the boot
+   * disk. For example, if you have many disks attached to an instance, each
+   * disk would have a unique index number. If not specified, the server will
+   * choose an appropriate value.
    */
   core.int index;
 
-  /** Initialization parameters. */
+  /**
+   * [Input Only] Specifies the parameters for a new disk that will be created
+   * alongside the new instance. Use initialization parameters to create boot
+   * disks or local SSDs attached to the new instance.
+   *
+   * This property is mutually exclusive with the source property; you can only
+   * define one or the other, but not both.
+   */
   AttachedDiskInitializeParams initializeParams;
 
   /**
-   * Not documented yet.
+   *
    * Possible string values are:
    * - "NVME"
    * - "SCSI"
    */
   core.String interface;
 
-  /** Type of the resource. */
+  /**
+   * [Output Only] Type of the resource. Always compute#attachedDisk for
+   * attached disks.
+   */
   core.String kind;
 
-  /** Public visible licenses. */
+  /** [Output Only] Any valid publicly visible licenses. */
   core.List<core.String> licenses;
 
   /**
-   * The mode in which to attach this disk, either "READ_WRITE" or "READ_ONLY".
+   * The mode in which to attach this disk, either READ_WRITE or READ_ONLY. If
+   * not specified, the default is to attach the disk in READ_WRITE mode.
    * Possible string values are:
    * - "READ_ONLY"
    * - "READ_WRITE"
    */
   core.String mode;
 
-  /** Persistent disk only; the URL of the persistent disk resource. */
+  /**
+   * Specifies a valid partial or full URL to an existing Persistent Disk
+   * resource. This field is only applicable for persistent disks.
+   */
   core.String source;
 
   /**
-   * Type of the disk, either "SCRATCH" or "PERSISTENT". Note that persistent
-   * disks must be created before you can specify them here.
+   * Specifies the type of the disk, either SCRATCH or PERSISTENT. If not
+   * specified, the default is PERSISTENT.
    * Possible string values are:
    * - "PERSISTENT"
    * - "SCRATCH"
@@ -8292,25 +9006,55 @@
 
 
 /**
- * Initialization parameters for the new disk (input-only). Can only be
- * specified on the boot disk or local SSDs. Mutually exclusive with 'source'.
+ * [Input Only] Specifies the parameters for a new disk that will be created
+ * alongside the new instance. Use initialization parameters to create boot
+ * disks or local SSDs attached to the new instance.
+ *
+ * This property is mutually exclusive with the source property; you can only
+ * define one or the other, but not both.
  */
 class AttachedDiskInitializeParams {
   /**
-   * Name of the disk (when not provided defaults to the name of the instance).
+   * Specifies the disk name. If not specified, the default is to use the name
+   * of the instance.
    */
   core.String diskName;
 
-  /** Size of the disk in base-2 GB. */
+  /** Specifies the size of the disk in base-2 GB. */
   core.String diskSizeGb;
 
   /**
-   * URL of the disk type resource describing which disk type to use to create
-   * the disk; provided by the client when the disk is created.
+   * Specifies the disk type to use to create the instance. If not specified,
+   * the default is pd-standard, specified using the full URL. For example:
+   *
+   * https://www.googleapis.com/compute/v1/projects/project/zones/zone/diskTypes/pd-standard
+   *
+   * Other values include pd-ssd and local-ssd. If you define this field, you
+   * can provide either the full or partial URL. For example, the following are
+   * valid values:
+   * -
+   * https://www.googleapis.com/compute/v1/projects/project/zones/zone/diskTypes/diskType
+   * - projects/project/zones/zone/diskTypes/diskType
+   * - zones/zone/diskTypes/diskType
    */
   core.String diskType;
 
-  /** The source image used to create this disk. */
+  /**
+   * A source image used to create the disk. You can provide a private (custom)
+   * image, and Compute Engine will use the corresponding image from your
+   * project. For example:
+   *
+   * global/images/my-private-image
+   *
+   * Or you can provide an image from a publicly-available project. For example,
+   * to use a Debian image from the debian-cloud project, make sure to include
+   * the project in the URL:
+   *
+   * projects/debian-cloud/global/images/debian-7-wheezy-vYYYYMMDD
+   *
+   * where vYYYYMMDD is the image version. The fully-qualified URL will also
+   * work in both cases.
+   */
   core.String sourceImage;
 
 
@@ -8525,7 +9269,7 @@
   core.String portName;
 
   /**
-   * Not documented yet.
+   *
    * Possible string values are:
    * - "HTTP"
    */
@@ -8631,9 +9375,7 @@
 }
 
 
-/** Not documented yet. */
 class BackendServiceGroupHealth {
-  /** Not documented yet. */
   core.List<HealthStatus> healthStatus;
 
   /** Type of resource. */
@@ -8747,17 +9489,18 @@
   core.String obsolete;
 
   /**
-   * A URL of the suggested replacement for the deprecated resource. The
-   * deprecated resource and its replacement must be resources of the same kind.
+   * The URL of the suggested replacement for a deprecated resource. The
+   * suggested replacement resource must be the same kind of resource as the
+   * deprecated resource.
    */
   core.String replacement;
 
   /**
-   * The deprecation state. Can be "DEPRECATED", "OBSOLETE", or "DELETED".
-   * Operations which create a new resource using a "DEPRECATED" resource will
-   * return successfully, but with a warning indicating the deprecated resource
-   * and recommending its replacement. New uses of "OBSOLETE" or "DELETED"
-   * resources will result in an error.
+   * The deprecation state of this resource. This can be DEPRECATED, OBSOLETE,
+   * or DELETED. Operations which create a new resource using a DEPRECATED
+   * resource will return successfully, but with a warning indicating the
+   * deprecated resource and recommending its replacement. Operations which use
+   * OBSOLETE or DELETED resources will be rejected and result in an error.
    * Possible string values are:
    * - "DELETED"
    * - "DEPRECATED"
@@ -8808,9 +9551,9 @@
 }
 
 
-/** A persistent disk resource. */
+/** A Disk resource. */
 class Disk {
-  /** Creation timestamp in RFC3339 text format (output only). */
+  /** [Output Only] Creation timestamp in RFC3339 text format. */
   core.String creationTimestamp;
 
   /**
@@ -8820,57 +9563,98 @@
   core.String description;
 
   /**
-   * Unique identifier for the resource; defined by the server (output only).
+   * [Output Only] Unique identifier for the resource; defined by the server.
    */
   core.String id;
 
-  /** Type of the resource. */
+  /** [Output Only] Type of the resource. Always compute#disk for disks. */
   core.String kind;
 
-  /** Public visible licenses. */
+  /** Any applicable publicly visible licenses. */
   core.List<core.String> licenses;
 
   /**
    * Name of the resource; provided by the client when the resource is created.
    * The name must be 1-63 characters long, and comply with RFC1035.
+   * Specifically, the name must be 1-63 characters long and match the regular
+   * expression [a-z]([-a-z0-9]*[a-z0-9])? which means the first character must
+   * be a lowercase letter, and all following characters must be a dash,
+   * lowercase letter, or digit, except the last character, which cannot be a
+   * dash.
    */
   core.String name;
 
   /** Internal use only. */
   core.String options;
 
-  /** Server defined URL for the resource (output only). */
+  /** [Output Only] Server-defined fully-qualified URL for this resource. */
   core.String selfLink;
 
   /**
-   * Size of the persistent disk, specified in GB. This parameter is optional
-   * when creating a disk from a disk image or a snapshot, otherwise it is
-   * required.
+   * Size of the persistent disk, specified in GB. You can specify this field
+   * when creating a persistent disk using the sourceImage or sourceSnapshot
+   * parameter, or specify it alone to create an empty persistent disk.
+   *
+   * If you specify this field along with sourceImage or sourceSnapshot, the
+   * value of sizeGb must not be less than the size of the sourceImage or the
+   * size of the snapshot.
    */
   core.String sizeGb;
 
-  /** The source image used to create this disk. */
+  /**
+   * The source image used to create this disk. If the source image is deleted
+   * from the system, this field will not be set, even if an image with the same
+   * name has been re-created.
+   *
+   * When creating a disk, you can provide a private (custom) image using the
+   * following input, and Compute Engine will use the corresponding image from
+   * your project. For example:
+   *
+   * global/images/my-private-image
+   *
+   * Or you can provide an image from a publicly-available project. For example,
+   * to use a Debian image from the debian-cloud project, make sure to include
+   * the project in the URL:
+   *
+   * projects/debian-cloud/global/images/debian-7-wheezy-vYYYYMMDD
+   *
+   * where vYYYYMMDD is the image version. The fully-qualified URL will also
+   * work in both cases.
+   */
   core.String sourceImage;
 
   /**
-   * The 'id' value of the image used to create this disk. This value may be
-   * used to determine whether the disk was created from the current or a
-   * previous instance of a given image.
+   * The ID value of the image used to create this disk. This value identifies
+   * the exact image that was used to create this persistent disk. For example,
+   * if you created the persistent disk from an image that was later deleted and
+   * recreated under the same name, the source image ID would identify the exact
+   * version of the image that was used.
    */
   core.String sourceImageId;
 
-  /** The source snapshot used to create this disk. */
+  /**
+   * The source snapshot used to create this disk. You can provide this as a
+   * partial or full URL to the resource. For example, the following are valid
+   * values:
+   * -
+   * https://www.googleapis.com/compute/v1/projects/project/global/snapshots/snapshot
+   * - projects/project/global/snapshots/snapshot
+   * - global/snapshots/snapshot
+   */
   core.String sourceSnapshot;
 
   /**
-   * The 'id' value of the snapshot used to create this disk. This value may be
-   * used to determine whether the disk was created from the current or a
-   * previous instance of a given disk snapshot.
+   * [Output Only] The unique ID of the snapshot used to create this disk. This
+   * value identifies the exact snapshot that was used to create this persistent
+   * disk. For example, if you created the persistent disk from a snapshot that
+   * was later deleted and recreated under the same name, the source snapshot ID
+   * would identify the exact version of the snapshot that was used.
    */
   core.String sourceSnapshotId;
 
   /**
-   * The status of disk creation (output only).
+   * [Output Only] The status of disk creation. Applicable statuses includes:
+   * CREATING, FAILED, READY, RESTORING.
    * Possible string values are:
    * - "CREATING"
    * - "FAILED"
@@ -8885,7 +9669,7 @@
    */
   core.String type;
 
-  /** URL of the zone where the disk resides (output only). */
+  /** [Output Only] URL of the zone where the disk resides. */
   core.String zone;
 
 
@@ -8997,23 +9781,25 @@
 }
 
 
-/** Not documented yet. */
 class DiskAggregatedList {
   /**
-   * Unique identifier for the resource; defined by the server (output only).
+   * [Output Only] Unique identifier for the resource; defined by the server.
    */
   core.String id;
 
-  /** A map of scoped disk lists. */
+  /** [Output Only] A map of scoped disk lists. */
   core.Map<core.String, DisksScopedList> items;
 
-  /** Type of resource. */
+  /**
+   * [Output Only] Type of resource. Always compute#diskAggregatedList for
+   * aggregated lists of persistent disks.
+   */
   core.String kind;
 
-  /** A token used to continue a truncated list request (output only). */
+  /** [Output Only] A token used to continue a truncated list request. */
   core.String nextPageToken;
 
-  /** Server defined URL for this resource (output only). */
+  /** [Output Only] Server defined URL for this resource. */
   core.String selfLink;
 
 
@@ -9024,7 +9810,7 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items = common_internal.mapMap(_json["items"], (item) => new DisksScopedList.fromJson(item));
+      items = commons.mapMap(_json["items"], (item) => new DisksScopedList.fromJson(item));
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -9043,7 +9829,7 @@
       _json["id"] = id;
     }
     if (items != null) {
-      _json["items"] = common_internal.mapMap(items, (item) => (item).toJson());
+      _json["items"] = commons.mapMap(items, (item) => (item).toJson());
     }
     if (kind != null) {
       _json["kind"] = kind;
@@ -9059,23 +9845,25 @@
 }
 
 
-/** Contains a list of persistent disk resources. */
+/** A list of Disk resources. */
 class DiskList {
   /**
-   * Unique identifier for the resource; defined by the server (output only).
+   * [Output Only] Unique identifier for the resource; defined by the server.
    */
   core.String id;
 
-  /** A list of Disk resources. */
+  /** [Output Only] A list of persistent disks. */
   core.List<Disk> items;
 
-  /** Type of resource. */
+  /**
+   * [Output Only] Type of resource. Always compute#diskList for lists of disks.
+   */
   core.String kind;
 
-  /** A token used to continue a truncated list request (output only). */
+  /** [Output Only] A token used to continue a truncated list request. */
   core.String nextPageToken;
 
-  /** Server defined URL for this resource (output only). */
+  /** [Output Only] Server defined URL for this resource. */
   core.String selfLink;
 
 
@@ -9121,40 +9909,88 @@
 }
 
 
+class DiskMoveRequest {
+  /**
+   * The URL of the destination zone to move the disk to. This can be a full or
+   * partial URL. For example, the following are all valid URLs to a zone:
+   * - https://www.googleapis.com/compute/v1/projects/project/zones/zone
+   * - projects/project/zones/zone
+   * - zones/zone
+   */
+  core.String destinationZone;
+
+  /**
+   * The URL of the target disk to move. This can be a full or partial URL. For
+   * example, the following are all valid URLs to a disk:
+   * -
+   * https://www.googleapis.com/compute/v1/projects/project/zones/zone/disks/disk
+   * - projects/project/zones/zone/disks/disk
+   * - zones/zone/disks/disk
+   */
+  core.String targetDisk;
+
+
+  DiskMoveRequest();
+
+  DiskMoveRequest.fromJson(core.Map _json) {
+    if (_json.containsKey("destinationZone")) {
+      destinationZone = _json["destinationZone"];
+    }
+    if (_json.containsKey("targetDisk")) {
+      targetDisk = _json["targetDisk"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (destinationZone != null) {
+      _json["destinationZone"] = destinationZone;
+    }
+    if (targetDisk != null) {
+      _json["targetDisk"] = targetDisk;
+    }
+    return _json;
+  }
+}
+
+
 /** A disk type resource. */
 class DiskType {
-  /** Creation timestamp in RFC3339 text format (output only). */
+  /** [Output Only] Creation timestamp in RFC3339 text format. */
   core.String creationTimestamp;
 
-  /** Server defined default disk size in gb (output only). */
+  /** [Output Only] Server defined default disk size in GB. */
   core.String defaultDiskSizeGb;
 
-  /** The deprecation status associated with this disk type. */
+  /** [Output Only] The deprecation status associated with this disk type. */
   DeprecationStatus deprecated;
 
-  /** An optional textual description of the resource. */
+  /** [Output Only] An optional textual description of the resource. */
   core.String description;
 
   /**
-   * Unique identifier for the resource; defined by the server (output only).
+   * [Output Only] Unique identifier for the resource; defined by the server.
    */
   core.String id;
 
-  /** Type of the resource. */
+  /**
+   * [Output Only] Type of the resource. Always compute#diskType for disk types.
+   */
   core.String kind;
 
-  /** Name of the resource. */
+  /** [Output Only] Name of the resource. */
   core.String name;
 
-  /** Server defined URL for the resource (output only). */
+  /** [Output Only] Server defined URL for the resource. */
   core.String selfLink;
 
   /**
-   * An optional textual descroption of the valid disk size, e.g., "10GB-10TB".
+   * [Output Only] An optional textual description of the valid disk size, such
+   * as "10GB-10TB".
    */
   core.String validDiskSize;
 
-  /** Url of the zone where the disk type resides (output only). */
+  /** [Output Only] URL of the zone where the disk type resides. */
   core.String zone;
 
 
@@ -9230,23 +10066,22 @@
 }
 
 
-/** Not documented yet. */
 class DiskTypeAggregatedList {
   /**
-   * Unique identifier for the resource; defined by the server (output only).
+   * [Output Only] Unique identifier for the resource; defined by the server.
    */
   core.String id;
 
-  /** A map of scoped disk type lists. */
+  /** [Output Only] A map of scoped disk type lists. */
   core.Map<core.String, DiskTypesScopedList> items;
 
-  /** Type of resource. */
+  /** [Output Only] Type of resource. Always compute#diskTypeAggregatedList. */
   core.String kind;
 
-  /** A token used to continue a truncated list request (output only). */
+  /** [Output Only] A token used to continue a truncated list request. */
   core.String nextPageToken;
 
-  /** Server defined URL for this resource (output only). */
+  /** [Output Only] Server defined URL for this resource. */
   core.String selfLink;
 
 
@@ -9257,7 +10092,7 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items = common_internal.mapMap(_json["items"], (item) => new DiskTypesScopedList.fromJson(item));
+      items = commons.mapMap(_json["items"], (item) => new DiskTypesScopedList.fromJson(item));
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -9276,7 +10111,7 @@
       _json["id"] = id;
     }
     if (items != null) {
-      _json["items"] = common_internal.mapMap(items, (item) => (item).toJson());
+      _json["items"] = commons.mapMap(items, (item) => (item).toJson());
     }
     if (kind != null) {
       _json["kind"] = kind;
@@ -9295,20 +10130,22 @@
 /** Contains a list of disk type resources. */
 class DiskTypeList {
   /**
-   * Unique identifier for the resource; defined by the server (output only).
+   * [Output Only] Unique identifier for the resource; defined by the server.
    */
   core.String id;
 
-  /** A list of DiskType resources. */
+  /** [Output Only] A list of Disk Type resources. */
   core.List<DiskType> items;
 
-  /** Type of resource. */
+  /**
+   * [Output Only] Type of resource. Always compute#diskTypeList for disk types.
+   */
   core.String kind;
 
-  /** A token used to continue a truncated list request (output only). */
+  /** [Output Only] A token used to continue a truncated list request. */
   core.String nextPageToken;
 
-  /** Server defined URL for this resource (output only). */
+  /** [Output Only] Server defined URL for this resource. */
   core.String selfLink;
 
 
@@ -9354,12 +10191,11 @@
 }
 
 
-/** Not documented yet. */
 class DiskTypesScopedListWarningData {
-  /** A key for the warning data. */
+  /** [Output Only] A key for the warning data. */
   core.String key;
 
-  /** A warning data value corresponding to the key. */
+  /** [Output Only] A warning data value corresponding to the key. */
   core.String value;
 
 
@@ -9388,12 +10224,12 @@
 
 
 /**
- * Informational warning which replaces the list of disk types when the list is
- * empty.
+ * [Output Only] Informational warning which replaces the list of disk types
+ * when the list is empty.
  */
 class DiskTypesScopedListWarning {
   /**
-   * The warning type identifier for this warning.
+   * [Output Only] The warning type identifier for this warning.
    * Possible string values are:
    * - "DEPRECATED_RESOURCE_USED"
    * - "DISK_SIZE_LARGER_THAN_IMAGE_SIZE"
@@ -9406,14 +10242,15 @@
    * - "NO_RESULTS_ON_PAGE"
    * - "REQUIRED_TOS_AGREEMENT"
    * - "RESOURCE_NOT_DELETED"
+   * - "SINGLE_INSTANCE_PROPERTY_TEMPLATE"
    * - "UNREACHABLE"
    */
   core.String code;
 
-  /** Metadata for this warning in 'key: value' format. */
+  /** [Output Only] Metadata for this warning in key: value format. */
   core.List<DiskTypesScopedListWarningData> data;
 
-  /** Optional human-readable details for this warning. */
+  /** [Output Only] Optional human-readable details for this warning. */
   core.String message;
 
 
@@ -9447,14 +10284,13 @@
 }
 
 
-/** Not documented yet. */
 class DiskTypesScopedList {
-  /** List of disk types contained in this scope. */
+  /** [Output Only] List of disk types contained in this scope. */
   core.List<DiskType> diskTypes;
 
   /**
-   * Informational warning which replaces the list of disk types when the list
-   * is empty.
+   * [Output Only] Informational warning which replaces the list of disk types
+   * when the list is empty.
    */
   DiskTypesScopedListWarning warning;
 
@@ -9483,12 +10319,11 @@
 }
 
 
-/** Not documented yet. */
 class DisksScopedListWarningData {
-  /** A key for the warning data. */
+  /** [Output Only] A key for the warning data. */
   core.String key;
 
-  /** A warning data value corresponding to the key. */
+  /** [Output Only] A warning data value corresponding to the key. */
   core.String value;
 
 
@@ -9517,12 +10352,12 @@
 
 
 /**
- * Informational warning which replaces the list of disks when the list is
- * empty.
+ * [Output Only] Informational warning which replaces the list of disks when the
+ * list is empty.
  */
 class DisksScopedListWarning {
   /**
-   * The warning type identifier for this warning.
+   * [Output Only] The warning type identifier for this warning.
    * Possible string values are:
    * - "DEPRECATED_RESOURCE_USED"
    * - "DISK_SIZE_LARGER_THAN_IMAGE_SIZE"
@@ -9535,14 +10370,15 @@
    * - "NO_RESULTS_ON_PAGE"
    * - "REQUIRED_TOS_AGREEMENT"
    * - "RESOURCE_NOT_DELETED"
+   * - "SINGLE_INSTANCE_PROPERTY_TEMPLATE"
    * - "UNREACHABLE"
    */
   core.String code;
 
-  /** Metadata for this warning in 'key: value' format. */
+  /** [Output Only] Metadata for this warning in key: value format. */
   core.List<DisksScopedListWarningData> data;
 
-  /** Optional human-readable details for this warning. */
+  /** [Output Only] Optional human-readable details for this warning. */
   core.String message;
 
 
@@ -9576,14 +10412,13 @@
 }
 
 
-/** Not documented yet. */
 class DisksScopedList {
-  /** List of disks contained in this scope. */
+  /** [Output Only] List of disks contained in this scope. */
   core.List<Disk> disks;
 
   /**
-   * Informational warning which replaces the list of disks when the list is
-   * empty.
+   * [Output Only] Informational warning which replaces the list of disks when
+   * the list is empty.
    */
   DisksScopedListWarning warning;
 
@@ -9612,22 +10447,21 @@
 }
 
 
-/** Not documented yet. */
 class FirewallAllowed {
   /**
-   * Required; this is the IP protocol that is allowed for this rule. This can
-   * either be one of the following well known protocol strings ["tcp", "udp",
-   * "icmp", "esp", "ah", "sctp"], or the IP protocol number.
+   * The IP protocol that is allowed for this rule. The protocol type is
+   * required when creating a firewall. This value can either be one of the
+   * following well known protocol strings (tcp, udp, icmp, esp, ah, sctp), or
+   * the IP protocol number.
    */
   core.String IPProtocol;
 
   /**
-   * An optional list of ports which are allowed. It is an error to specify this
-   * for any protocol that isn't UDP or TCP. Each entry must be either an
-   * integer or a range. If not specified, connections through any port are
-   * allowed.
+   * An optional list of ports which are allowed. This field is only applicable
+   * for UDP or TCP protocol. Each entry must be either an integer or a range.
+   * If not specified, connections through any port are allowed
    *
-   * Example inputs include: ["22"], ["80","443"] and ["12345-12349"].
+   * Example inputs include: ["22"], ["80","443"], and ["12345-12349"].
    */
   core.List<core.String> ports;
 
@@ -9656,7 +10490,7 @@
 }
 
 
-/** A firewall resource. */
+/** A Firewall resource. */
 class Firewall {
   /**
    * The list of rules specified by this firewall. Each rule specifies a
@@ -9664,7 +10498,7 @@
    */
   core.List<FirewallAllowed> allowed;
 
-  /** Creation timestamp in RFC3339 text format (output only). */
+  /** [Output Only] Creation timestamp in RFC3339text format. */
   core.String creationTimestamp;
 
   /**
@@ -9674,46 +10508,67 @@
   core.String description;
 
   /**
-   * Unique identifier for the resource; defined by the server (output only).
+   * [Output Only] Unique identifier for the resource; defined by the server.
    */
   core.String id;
 
-  /** Type of the resource. */
+  /**
+   * [Output Ony] Type of the resource. Always compute#firewall for firewall
+   * rules.
+   */
   core.String kind;
 
   /**
    * Name of the resource; provided by the client when the resource is created.
    * The name must be 1-63 characters long, and comply with RFC1035.
+   * Specifically, the name must be 1-63 characters long and match the regular
+   * expression [a-z]([-a-z0-9]*[a-z0-9])? which means the first character must
+   * be a lowercase letter, and all following characters must be a dash,
+   * lowercase letter, or digit, except the last character, which cannot be a
+   * dash.
    */
   core.String name;
 
   /**
-   * URL of the network to which this firewall is applied; provided by the
-   * client when the firewall is created.
+   * URL of the network resource for this firewall rule. This field is required
+   * for creating an instance but optional when creating a firewall rule. If not
+   * specified when creating a firewall rule, the default network is used:
+   * global/networks/default
+   * If you choose to specify this property, you can specify the network as a
+   * full or partial URL. For example, the following are all valid URLs:
+   * -
+   * https://www.googleapis.com/compute/v1/projects/myproject/global/networks/my-network
+   * - projects/myproject/global/networks/my-network
+   * - global/networks/default
    */
   core.String network;
 
-  /** Server defined URL for the resource (output only). */
+  /** [Output Only] Server defined URL for the resource. */
   core.String selfLink;
 
   /**
-   * A list of IP address blocks expressed in CIDR format which this rule
-   * applies to. One or both of sourceRanges and sourceTags may be set; an
-   * inbound connection is allowed if either the range or the tag of the source
-   * matches.
+   * The IP address blocks that this rule applies to, expressed in CIDR format.
+   * One or both of sourceRanges and sourceTags may be set.
+   *
+   * If both properties are set, an inbound connection is allowed if the range
+   * or the tag of the source matches the sourceRanges OR matches the sourceTags
+   * property; the connection does not need to match both properties.
    */
   core.List<core.String> sourceRanges;
 
   /**
    * A list of instance tags which this rule applies to. One or both of
-   * sourceRanges and sourceTags may be set; an inbound connection is allowed if
-   * either the range or the tag of the source matches.
+   * sourceRanges and sourceTags may be set.
+   *
+   * If both properties are set, an inbound connection is allowed if the range
+   * or the tag of the source matches the sourceRanges OR matches the sourceTags
+   * property; the connection does not need to match both properties.
    */
   core.List<core.String> sourceTags;
 
   /**
    * A list of instance tags indicating sets of instances located on network
-   * which may make network connections as specified in allowed. If no
+   * which may make network connections as specified in allowed[]. If no
    * targetTags are specified, the firewall rule applies to all instances on the
    * specified network.
    */
@@ -9798,23 +10653,26 @@
 }
 
 
-/** Contains a list of firewall resources. */
+/** Contains a list of Firewall resources. */
 class FirewallList {
   /**
-   * Unique identifier for the resource; defined by the server (output only).
+   * [Output Only] Unique identifier for the resource; defined by the server.
    */
   core.String id;
 
-  /** A list of Firewall resources. */
+  /** [Output Only] A list of Firewall resources. */
   core.List<Firewall> items;
 
-  /** Type of resource. */
+  /**
+   * [Output Only] Type of resource. Always compute#firewallList for lists of
+   * firewalls.
+   */
   core.String kind;
 
-  /** A token used to continue a truncated list request (output only). */
+  /** [Output Only] A token used to continue a truncated list request. */
   core.String nextPageToken;
 
-  /** Server defined URL for this resource (output only). */
+  /** [Output Only] Server defined URL for this resource. */
   core.String selfLink;
 
 
@@ -10015,7 +10873,6 @@
 }
 
 
-/** Not documented yet. */
 class ForwardingRuleAggregatedList {
   /**
    * Unique identifier for the resource; defined by the server (output only).
@@ -10042,7 +10899,7 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items = common_internal.mapMap(_json["items"], (item) => new ForwardingRulesScopedList.fromJson(item));
+      items = commons.mapMap(_json["items"], (item) => new ForwardingRulesScopedList.fromJson(item));
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -10061,7 +10918,7 @@
       _json["id"] = id;
     }
     if (items != null) {
-      _json["items"] = common_internal.mapMap(items, (item) => (item).toJson());
+      _json["items"] = commons.mapMap(items, (item) => (item).toJson());
     }
     if (kind != null) {
       _json["kind"] = kind;
@@ -10139,12 +10996,11 @@
 }
 
 
-/** Not documented yet. */
 class ForwardingRulesScopedListWarningData {
-  /** A key for the warning data. */
+  /** [Output Only] A key for the warning data. */
   core.String key;
 
-  /** A warning data value corresponding to the key. */
+  /** [Output Only] A warning data value corresponding to the key. */
   core.String value;
 
 
@@ -10178,7 +11034,7 @@
  */
 class ForwardingRulesScopedListWarning {
   /**
-   * The warning type identifier for this warning.
+   * [Output Only] The warning type identifier for this warning.
    * Possible string values are:
    * - "DEPRECATED_RESOURCE_USED"
    * - "DISK_SIZE_LARGER_THAN_IMAGE_SIZE"
@@ -10191,14 +11047,15 @@
    * - "NO_RESULTS_ON_PAGE"
    * - "REQUIRED_TOS_AGREEMENT"
    * - "RESOURCE_NOT_DELETED"
+   * - "SINGLE_INSTANCE_PROPERTY_TEMPLATE"
    * - "UNREACHABLE"
    */
   core.String code;
 
-  /** Metadata for this warning in 'key: value' format. */
+  /** [Output Only] Metadata for this warning in key: value format. */
   core.List<ForwardingRulesScopedListWarningData> data;
 
-  /** Optional human-readable details for this warning. */
+  /** [Output Only] Optional human-readable details for this warning. */
   core.String message;
 
 
@@ -10232,7 +11089,6 @@
 }
 
 
-/** Not documented yet. */
 class ForwardingRulesScopedList {
   /** List of forwarding rules contained in this scope. */
   core.List<ForwardingRule> forwardingRules;
@@ -10268,9 +11124,7 @@
 }
 
 
-/** Not documented yet. */
 class HealthCheckReference {
-  /** Not documented yet. */
   core.String healthCheck;
 
 
@@ -10292,7 +11146,6 @@
 }
 
 
-/** Not documented yet. */
 class HealthStatus {
   /**
    * Health state of the instance.
@@ -10353,7 +11206,6 @@
  * select the BackendService.
  */
 class HostRule {
-  /** Not documented yet. */
   core.String description;
 
   /**
@@ -10628,12 +11480,12 @@
 }
 
 
-/** The raw disk image parameters. */
+/** The parameters of the raw disk image. */
 class ImageRawDisk {
   /**
-   * The format used to encode and transmit the block device. Should be TAR.
-   * This is just a container and transmission format and not a runtime format.
-   * Provided by the client when the disk image is created.
+   * The format used to encode and transmit the block device, which should be
+   * TAR. This is just a container and transmission format and not a runtime
+   * format. Provided by the client when the disk image is created.
    * Possible string values are:
    * - "TAR"
    */
@@ -10646,8 +11498,8 @@
   core.String sha1Checksum;
 
   /**
-   * The full Google Cloud Storage URL where the disk image is stored; provided
-   * by the client when the disk image is created.
+   * The full Google Cloud Storage URL where the disk image is stored. You must
+   * provide either this property or the sourceDisk property but not both.
    */
   core.String source;
 
@@ -10682,14 +11534,14 @@
 }
 
 
-/** A disk image resource. */
+/** An Image resource. */
 class Image {
   /**
    * Size of the image tar.gz archive stored in Google Cloud Storage (in bytes).
    */
   core.String archiveSizeBytes;
 
-  /** Creation timestamp in RFC3339 text format (output only). */
+  /** [Output Only] Creation timestamp in RFC3339 text format. */
   core.String creationTimestamp;
 
   /** The deprecation status associated with this image. */
@@ -10701,56 +11553,69 @@
    */
   core.String description;
 
-  /** Size of the image when restored onto a disk (in GiB). */
+  /** Size of the image when restored onto a persistent disk (in GB). */
   core.String diskSizeGb;
 
   /**
-   * Unique identifier for the resource; defined by the server (output only).
+   * [Output Only] Unique identifier for the resource; defined by the server.
    */
   core.String id;
 
-  /** Type of the resource. */
+  /** [Output Only] Type of the resource. Always compute#image for images. */
   core.String kind;
 
-  /** Public visible licenses. */
+  /** Any applicable publicly visible licenses. */
   core.List<core.String> licenses;
 
   /**
    * Name of the resource; provided by the client when the resource is created.
    * The name must be 1-63 characters long, and comply with RFC1035.
+   * Specifically, the name must be 1-63 characters long and match the regular
+   * expression [a-z]([-a-z0-9]*[a-z0-9])? which means the first character must
+   * be a lowercase letter, and all following characters must be a dash,
+   * lowercase letter, or digit, except the last character, which cannot be a
+   * dash.
    */
   core.String name;
 
-  /** The raw disk image parameters. */
+  /** The parameters of the raw disk image. */
   ImageRawDisk rawDisk;
 
-  /** Server defined URL for the resource (output only). */
+  /** [Output Only] Server defined URL for the resource. */
   core.String selfLink;
 
-  /** The source disk used to create this image. */
+  /**
+   * URL of the The source disk used to create this image. This can be a full or
+   * valid partial URL. You must provide either this property or the
+   * rawDisk.source property but not both to create an image. For example, the
+   * following are valid values:
+   * -
+   * https://www.googleapis.com/compute/v1/projects/project/zones/zone/disk/disk
+   * - projects/project/zones/zone/disk/disk
+   * - zones/zone/disks/disk
+   */
   core.String sourceDisk;
 
   /**
-   * The 'id' value of the disk used to create this image. This value may be
-   * used to determine whether the image was taken from the current or a
-   * previous instance of a given disk name.
+   * The ID value of the disk used to create this image. This value may be used
+   * to determine whether the image was taken from the current or a previous
+   * instance of a given disk name.
    */
   core.String sourceDiskId;
 
   /**
-   * Must be "RAW"; provided by the client when the disk image is created.
+   * The type of the image used to create this disk. The default and only value
+   * is RAW
    * Possible string values are:
    * - "RAW"
    */
   core.String sourceType;
 
   /**
-   * Status of the image (output only). It will be one of the following READY -
-   * after image has been successfully created and is ready for use FAILED - if
-   * creating the image fails for some reason PENDING - the image creation is in
-   * progress An image can be used to create other resources suck as instances
-   * only after the image has been successfully created and the status is set to
-   * READY.
+   * [Output Only] The status of the image. An image can be used to create other
+   * resources, such as instances, only after the image has been successfully
+   * created and the status is set to READY. Possible values are FAILED,
+   * PENDING, or READY.
    * Possible string values are:
    * - "FAILED"
    * - "PENDING"
@@ -10861,7 +11726,7 @@
 }
 
 
-/** Contains a list of disk image resources. */
+/** Contains a list of Image resources. */
 class ImageList {
   /**
    * Unique identifier for the resource; defined by the server (output only).
@@ -10923,18 +11788,20 @@
 }
 
 
-/** An instance resource. */
+/** An Instance resource. */
 class Instance {
   /**
-   * Allows this instance to send packets with source IP addresses other than
-   * its own and receive packets with destination IP addresses other than its
-   * own. If this instance will be used as an IP gateway or it will be set as
-   * the next-hop in a Route resource, say true. If unsure, leave this set to
-   * false.
+   * Allows this instance to send and receive packets with non-matching
+   * destination or source IPs. This is required if you plan to use this
+   * instance to forward routes. For more information, see Enabling IP
+   * Forwarding.
    */
   core.bool canIpForward;
 
-  /** Creation timestamp in RFC3339 text format (output only). */
+  /** [Output Only] The CPU platform used by this instance. */
+  core.String cpuPlatform;
+
+  /** [Output Only] Creation timestamp in RFC3339 text format. */
   core.String creationTimestamp;
 
   /**
@@ -10950,56 +11817,66 @@
   core.List<AttachedDisk> disks;
 
   /**
-   * Unique identifier for the resource; defined by the server (output only).
+   * [Output Only] Unique identifier for the resource; defined by the server.
    */
   core.String id;
 
-  /** Type of the resource. */
+  /**
+   * [Output Only] Type of the resource. Always compute#instance for instances.
+   */
   core.String kind;
 
   /**
-   * URL of the machine type resource describing which machine type to use to
-   * host the instance; provided by the client when the instance is created.
+   * Full or partial URL of the machine type resource to use for this instance.
+   * This is provided by the client when the instance is created. For example,
+   * the following is a valid partial url:
+   *
+   * zones/zone/machineTypes/machine-type
    */
   core.String machineType;
 
   /**
-   * Metadata key/value pairs assigned to this instance. Consists of custom
-   * metadata or predefined keys; see Instance documentation for more
-   * information.
+   * The metadata key/value pairs assigned to this instance. This includes
+   * custom metadata and predefined keys.
    */
   Metadata metadata;
 
   /**
    * Name of the resource; provided by the client when the resource is created.
    * The name must be 1-63 characters long, and comply with RFC1035.
+   * Specifically, the name must be 1-63 characters long and match the regular
+   * expression [a-z]([-a-z0-9]*[a-z0-9])? which means the first character must
+   * be a lowercase letter, and all following characters must be a dash,
+   * lowercase letter, or digit, except the last character, which cannot be a
+   * dash.
    */
   core.String name;
 
   /**
-   * Array of configurations for this interface. This specifies how this
+   * An array of configurations for this interface. This specifies how this
    * interface is configured to interact with other network services, such as
-   * connecting to the internet. Currently, ONE_TO_ONE_NAT is the only access
-   * config supported. If there are no accessConfigs specified, then this
-   * instance will have no external internet access.
+   * connecting to the internet.
    */
   core.List<NetworkInterface> networkInterfaces;
 
   /** Scheduling options for this instance. */
   Scheduling scheduling;
 
-  /** Server defined URL for this resource (output only). */
+  /** [Output Only] Server defined URL for this resource. */
   core.String selfLink;
 
   /**
-   * A list of service accounts each with specified scopes, for which access
-   * tokens are to be made available to the instance through metadata queries.
+   * A list of service accounts, with their specified scopes, authorized for
+   * this instance. Service accounts generate access tokens that can be accessed
+   * through the metadata server and used to authenticate applications on the
+   * instance. See Authenticating from Google Compute Engine for more
+   * information.
    */
   core.List<ServiceAccount> serviceAccounts;
 
   /**
-   * Instance status. One of the following values: "PROVISIONING", "STAGING",
-   * "RUNNING", "STOPPING", "STOPPED", "TERMINATED" (output only).
+   * [Output Only] The status of the instance. One of the following values:
+   * PROVISIONING, STAGING, RUNNING, STOPPING, STOPPED, TERMINATED.
    * Possible string values are:
    * - "PROVISIONING"
    * - "RUNNING"
@@ -11010,18 +11887,18 @@
    */
   core.String status;
 
-  /** An optional, human-readable explanation of the status (output only). */
+  /** [Output Only] An optional, human-readable explanation of the status. */
   core.String statusMessage;
 
   /**
-   * A list of tags to be applied to this instance. Used to identify valid
-   * sources or targets for network firewalls. Provided by the client on
-   * instance creation. The tags can be later modified by the setTags method.
-   * Each tag within the list must comply with RFC1035.
+   * A list of tags to appy to this instance. Tags are used to identify valid
+   * sources or targets for network firewalls and are specified by the client
+   * during instance creation. The tags can be later modified by the setTags
+   * method. Each tag within the list must comply with RFC1035.
    */
   Tags tags;
 
-  /** URL of the zone where the instance resides (output only). */
+  /** [Output Only] URL of the zone where the instance resides. */
   core.String zone;
 
 
@@ -11031,6 +11908,9 @@
     if (_json.containsKey("canIpForward")) {
       canIpForward = _json["canIpForward"];
     }
+    if (_json.containsKey("cpuPlatform")) {
+      cpuPlatform = _json["cpuPlatform"];
+    }
     if (_json.containsKey("creationTimestamp")) {
       creationTimestamp = _json["creationTimestamp"];
     }
@@ -11086,6 +11966,9 @@
     if (canIpForward != null) {
       _json["canIpForward"] = canIpForward;
     }
+    if (cpuPlatform != null) {
+      _json["cpuPlatform"] = cpuPlatform;
+    }
     if (creationTimestamp != null) {
       _json["creationTimestamp"] = creationTimestamp;
     }
@@ -11139,23 +12022,25 @@
 }
 
 
-/** Not documented yet. */
 class InstanceAggregatedList {
   /**
-   * Unique identifier for the resource; defined by the server (output only).
+   * [Output Only] Unique identifier for the resource; defined by the server.
    */
   core.String id;
 
-  /** A map of scoped instance lists. */
+  /** [Output Only] A map of scoped instance lists. */
   core.Map<core.String, InstancesScopedList> items;
 
-  /** Type of resource. */
+  /**
+   * [Output Only] Type of resource. Always compute#instanceAggregatedList for
+   * aggregated lists of Instance resources.
+   */
   core.String kind;
 
-  /** A token used to continue a truncated list request (output only). */
+  /** [Output Only] A token used to continue a truncated list request. */
   core.String nextPageToken;
 
-  /** Server defined URL for this resource (output only). */
+  /** [Output Only] Server defined URL for this resource. */
   core.String selfLink;
 
 
@@ -11166,7 +12051,7 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items = common_internal.mapMap(_json["items"], (item) => new InstancesScopedList.fromJson(item));
+      items = commons.mapMap(_json["items"], (item) => new InstancesScopedList.fromJson(item));
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -11185,7 +12070,7 @@
       _json["id"] = id;
     }
     if (items != null) {
-      _json["items"] = common_internal.mapMap(items, (item) => (item).toJson());
+      _json["items"] = commons.mapMap(items, (item) => (item).toJson());
     }
     if (kind != null) {
       _json["kind"] = kind;
@@ -11204,20 +12089,23 @@
 /** Contains a list of instance resources. */
 class InstanceList {
   /**
-   * Unique identifier for the resource; defined by the server (output only).
+   * [Output Only] Unique identifier for the resource; defined by the server.
    */
   core.String id;
 
-  /** A list of Instance resources. */
+  /** [Output Only] A list of Instance resources. */
   core.List<Instance> items;
 
-  /** Type of resource. */
+  /**
+   * [Output Only] Type of resource. Always compute#instanceList for lists of
+   * Instance resources.
+   */
   core.String kind;
 
-  /** A token used to continue a truncated list request (output only). */
+  /** [Output Only] A token used to continue a truncated list request. */
   core.String nextPageToken;
 
-  /** Server defined URL for this resource (output only). */
+  /** [Output Only] Server defined URL for this resource. */
   core.String selfLink;
 
 
@@ -11263,7 +12151,51 @@
 }
 
 
-/** Not documented yet. */
+class InstanceMoveRequest {
+  /**
+   * The URL of the destination zone to move the instance to. This can be a full
+   * or partial URL. For example, the following are all valid URLs to a zone:
+   * - https://www.googleapis.com/compute/v1/projects/project/zones/zone
+   * - projects/project/zones/zone
+   * - zones/zone
+   */
+  core.String destinationZone;
+
+  /**
+   * The URL of the target instance to move. This can be a full or partial URL.
+   * For example, the following are all valid URLs to an instance:
+   * -
+   * https://www.googleapis.com/compute/v1/projects/project/zones/zone/instances/instance
+   * - projects/project/zones/zone/instances/instance
+   * - zones/zone/instances/instance
+   */
+  core.String targetInstance;
+
+
+  InstanceMoveRequest();
+
+  InstanceMoveRequest.fromJson(core.Map _json) {
+    if (_json.containsKey("destinationZone")) {
+      destinationZone = _json["destinationZone"];
+    }
+    if (_json.containsKey("targetInstance")) {
+      targetInstance = _json["targetInstance"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (destinationZone != null) {
+      _json["destinationZone"] = destinationZone;
+    }
+    if (targetInstance != null) {
+      _json["targetInstance"] = targetInstance;
+    }
+    return _json;
+  }
+}
+
+
 class InstanceProperties {
   /**
    * Allows instances created based on this template to send packets with source
@@ -11395,9 +12327,7 @@
 }
 
 
-/** Not documented yet. */
 class InstanceReference {
-  /** Not documented yet. */
   core.String instance;
 
 
@@ -11568,12 +12498,11 @@
 }
 
 
-/** Not documented yet. */
 class InstancesScopedListWarningData {
-  /** A key for the warning data. */
+  /** [Output Only] A key for the warning data. */
   core.String key;
 
-  /** A warning data value corresponding to the key. */
+  /** [Output Only] A warning data value corresponding to the key. */
   core.String value;
 
 
@@ -11602,12 +12531,12 @@
 
 
 /**
- * Informational warning which replaces the list of instances when the list is
- * empty.
+ * [Output Only] Informational warning which replaces the list of instances when
+ * the list is empty.
  */
 class InstancesScopedListWarning {
   /**
-   * The warning type identifier for this warning.
+   * [Output Only] The warning type identifier for this warning.
    * Possible string values are:
    * - "DEPRECATED_RESOURCE_USED"
    * - "DISK_SIZE_LARGER_THAN_IMAGE_SIZE"
@@ -11620,14 +12549,15 @@
    * - "NO_RESULTS_ON_PAGE"
    * - "REQUIRED_TOS_AGREEMENT"
    * - "RESOURCE_NOT_DELETED"
+   * - "SINGLE_INSTANCE_PROPERTY_TEMPLATE"
    * - "UNREACHABLE"
    */
   core.String code;
 
-  /** Metadata for this warning in 'key: value' format. */
+  /** [Output Only] Metadata for this warning in key: value format. */
   core.List<InstancesScopedListWarningData> data;
 
-  /** Optional human-readable details for this warning. */
+  /** [Output Only] Optional human-readable details for this warning. */
   core.String message;
 
 
@@ -11661,14 +12591,13 @@
 }
 
 
-/** Not documented yet. */
 class InstancesScopedList {
-  /** List of instances contained in this scope. */
+  /** [Output Only] List of instances contained in this scope. */
   core.List<Instance> instances;
 
   /**
-   * Informational warning which replaces the list of instances when the list is
-   * empty.
+   * [Output Only] Informational warning which replaces the list of instances
+   * when the list is empty.
    */
   InstancesScopedListWarning warning;
 
@@ -11705,16 +12634,16 @@
    */
   core.bool chargesUseFee;
 
-  /** Type of resource. */
+  /** [Output Only] Type of resource. Always compute#license for licenses. */
   core.String kind;
 
   /**
-   * Name of the resource; provided by the client when the resource is created.
-   * The name must be 1-63 characters long, and comply with RFC1035.
+   * Name of the resource. The name must be 1-63 characters long, and comply
+   * with RCF1035.
    */
   core.String name;
 
-  /** Server defined URL for the resource (output only). */
+  /** [Output Only] Server defined URL for the resource. */
   core.String selfLink;
 
 
@@ -11754,7 +12683,6 @@
 }
 
 
-/** Not documented yet. */
 class MachineTypeScratchDisks {
   /** Size of the scratch disk, defined in GB. */
   core.int diskGb;
@@ -11778,18 +12706,20 @@
 }
 
 
-/** A machine type resource. */
+/** A Machine Type resource. */
 class MachineType {
   /** [Output Only] Creation timestamp in RFC3339 text format. */
   core.String creationTimestamp;
 
-  /** The deprecation status associated with this machine type. */
+  /**
+   * [Output Only] The deprecation status associated with this machine type.
+   */
   DeprecationStatus deprecated;
 
-  /** An optional textual description of the resource. */
+  /** [Output Only] An optional textual description of the resource. */
   core.String description;
 
-  /** Count of CPUs exposed to the instance. */
+  /** [Output Only] The tumber of CPUs exposed to the instance. */
   core.int guestCpus;
 
   /**
@@ -11797,25 +12727,31 @@
    */
   core.String id;
 
-  /** Space allotted for the image, defined in GB. */
+  /**
+   * [Deprecated] This property is deprecated and will never be populated with
+   * any relevant values.
+   */
   core.int imageSpaceGb;
 
   /** Type of the resource. */
   core.String kind;
 
-  /** Maximum persistent disks allowed. */
+  /** [Output Only] Maximum persistent disks allowed. */
   core.int maximumPersistentDisks;
 
-  /** Maximum total persistent disks size (GB) allowed. */
+  /** [Output Only] Maximum total persistent disks size (GB) allowed. */
   core.String maximumPersistentDisksSizeGb;
 
-  /** Physical memory assigned to the instance, defined in MB. */
+  /**
+   * [Output Only] The amount of physical memory available to the instance,
+   * defined in MB.
+   */
   core.int memoryMb;
 
-  /** Name of the resource. */
+  /** [Output Only] Name of the resource. */
   core.String name;
 
-  /** List of extended scratch disks assigned to the instance. */
+  /** [Output Only] List of extended scratch disks assigned to the instance. */
   core.List<MachineTypeScratchDisks> scratchDisks;
 
   /** [Output Only] Server defined URL for the resource. */
@@ -11924,23 +12860,25 @@
 }
 
 
-/** Not documented yet. */
 class MachineTypeAggregatedList {
   /**
    * [Output Only] Unique identifier for the resource; defined by the server.
    */
   core.String id;
 
-  /** A map of scoped machine type lists. */
+  /** [Output Only] A map of scoped machine type lists. */
   core.Map<core.String, MachineTypesScopedList> items;
 
-  /** Type of resource. */
+  /**
+   * [Output Only] Type of resource. Always compute#machineTypeAggregatedList
+   * for aggregated lists of machine types.
+   */
   core.String kind;
 
   /** [Output Only] A token used to continue a truncated list request. */
   core.String nextPageToken;
 
-  /** Server defined URL for this resource (output only). */
+  /** [Output Only] Server defined URL for this resource. */
   core.String selfLink;
 
 
@@ -11951,7 +12889,7 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items = common_internal.mapMap(_json["items"], (item) => new MachineTypesScopedList.fromJson(item));
+      items = commons.mapMap(_json["items"], (item) => new MachineTypesScopedList.fromJson(item));
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -11970,7 +12908,7 @@
       _json["id"] = id;
     }
     if (items != null) {
-      _json["items"] = common_internal.mapMap(items, (item) => (item).toJson());
+      _json["items"] = commons.mapMap(items, (item) => (item).toJson());
     }
     if (kind != null) {
       _json["kind"] = kind;
@@ -11986,23 +12924,26 @@
 }
 
 
-/** Contains a list of machine type resources. */
+/** Contains a list of Machine Type resources. */
 class MachineTypeList {
   /**
-   * Unique identifier for the resource; defined by the server (output only).
+   * [Output Only] Unique identifier for the resource; defined by the server.
    */
   core.String id;
 
-  /** A list of MachineType resources. */
+  /** [Output Only] A list of Machine Type resources. */
   core.List<MachineType> items;
 
-  /** Type of resource. */
+  /**
+   * [Output Only] Type of resource. Always compute#machineTypeList for lists of
+   * machine types.
+   */
   core.String kind;
 
-  /** A token used to continue a truncated list request (output only). */
+  /** [Output Only] A token used to continue a truncated list request. */
   core.String nextPageToken;
 
-  /** Server defined URL for this resource (output only). */
+  /** [Output Only] Server defined URL for this resource. */
   core.String selfLink;
 
 
@@ -12048,12 +12989,11 @@
 }
 
 
-/** Not documented yet. */
 class MachineTypesScopedListWarningData {
-  /** A key for the warning data. */
+  /** [Output Only] A key for the warning data. */
   core.String key;
 
-  /** A warning data value corresponding to the key. */
+  /** [Output Only] A warning data value corresponding to the key. */
   core.String value;
 
 
@@ -12082,11 +13022,12 @@
 
 
 /**
- * An informational warning that appears when the machine types list is empty.
+ * [Output Only] An informational warning that appears when the machine types
+ * list is empty.
  */
 class MachineTypesScopedListWarning {
   /**
-   * The warning type identifier for this warning.
+   * [Output Only] The warning type identifier for this warning.
    * Possible string values are:
    * - "DEPRECATED_RESOURCE_USED"
    * - "DISK_SIZE_LARGER_THAN_IMAGE_SIZE"
@@ -12099,14 +13040,15 @@
    * - "NO_RESULTS_ON_PAGE"
    * - "REQUIRED_TOS_AGREEMENT"
    * - "RESOURCE_NOT_DELETED"
+   * - "SINGLE_INSTANCE_PROPERTY_TEMPLATE"
    * - "UNREACHABLE"
    */
   core.String code;
 
-  /** Metadata for this warning in 'key: value' format. */
+  /** [Output Only] Metadata for this warning in key: value format. */
   core.List<MachineTypesScopedListWarningData> data;
 
-  /** Optional human-readable details for this warning. */
+  /** [Output Only] Optional human-readable details for this warning. */
   core.String message;
 
 
@@ -12140,13 +13082,13 @@
 }
 
 
-/** Not documented yet. */
 class MachineTypesScopedList {
-  /** List of machine types contained in this scope. */
+  /** [Output Only] List of machine types contained in this scope. */
   core.List<MachineType> machineTypes;
 
   /**
-   * An informational warning that appears when the machine types list is empty.
+   * [Output Only] An informational warning that appears when the machine types
+   * list is empty.
    */
   MachineTypesScopedListWarning warning;
 
@@ -12175,7 +13117,6 @@
 }
 
 
-/** Not documented yet. */
 class MetadataItems {
   /**
    * Key for the metadata entry. Keys must conform to the following regexp:
@@ -12221,9 +13162,11 @@
 /** A metadata key/value entry. */
 class Metadata {
   /**
-   * Fingerprint of this resource. A hash of the metadata's contents. This field
-   * is used for optimistic locking. An up-to-date metadata fingerprint must be
-   * provided in order to modify metadata.
+   * Specifies a fingerprint for this request, which is essentially a hash of
+   * the metadata's contents and used for optimistic locking. The fingerprint is
+   * initially generated by Compute Engine and changes after every request to
+   * modify or update metadata. You must always provide an up-to-date
+   * fingerprint hash in order to update or change metadata.
    */
   core.String fingerprint;
 
@@ -12241,7 +13184,9 @@
    */
   core.List<MetadataItems> items;
 
-  /** Type of the resource. */
+  /**
+   * [Output Only] Type of the resource. Always compute#metadata for metadata.
+   */
   core.String kind;
 
 
@@ -12278,13 +13223,13 @@
 /** A network resource. */
 class Network {
   /**
-   * Required; The range of internal addresses that are legal on this network.
-   * This range is a CIDR specification, for example: 192.168.0.0/16. Provided
-   * by the client when the network is created.
+   * The range of internal addresses that are legal on this network. This range
+   * is a CIDR specification, for example: 192.168.0.0/16. Provided by the
+   * client when the network is created.
    */
   core.String IPv4Range;
 
-  /** Creation timestamp in RFC3339 text format (output only). */
+  /** [Output Only] Creation timestamp in RFC3339 text format. */
   core.String creationTimestamp;
 
   /**
@@ -12294,28 +13239,34 @@
   core.String description;
 
   /**
-   * An optional address that is used for default routing to other networks.
-   * This must be within the range specified by IPv4Range, and is typically the
-   * first usable address in that range. If not specified, the default value is
-   * the first usable address in IPv4Range.
+   * A gateway address for default routing to other networks. This value is read
+   * only and is selected by the Google Compute Engine, typically as the first
+   * usable address in the IPv4Range.
    */
   core.String gatewayIPv4;
 
   /**
-   * Unique identifier for the resource; defined by the server (output only).
+   * [Output Only] Unique identifier for the resource; defined by the server.
    */
   core.String id;
 
-  /** Type of the resource. */
+  /**
+   * [Output Only] Type of the resource. Always compute#network for networks.
+   */
   core.String kind;
 
   /**
    * Name of the resource; provided by the client when the resource is created.
    * The name must be 1-63 characters long, and comply with RFC1035.
+   * Specifically, the name must be 1-63 characters long and match the regular
+   * expression [a-z]([-a-z0-9]*[a-z0-9])? which means the first character must
+   * be a lowercase letter, and all following characters must be a dash,
+   * lowercase letter, or digit, except the last character, which cannot be a
+   * dash.
    */
   core.String name;
 
-  /** Server defined URL for the resource (output only). */
+  /** [Output Only] Server defined URL for the resource. */
   core.String selfLink;
 
 
@@ -12382,26 +13333,38 @@
 /** A network interface resource attached to an instance. */
 class NetworkInterface {
   /**
-   * Array of configurations for this interface. This specifies how this
-   * interface is configured to interact with other network services, such as
-   * connecting to the internet. Currently, ONE_TO_ONE_NAT is the only access
-   * config supported. If there are no accessConfigs specified, then this
-   * instance will have no external internet access.
+   * An array of configurations for this interface. Currently,
+   * <codeONE_TO_ONE_NAT is the only access config supported. If there are no
+   * accessConfigs specified, then this instance will have no external internet
+   * access.
    */
   core.List<AccessConfig> accessConfigs;
 
   /**
-   * Name of the network interface, determined by the server; for network
-   * devices, these are e.g. eth0, eth1, etc. (output only).
+   * [Output Only] The name of the network interface, generated by the server.
+   * For network devices, these are eth0, eth1, etc.
    */
   core.String name;
 
-  /** URL of the network resource attached to this interface. */
+  /**
+   * URL of the network resource for this instance. This is required for
+   * creating an instance but optional when creating a firewall rule. If not
+   * specified when creating a firewall rule, the default network is used:
+   *
+   * global/networks/default
+   *
+   * If you specify this property, you can specify the network as a full or
+   * partial URL. For example, the following are all valid URLs:
+   * -
+   * https://www.googleapis.com/compute/v1/projects/project/global/networks/network
+   * - projects/project/global/networks/network
+   * - global/networks/default
+   */
   core.String network;
 
   /**
-   * An optional IPV4 internal network address assigned to the instance for this
-   * network interface (output only).
+   * [Output Only] An optional IPV4 internal network address assigned to the
+   * instance for this network interface.
    */
   core.String networkIP;
 
@@ -12442,23 +13405,26 @@
 }
 
 
-/** Contains a list of network resources. */
+/** Contains a list of Network resources. */
 class NetworkList {
   /**
-   * Unique identifier for the resource; defined by the server (output only).
+   * [Output Only] Unique identifier for the resource; defined by the server.
    */
   core.String id;
 
-  /** A list of Network resources. */
+  /** [Output Only] A list of Network resources. */
   core.List<Network> items;
 
-  /** Type of resource. */
+  /**
+   * [Output Only] Type of resource. Always compute#networkList for lists of
+   * networks.
+   */
   core.String kind;
 
-  /** A token used to continue a truncated list request (output only). */
+  /** [Output Only] A token used to continue a truncated list request. */
   core.String nextPageToken;
 
-  /** Server defined URL for this resource (output only). */
+  /** [Output Only] Server defined URL for this resource . */
   core.String selfLink;
 
 
@@ -12504,7 +13470,6 @@
 }
 
 
-/** Not documented yet. */
 class OperationErrorErrors {
   /** [Output Only] The error type identifier for this error. */
   core.String code;
@@ -12550,8 +13515,8 @@
 
 
 /**
- * [Output Only] If errors occurred during processing of this operation, this
- * field will be populated.
+ * [Output Only] If errors are generated during processing of the operation,
+ * this field will be populated.
  */
 class OperationError {
   /**
@@ -12579,12 +13544,11 @@
 }
 
 
-/** Not documented yet. */
 class OperationWarningsData {
-  /** A key for the warning data. */
+  /** [Output Only] A key for the warning data. */
   core.String key;
 
-  /** A warning data value corresponding to the key. */
+  /** [Output Only] A warning data value corresponding to the key. */
   core.String value;
 
 
@@ -12612,10 +13576,9 @@
 }
 
 
-/** Not documented yet. */
 class OperationWarnings {
   /**
-   * The warning type identifier for this warning.
+   * [Output Only] The warning type identifier for this warning.
    * Possible string values are:
    * - "DEPRECATED_RESOURCE_USED"
    * - "DISK_SIZE_LARGER_THAN_IMAGE_SIZE"
@@ -12628,14 +13591,15 @@
    * - "NO_RESULTS_ON_PAGE"
    * - "REQUIRED_TOS_AGREEMENT"
    * - "RESOURCE_NOT_DELETED"
+   * - "SINGLE_INSTANCE_PROPERTY_TEMPLATE"
    * - "UNREACHABLE"
    */
   core.String code;
 
-  /** Metadata for this warning in 'key: value' format. */
+  /** [Output Only] Metadata for this warning in key: value format. */
   core.List<OperationWarningsData> data;
 
-  /** Optional human-readable details for this warning. */
+  /** [Output Only] Optional human-readable details for this warning. */
   core.String message;
 
 
@@ -12671,25 +13635,38 @@
 
 /** An operation resource, used to manage asynchronous API requests. */
 class Operation {
-  /** Not documented yet. */
+  /**
+   * [Output Only] An optional identifier specified by the client when the
+   * mutation was initiated. Must be unique for all operation resources in the
+   * project
+   */
   core.String clientOperationId;
 
-  /** [Output Only] Creation timestamp in RFC3339 text format (output only). */
+  /** [Output Only] Creation timestamp in RFC3339 text format. */
   core.String creationTimestamp;
 
-  /** Not documented yet. */
+  /**
+   * [Output Only] The time that this operation was completed. This is in
+   * RFC3339 text format.
+   */
   core.String endTime;
 
   /**
-   * [Output Only] If errors occurred during processing of this operation, this
-   * field will be populated.
+   * [Output Only] If errors are generated during processing of the operation,
+   * this field will be populated.
    */
   OperationError error;
 
-  /** Not documented yet. */
+  /**
+   * [Output Only] If the operation fails, this field contains the HTTP error
+   * message that was returned, such as NOT FOUND.
+   */
   core.String httpErrorMessage;
 
-  /** Not documented yet. */
+  /**
+   * [Output Only] If the operation fails, this field contains the HTTP error
+   * message that was returned, such as 404.
+   */
   core.int httpErrorStatusCode;
 
   /**
@@ -12698,28 +13675,37 @@
   core.String id;
 
   /**
-   * [Output Only] The time that this operation was requested. This is in RFC
-   * 3339 format.
+   * [Output Only] The time that this operation was requested. This is in
+   * RFC3339 text format.
    */
   core.String insertTime;
 
   /**
-   * [Output Only] Type of the resource. Always kind#operation for Operation
+   * [Output Only] Type of the resource. Always compute#Operation for Operation
    * resources.
    */
   core.String kind;
 
-  /** [Output Only] Name of the resource (output only). */
+  /** [Output Only] Name of the resource. */
   core.String name;
 
-  /** Not documented yet. */
+  /**
+   * [Output Only] Type of the operation, such as insert, update, and delete.
+   */
   core.String operationType;
 
-  /** Not documented yet. */
+  /**
+   * [Output Only] An optional progress indicator that ranges from 0 to 100.
+   * There is no requirement that this be linear or support any granularity of
+   * operations. This should not be used to guess at when the operation will be
+   * complete. This number should be monotonically increasing as the operation
+   * progresses.
+   */
   core.int progress;
 
   /**
-   * [Output Only] URL of the region where the operation resides (output only).
+   * [Output Only] URL of the region where the operation resides. Only
+   * applicable for regional resources.
    */
   core.String region;
 
@@ -12728,13 +13714,13 @@
 
   /**
    * [Output Only] The time that this operation was started by the server. This
-   * is in RFC 3339 format.
+   * is in RFC3339 text format.
    */
   core.String startTime;
 
   /**
    * [Output Only] Status of the operation. Can be one of the following:
-   * "PENDING", "RUNNING", or "DONE".
+   * PENDING, RUNNING, or DONE.
    * Possible string values are:
    * - "DONE"
    * - "PENDING"
@@ -12749,25 +13735,27 @@
   core.String statusMessage;
 
   /**
-   * [Output Only] Unique target id which identifies a particular incarnation of
+   * [Output Only] Unique target ID which identifies a particular incarnation of
    * the target.
    */
   core.String targetId;
 
-  /**
-   * [Output Only] URL of the resource the operation is mutating (output only).
-   */
+  /** [Output Only] URL of the resource the operation is mutating. */
   core.String targetLink;
 
-  /** Not documented yet. */
+  /**
+   * [Output Only] User who requested the operation, for example:
+   * user@example.com.
+   */
   core.String user;
 
-  /** Not documented yet. */
+  /**
+   * [Output Only] If warning messages are generated during processing of the
+   * operation, this field will be populated.
+   */
   core.List<OperationWarnings> warnings;
 
-  /**
-   * [Output Only] URL of the zone where the operation resides (output only).
-   */
+  /** [Output Only] URL of the zone where the operation resides. */
   core.String zone;
 
 
@@ -12915,7 +13903,6 @@
 }
 
 
-/** Not documented yet. */
 class OperationAggregatedList {
   /**
    * [Output Only] Unique identifier for the resource; defined by the server.
@@ -12925,7 +13912,10 @@
   /** [Output Only] A map of scoped operation lists. */
   core.Map<core.String, OperationsScopedList> items;
 
-  /** Type of resource. */
+  /**
+   * [Output Only] Type of resource. Always compute#operationAggregatedList for
+   * aggregated lists of operations.
+   */
   core.String kind;
 
   /** [Output Only] A token used to continue a truncated list request. */
@@ -12942,7 +13932,7 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items = common_internal.mapMap(_json["items"], (item) => new OperationsScopedList.fromJson(item));
+      items = commons.mapMap(_json["items"], (item) => new OperationsScopedList.fromJson(item));
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -12961,7 +13951,7 @@
       _json["id"] = id;
     }
     if (items != null) {
-      _json["items"] = common_internal.mapMap(items, (item) => (item).toJson());
+      _json["items"] = commons.mapMap(items, (item) => (item).toJson());
     }
     if (kind != null) {
       _json["kind"] = kind;
@@ -12987,7 +13977,10 @@
   /** [Output Only] The operation resources. */
   core.List<Operation> items;
 
-  /** Type of resource. Always compute#operations for Operations resource. */
+  /**
+   * [Output Only] Type of resource. Always compute#operations for Operations
+   * resource.
+   */
   core.String kind;
 
   /** [Output Only] A token used to continue a truncate. */
@@ -13039,12 +14032,11 @@
 }
 
 
-/** Not documented yet. */
 class OperationsScopedListWarningData {
-  /** A key for the warning data. */
+  /** [Output Only] A key for the warning data. */
   core.String key;
 
-  /** A warning data value corresponding to the key. */
+  /** [Output Only] A warning data value corresponding to the key. */
   core.String value;
 
 
@@ -13078,7 +14070,7 @@
  */
 class OperationsScopedListWarning {
   /**
-   * The warning type identifier for this warning.
+   * [Output Only] The warning type identifier for this warning.
    * Possible string values are:
    * - "DEPRECATED_RESOURCE_USED"
    * - "DISK_SIZE_LARGER_THAN_IMAGE_SIZE"
@@ -13091,14 +14083,15 @@
    * - "NO_RESULTS_ON_PAGE"
    * - "REQUIRED_TOS_AGREEMENT"
    * - "RESOURCE_NOT_DELETED"
+   * - "SINGLE_INSTANCE_PROPERTY_TEMPLATE"
    * - "UNREACHABLE"
    */
   core.String code;
 
-  /** Metadata for this warning in 'key: value' format. */
+  /** [Output Only] Metadata for this warning in key: value format. */
   core.List<OperationsScopedListWarningData> data;
 
-  /** Optional human-readable details for this warning. */
+  /** [Output Only] Optional human-readable details for this warning. */
   core.String message;
 
 
@@ -13132,7 +14125,6 @@
 }
 
 
-/** Not documented yet. */
 class OperationsScopedList {
   /** [Output Only] List of operations contained in this scope. */
   core.List<Operation> operations;
@@ -13180,7 +14172,6 @@
    */
   core.String defaultService;
 
-  /** Not documented yet. */
   core.String description;
 
   /** The name to which this PathMatcher is referred by the HostRule. */
@@ -13268,37 +14259,39 @@
 
 
 /**
- * A project resource. Projects can be created only in the APIs Console. Unless
- * marked otherwise, values can only be modified in the console.
+ * A Project resource. Projects can only be created in the Google Developers
+ * Console. Unless marked otherwise, values can only be modified in the console.
  */
 class Project {
   /**
    * Metadata key/value pairs available to all instances contained in this
-   * project.
+   * project. See Custom metadata for more information.
    */
   Metadata commonInstanceMetadata;
 
-  /** Creation timestamp in RFC3339 text format (output only). */
+  /** [Output Only] Creation timestamp in RFC3339 text format. */
   core.String creationTimestamp;
 
   /** An optional textual description of the resource. */
   core.String description;
 
   /**
-   * Unique identifier for the resource; defined by the server (output only).
+   * [Output Only] Unique identifier for the resource; defined by the server.
    */
   core.String id;
 
-  /** Type of the resource. */
+  /**
+   * [Output Only] Type of the resource. Always compute#project for projects.
+   */
   core.String kind;
 
   /** Name of the resource. */
   core.String name;
 
-  /** Quotas assigned to this project. */
+  /** [Output Only] Quotas assigned to this project. */
   core.List<Quota> quotas;
 
-  /** Server defined URL for the resource (output only). */
+  /** [Output Only] Server defined URL for the resource. */
   core.String selfLink;
 
   /**
@@ -13375,29 +14368,23 @@
 
 /** A quotas entry. */
 class Quota {
-  /** Quota limit for this metric. */
+  /** [Output Only] Quota limit for this metric. */
   core.double limit;
 
   /**
-   * Name of the quota metric.
+   * [Output Only] Name of the quota metric.
    * Possible string values are:
    * - "BACKEND_SERVICES"
    * - "CPUS"
-   * - "DISKS"
    * - "DISKS_TOTAL_GB"
-   * - "EPHEMERAL_ADDRESSES"
    * - "FIREWALLS"
    * - "FORWARDING_RULES"
    * - "HEALTH_CHECKS"
    * - "IMAGES"
-   * - "IMAGES_TOTAL_GB"
    * - "INSTANCES"
    * - "IN_USE_ADDRESSES"
-   * - "KERNELS"
-   * - "KERNELS_TOTAL_GB"
    * - "LOCAL_SSD_TOTAL_GB"
    * - "NETWORKS"
-   * - "OPERATIONS"
    * - "ROUTES"
    * - "SNAPSHOTS"
    * - "SSD_TOTAL_GB"
@@ -13409,7 +14396,7 @@
    */
   core.String metric;
 
-  /** Current usage of this metric. */
+  /** [Output Only] Current usage of this metric. */
   core.double usage;
 
 
@@ -13445,41 +14432,44 @@
 
 /** Region resource. */
 class Region {
-  /** Creation timestamp in RFC3339 text format (output only). */
+  /** [Output Only] Creation timestamp in RFC3339 text format. */
   core.String creationTimestamp;
 
-  /** The deprecation status associated with this region. */
+  /** [Output Only] The deprecation status associated with this region. */
   DeprecationStatus deprecated;
 
-  /** Textual description of the resource. */
+  /** [Output Only] Textual description of the resource. */
   core.String description;
 
   /**
-   * Unique identifier for the resource; defined by the server (output only).
+   * [Output Only] Unique identifier for the resource; defined by the server .
    */
   core.String id;
 
-  /** Type of the resource. */
+  /** [Output Only] Type of the resource. Always compute#region for regions. */
   core.String kind;
 
-  /** Name of the resource. */
+  /** [Output Only] Name of the resource. */
   core.String name;
 
-  /** Quotas assigned to this region. */
+  /** [Output Only] Quotas assigned to this region. */
   core.List<Quota> quotas;
 
-  /** Server defined URL for the resource (output only). */
+  /** [Output Only] Server defined URL for the resource. */
   core.String selfLink;
 
   /**
-   * Status of the region, "UP" or "DOWN".
+   * [Output Only] Status of the region, either UP or DOWN.
    * Possible string values are:
    * - "DOWN"
    * - "UP"
    */
   core.String status;
 
-  /** A list of zones homed in this region, in the form of resource URLs. */
+  /**
+   * [Output Only] A list of zones available in this region, in the form of
+   * resource URLs.
+   */
   core.List<core.String> zones;
 
 
@@ -13558,20 +14548,23 @@
 /** Contains a list of region resources. */
 class RegionList {
   /**
-   * Unique identifier for the resource; defined by the server (output only).
+   * [Output Only] Unique identifier for the resource; defined by the server.
    */
   core.String id;
 
-  /** A list of Region resources. */
+  /** [Output Only] A list of Region resources. */
   core.List<Region> items;
 
-  /** Type of resource. */
+  /**
+   * [Output Only] Type of resource. Always compute#regionList for lists of
+   * regions.
+   */
   core.String kind;
 
-  /** A token used to continue a truncated list request (output only). */
+  /** [Output Only] A token used to continue a truncated list request. */
   core.String nextPageToken;
 
-  /** Server defined URL for this resource (output only). */
+  /** [Output Only] Server defined URL for this resource. */
   core.String selfLink;
 
 
@@ -13617,7 +14610,6 @@
 }
 
 
-/** Not documented yet. */
 class ResourceGroupReference {
   /**
    * A URI referencing one of the resource views listed in the backend service.
@@ -13643,12 +14635,11 @@
 }
 
 
-/** Not documented yet. */
 class RouteWarningsData {
-  /** A key for the warning data. */
+  /** [Output Only] A key for the warning data. */
   core.String key;
 
-  /** A warning data value corresponding to the key. */
+  /** [Output Only] A warning data value corresponding to the key. */
   core.String value;
 
 
@@ -13676,10 +14667,9 @@
 }
 
 
-/** Not documented yet. */
 class RouteWarnings {
   /**
-   * The warning type identifier for this warning.
+   * [Output Only] The warning type identifier for this warning.
    * Possible string values are:
    * - "DEPRECATED_RESOURCE_USED"
    * - "DISK_SIZE_LARGER_THAN_IMAGE_SIZE"
@@ -13692,14 +14682,15 @@
    * - "NO_RESULTS_ON_PAGE"
    * - "REQUIRED_TOS_AGREEMENT"
    * - "RESOURCE_NOT_DELETED"
+   * - "SINGLE_INSTANCE_PROPERTY_TEMPLATE"
    * - "UNREACHABLE"
    */
   core.String code;
 
-  /** Metadata for this warning in 'key: value' format. */
+  /** [Output Only] Metadata for this warning in key: value format. */
   core.List<RouteWarningsData> data;
 
-  /** Optional human-readable details for this warning. */
+  /** [Output Only] Optional human-readable details for this warning. */
   core.String message;
 
 
@@ -13794,6 +14785,9 @@
   /** The URL of the local network if it should handle matching packets. */
   core.String nextHopNetwork;
 
+  /** The URL to a VpnTunnel that should handle matching packets. */
+  core.String nextHopVpnTunnel;
+
   /**
    * Breaks ties between Routes of equal specificity. Routes with smaller values
    * win when tied with routes with larger values.
@@ -13849,6 +14843,9 @@
     if (_json.containsKey("nextHopNetwork")) {
       nextHopNetwork = _json["nextHopNetwork"];
     }
+    if (_json.containsKey("nextHopVpnTunnel")) {
+      nextHopVpnTunnel = _json["nextHopVpnTunnel"];
+    }
     if (_json.containsKey("priority")) {
       priority = _json["priority"];
     }
@@ -13898,6 +14895,9 @@
     if (nextHopNetwork != null) {
       _json["nextHopNetwork"] = nextHopNetwork;
     }
+    if (nextHopVpnTunnel != null) {
+      _json["nextHopVpnTunnel"] = nextHopVpnTunnel;
+    }
     if (priority != null) {
       _json["priority"] = priority;
     }
@@ -13977,17 +14977,17 @@
 }
 
 
-/** Scheduling options for an Instance. */
+/** Sets the scheduling options for an Instance. */
 class Scheduling {
   /**
-   * Whether the Instance should be automatically restarted whenever it is
-   * terminated by Compute Engine (not terminated by user).
+   * Specifies whether the instance should be automatically restarted if it is
+   * terminated by Compute Engine (not terminated by a user).
    */
   core.bool automaticRestart;
 
   /**
-   * How the instance should behave when the host machine undergoes maintenance
-   * that may temporarily impact instance performance.
+   * Defines the maintenance behavior for this instance. The default behavior is
+   * MIGRATE. For more information, see Setting maintenance behavior.
    * Possible string values are:
    * - "MIGRATE"
    * - "TERMINATE"
@@ -14019,15 +15019,18 @@
 }
 
 
-/** An instance serial console output. */
+/** An instance's serial console output. */
 class SerialPortOutput {
-  /** The contents of the console output. */
+  /** [Output Only] The contents of the console output. */
   core.String contents;
 
-  /** Type of the resource. */
+  /**
+   * [Output Only] Type of the resource. Always compute#serialPortOutput for
+   * serial port output.
+   */
   core.String kind;
 
-  /** Server defined URL for the resource (output only). */
+  /** [Output Only] Server defined URL for the resource. */
   core.String selfLink;
 
 
@@ -14320,9 +15323,13 @@
 /** A set of instance tags. */
 class Tags {
   /**
-   * Fingerprint of this resource. A hash of the tags stored in this object.
-   * This field is used optimistic locking. An up-to-date tags fingerprint must
-   * be provided in order to modify tags.
+   * Specifies a fingerprint for this request, which is essentially a hash of
+   * the metadata's contents and used for optimistic locking. The fingerprint is
+   * initially generated by Compute Engine and changes after every request to
+   * modify or update metadata. You must always provide an up-to-date
+   * fingerprint hash in order to update or change metadata.
+   *
+   * To see the latest fingerprint, make get() request to the instance.
    */
   core.String fingerprint;
 
@@ -14628,7 +15635,6 @@
 }
 
 
-/** Not documented yet. */
 class TargetInstanceAggregatedList {
   /**
    * Unique identifier for the resource; defined by the server (output only).
@@ -14655,7 +15661,7 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items = common_internal.mapMap(_json["items"], (item) => new TargetInstancesScopedList.fromJson(item));
+      items = commons.mapMap(_json["items"], (item) => new TargetInstancesScopedList.fromJson(item));
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -14674,7 +15680,7 @@
       _json["id"] = id;
     }
     if (items != null) {
-      _json["items"] = common_internal.mapMap(items, (item) => (item).toJson());
+      _json["items"] = commons.mapMap(items, (item) => (item).toJson());
     }
     if (kind != null) {
       _json["kind"] = kind;
@@ -14752,12 +15758,11 @@
 }
 
 
-/** Not documented yet. */
 class TargetInstancesScopedListWarningData {
-  /** A key for the warning data. */
+  /** [Output Only] A key for the warning data. */
   core.String key;
 
-  /** A warning data value corresponding to the key. */
+  /** [Output Only] A warning data value corresponding to the key. */
   core.String value;
 
 
@@ -14791,7 +15796,7 @@
  */
 class TargetInstancesScopedListWarning {
   /**
-   * The warning type identifier for this warning.
+   * [Output Only] The warning type identifier for this warning.
    * Possible string values are:
    * - "DEPRECATED_RESOURCE_USED"
    * - "DISK_SIZE_LARGER_THAN_IMAGE_SIZE"
@@ -14804,14 +15809,15 @@
    * - "NO_RESULTS_ON_PAGE"
    * - "REQUIRED_TOS_AGREEMENT"
    * - "RESOURCE_NOT_DELETED"
+   * - "SINGLE_INSTANCE_PROPERTY_TEMPLATE"
    * - "UNREACHABLE"
    */
   core.String code;
 
-  /** Metadata for this warning in 'key: value' format. */
+  /** [Output Only] Metadata for this warning in key: value format. */
   core.List<TargetInstancesScopedListWarningData> data;
 
-  /** Optional human-readable details for this warning. */
+  /** [Output Only] Optional human-readable details for this warning. */
   core.String message;
 
 
@@ -14845,7 +15851,6 @@
 }
 
 
-/** Not documented yet. */
 class TargetInstancesScopedList {
   /** List of target instances contained in this scope. */
   core.List<TargetInstance> targetInstances;
@@ -15061,7 +16066,6 @@
 }
 
 
-/** Not documented yet. */
 class TargetPoolAggregatedList {
   /**
    * Unique identifier for the resource; defined by the server (output only).
@@ -15088,7 +16092,7 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items = common_internal.mapMap(_json["items"], (item) => new TargetPoolsScopedList.fromJson(item));
+      items = commons.mapMap(_json["items"], (item) => new TargetPoolsScopedList.fromJson(item));
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -15107,7 +16111,7 @@
       _json["id"] = id;
     }
     if (items != null) {
-      _json["items"] = common_internal.mapMap(items, (item) => (item).toJson());
+      _json["items"] = commons.mapMap(items, (item) => (item).toJson());
     }
     if (kind != null) {
       _json["kind"] = kind;
@@ -15123,9 +16127,7 @@
 }
 
 
-/** Not documented yet. */
 class TargetPoolInstanceHealth {
-  /** Not documented yet. */
   core.List<HealthStatus> healthStatus;
 
   /** Type of resource. */
@@ -15218,7 +16220,6 @@
 }
 
 
-/** Not documented yet. */
 class TargetPoolsAddHealthCheckRequest {
   /** Health check URLs to be added to targetPool. */
   core.List<HealthCheckReference> healthChecks;
@@ -15242,7 +16243,6 @@
 }
 
 
-/** Not documented yet. */
 class TargetPoolsAddInstanceRequest {
   /** URLs of the instances to be added to targetPool. */
   core.List<InstanceReference> instances;
@@ -15266,7 +16266,6 @@
 }
 
 
-/** Not documented yet. */
 class TargetPoolsRemoveHealthCheckRequest {
   /** Health check URLs to be removed from targetPool. */
   core.List<HealthCheckReference> healthChecks;
@@ -15290,7 +16289,6 @@
 }
 
 
-/** Not documented yet. */
 class TargetPoolsRemoveInstanceRequest {
   /** URLs of the instances to be removed from targetPool. */
   core.List<InstanceReference> instances;
@@ -15314,12 +16312,11 @@
 }
 
 
-/** Not documented yet. */
 class TargetPoolsScopedListWarningData {
-  /** A key for the warning data. */
+  /** [Output Only] A key for the warning data. */
   core.String key;
 
-  /** A warning data value corresponding to the key. */
+  /** [Output Only] A warning data value corresponding to the key. */
   core.String value;
 
 
@@ -15353,7 +16350,7 @@
  */
 class TargetPoolsScopedListWarning {
   /**
-   * The warning type identifier for this warning.
+   * [Output Only] The warning type identifier for this warning.
    * Possible string values are:
    * - "DEPRECATED_RESOURCE_USED"
    * - "DISK_SIZE_LARGER_THAN_IMAGE_SIZE"
@@ -15366,14 +16363,15 @@
    * - "NO_RESULTS_ON_PAGE"
    * - "REQUIRED_TOS_AGREEMENT"
    * - "RESOURCE_NOT_DELETED"
+   * - "SINGLE_INSTANCE_PROPERTY_TEMPLATE"
    * - "UNREACHABLE"
    */
   core.String code;
 
-  /** Metadata for this warning in 'key: value' format. */
+  /** [Output Only] Metadata for this warning in key: value format. */
   core.List<TargetPoolsScopedListWarningData> data;
 
-  /** Optional human-readable details for this warning. */
+  /** [Output Only] Optional human-readable details for this warning. */
   core.String message;
 
 
@@ -15407,7 +16405,6 @@
 }
 
 
-/** Not documented yet. */
 class TargetPoolsScopedList {
   /** List of target pools contained in this scope. */
   core.List<TargetPool> targetPools;
@@ -15443,9 +16440,7 @@
 }
 
 
-/** Not documented yet. */
 class TargetReference {
-  /** Not documented yet. */
   core.String target;
 
 
@@ -15467,18 +16462,411 @@
 }
 
 
-/** Not documented yet. */
+class TargetVpnGateway {
+  /** [Output Only] Creation timestamp in RFC3339 text format. */
+  core.String creationTimestamp;
+
+  /**
+   * An optional textual description of the resource. Provided by the client
+   * when the resource is created.
+   */
+  core.String description;
+
+  /**
+   * [Output Only] A list of URLs to the ForwardingRule resources.
+   * ForwardingRules are created using compute.forwardingRules.insert and
+   * associated to a VPN gateway.
+   */
+  core.List<core.String> forwardingRules;
+
+  /**
+   * [Output Only] Unique identifier for the resource. Defined by the server.
+   */
+  core.String id;
+
+  /**
+   * [Output Only] Type of resource. Always compute#targetVpnGateway for target
+   * VPN gateways.
+   */
+  core.String kind;
+
+  /**
+   * Name of the resource. Provided by the client when the resource is created.
+   * The name must be 1-63 characters long and comply with RFC1035.
+   */
+  core.String name;
+
+  /**
+   * URL of the network to which this VPN gateway is attached. Provided by the
+   * client when the VPN gateway is created.
+   */
+  core.String network;
+
+  /** [Output Only] URL of the region where the target VPN gateway resides. */
+  core.String region;
+
+  /** [Output Only] Server-defined URL for the resource. */
+  core.String selfLink;
+
+  /**
+   * [Output Only] The status of the VPN gateway.
+   * Possible string values are:
+   * - "CREATING"
+   * - "DELETING"
+   * - "FAILED"
+   * - "READY"
+   */
+  core.String status;
+
+  /**
+   * [Output Only] A list of URLs to VpnTunnel resources. VpnTunnels are created
+   * using compute.vpntunnels.insert and associated to a VPN gateway.
+   */
+  core.List<core.String> tunnels;
+
+
+  TargetVpnGateway();
+
+  TargetVpnGateway.fromJson(core.Map _json) {
+    if (_json.containsKey("creationTimestamp")) {
+      creationTimestamp = _json["creationTimestamp"];
+    }
+    if (_json.containsKey("description")) {
+      description = _json["description"];
+    }
+    if (_json.containsKey("forwardingRules")) {
+      forwardingRules = _json["forwardingRules"];
+    }
+    if (_json.containsKey("id")) {
+      id = _json["id"];
+    }
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+    if (_json.containsKey("name")) {
+      name = _json["name"];
+    }
+    if (_json.containsKey("network")) {
+      network = _json["network"];
+    }
+    if (_json.containsKey("region")) {
+      region = _json["region"];
+    }
+    if (_json.containsKey("selfLink")) {
+      selfLink = _json["selfLink"];
+    }
+    if (_json.containsKey("status")) {
+      status = _json["status"];
+    }
+    if (_json.containsKey("tunnels")) {
+      tunnels = _json["tunnels"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (creationTimestamp != null) {
+      _json["creationTimestamp"] = creationTimestamp;
+    }
+    if (description != null) {
+      _json["description"] = description;
+    }
+    if (forwardingRules != null) {
+      _json["forwardingRules"] = forwardingRules;
+    }
+    if (id != null) {
+      _json["id"] = id;
+    }
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    if (name != null) {
+      _json["name"] = name;
+    }
+    if (network != null) {
+      _json["network"] = network;
+    }
+    if (region != null) {
+      _json["region"] = region;
+    }
+    if (selfLink != null) {
+      _json["selfLink"] = selfLink;
+    }
+    if (status != null) {
+      _json["status"] = status;
+    }
+    if (tunnels != null) {
+      _json["tunnels"] = tunnels;
+    }
+    return _json;
+  }
+}
+
+
+class TargetVpnGatewayAggregatedList {
+  /**
+   * [Output Only] Unique identifier for the resource. Defined by the server.
+   */
+  core.String id;
+
+  /** A map of scoped target vpn gateway lists. */
+  core.Map<core.String, TargetVpnGatewaysScopedList> items;
+
+  /**
+   * [Output Only] Type of resource. Always compute#targetVpnGateway for target
+   * VPN gateways.
+   */
+  core.String kind;
+
+  /** [Output Only] A token used to continue a truncated list request. */
+  core.String nextPageToken;
+
+  /** [Output Only] Server-defined URL for the resource. */
+  core.String selfLink;
+
+
+  TargetVpnGatewayAggregatedList();
+
+  TargetVpnGatewayAggregatedList.fromJson(core.Map _json) {
+    if (_json.containsKey("id")) {
+      id = _json["id"];
+    }
+    if (_json.containsKey("items")) {
+      items = commons.mapMap(_json["items"], (item) => new TargetVpnGatewaysScopedList.fromJson(item));
+    }
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+    if (_json.containsKey("nextPageToken")) {
+      nextPageToken = _json["nextPageToken"];
+    }
+    if (_json.containsKey("selfLink")) {
+      selfLink = _json["selfLink"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (id != null) {
+      _json["id"] = id;
+    }
+    if (items != null) {
+      _json["items"] = commons.mapMap(items, (item) => (item).toJson());
+    }
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    if (nextPageToken != null) {
+      _json["nextPageToken"] = nextPageToken;
+    }
+    if (selfLink != null) {
+      _json["selfLink"] = selfLink;
+    }
+    return _json;
+  }
+}
+
+
+/** Contains a list of TargetVpnGateway resources. */
+class TargetVpnGatewayList {
+  /**
+   * [Output Only] Unique identifier for the resource. Defined by the server.
+   */
+  core.String id;
+
+  /** [Output Only] A list of TargetVpnGateway resources. */
+  core.List<TargetVpnGateway> items;
+
+  /**
+   * [Output Only] Type of resource. Always compute#targetVpnGateway for target
+   * VPN gateways.
+   */
+  core.String kind;
+
+  /** [Output Only] A token used to continue a truncated list request. */
+  core.String nextPageToken;
+
+  /** [Output Only] Server-defined URL for the resource. */
+  core.String selfLink;
+
+
+  TargetVpnGatewayList();
+
+  TargetVpnGatewayList.fromJson(core.Map _json) {
+    if (_json.containsKey("id")) {
+      id = _json["id"];
+    }
+    if (_json.containsKey("items")) {
+      items = _json["items"].map((value) => new TargetVpnGateway.fromJson(value)).toList();
+    }
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+    if (_json.containsKey("nextPageToken")) {
+      nextPageToken = _json["nextPageToken"];
+    }
+    if (_json.containsKey("selfLink")) {
+      selfLink = _json["selfLink"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (id != null) {
+      _json["id"] = id;
+    }
+    if (items != null) {
+      _json["items"] = items.map((value) => (value).toJson()).toList();
+    }
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    if (nextPageToken != null) {
+      _json["nextPageToken"] = nextPageToken;
+    }
+    if (selfLink != null) {
+      _json["selfLink"] = selfLink;
+    }
+    return _json;
+  }
+}
+
+
+class TargetVpnGatewaysScopedListWarningData {
+  /** [Output Only] A key for the warning data. */
+  core.String key;
+
+  /** [Output Only] A warning data value corresponding to the key. */
+  core.String value;
+
+
+  TargetVpnGatewaysScopedListWarningData();
+
+  TargetVpnGatewaysScopedListWarningData.fromJson(core.Map _json) {
+    if (_json.containsKey("key")) {
+      key = _json["key"];
+    }
+    if (_json.containsKey("value")) {
+      value = _json["value"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (key != null) {
+      _json["key"] = key;
+    }
+    if (value != null) {
+      _json["value"] = value;
+    }
+    return _json;
+  }
+}
+
+
+/**
+ * [Output Only] Informational warning which replaces the list of addresses when
+ * the list is empty.
+ */
+class TargetVpnGatewaysScopedListWarning {
+  /**
+   * [Output Only] The warning type identifier for this warning.
+   * Possible string values are:
+   * - "DEPRECATED_RESOURCE_USED"
+   * - "DISK_SIZE_LARGER_THAN_IMAGE_SIZE"
+   * - "INJECTED_KERNELS_DEPRECATED"
+   * - "NEXT_HOP_ADDRESS_NOT_ASSIGNED"
+   * - "NEXT_HOP_CANNOT_IP_FORWARD"
+   * - "NEXT_HOP_INSTANCE_NOT_FOUND"
+   * - "NEXT_HOP_INSTANCE_NOT_ON_NETWORK"
+   * - "NEXT_HOP_NOT_RUNNING"
+   * - "NO_RESULTS_ON_PAGE"
+   * - "REQUIRED_TOS_AGREEMENT"
+   * - "RESOURCE_NOT_DELETED"
+   * - "SINGLE_INSTANCE_PROPERTY_TEMPLATE"
+   * - "UNREACHABLE"
+   */
+  core.String code;
+
+  /** [Output Only] Metadata for this warning in key: value format. */
+  core.List<TargetVpnGatewaysScopedListWarningData> data;
+
+  /** [Output Only] Optional human-readable details for this warning. */
+  core.String message;
+
+
+  TargetVpnGatewaysScopedListWarning();
+
+  TargetVpnGatewaysScopedListWarning.fromJson(core.Map _json) {
+    if (_json.containsKey("code")) {
+      code = _json["code"];
+    }
+    if (_json.containsKey("data")) {
+      data = _json["data"].map((value) => new TargetVpnGatewaysScopedListWarningData.fromJson(value)).toList();
+    }
+    if (_json.containsKey("message")) {
+      message = _json["message"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (code != null) {
+      _json["code"] = code;
+    }
+    if (data != null) {
+      _json["data"] = data.map((value) => (value).toJson()).toList();
+    }
+    if (message != null) {
+      _json["message"] = message;
+    }
+    return _json;
+  }
+}
+
+
+class TargetVpnGatewaysScopedList {
+  /** [Output Only] List of target vpn gateways contained in this scope. */
+  core.List<TargetVpnGateway> targetVpnGateways;
+
+  /**
+   * [Output Only] Informational warning which replaces the list of addresses
+   * when the list is empty.
+   */
+  TargetVpnGatewaysScopedListWarning warning;
+
+
+  TargetVpnGatewaysScopedList();
+
+  TargetVpnGatewaysScopedList.fromJson(core.Map _json) {
+    if (_json.containsKey("targetVpnGateways")) {
+      targetVpnGateways = _json["targetVpnGateways"].map((value) => new TargetVpnGateway.fromJson(value)).toList();
+    }
+    if (_json.containsKey("warning")) {
+      warning = new TargetVpnGatewaysScopedListWarning.fromJson(_json["warning"]);
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (targetVpnGateways != null) {
+      _json["targetVpnGateways"] = targetVpnGateways.map((value) => (value).toJson()).toList();
+    }
+    if (warning != null) {
+      _json["warning"] = (warning).toJson();
+    }
+    return _json;
+  }
+}
+
+
 class TestFailure {
-  /** Not documented yet. */
   core.String actualService;
 
-  /** Not documented yet. */
   core.String expectedService;
 
-  /** Not documented yet. */
   core.String host;
 
-  /** Not documented yet. */
   core.String path;
 
 
@@ -15722,9 +17110,7 @@
 }
 
 
-/** Not documented yet. */
 class UrlMapReference {
-  /** Not documented yet. */
   core.String urlMap;
 
 
@@ -15799,7 +17185,6 @@
 
 /** Message representing the validation result for a UrlMap. */
 class UrlMapValidationResult {
-  /** Not documented yet. */
   core.List<core.String> loadErrors;
 
   /**
@@ -15808,7 +17193,6 @@
    */
   core.bool loadSucceeded;
 
-  /** Not documented yet. */
   core.List<TestFailure> testFailures;
 
   /**
@@ -15854,7 +17238,6 @@
 }
 
 
-/** Not documented yet. */
 class UrlMapsValidateRequest {
   /** Content of the UrlMap to be validated. */
   UrlMap resource;
@@ -15878,9 +17261,7 @@
 }
 
 
-/** Not documented yet. */
 class UrlMapsValidateResponse {
-  /** Not documented yet. */
   UrlMapValidationResult result;
 
 
@@ -15910,17 +17291,17 @@
   /**
    * The name of an existing bucket in Cloud Storage where the usage report
    * object is stored. The Google Service Account is granted write access to
-   * this bucket. This is simply the bucket name, with no "gs://" or
-   * "https://storage.googleapis.com/" in front of it.
+   * this bucket. This is just the bucket name, with no gs:// or
+   * https://storage.googleapis.com/ in front of it.
    */
   core.String bucketName;
 
   /**
    * An optional prefix for the name of the usage report object stored in
-   * bucket_name. If not supplied, defaults to "usage_". The report is stored as
-   * a CSV file named _gce_.csv. where  is the day of the usage according to
-   * Pacific Time. The prefix should conform to Cloud Storage object naming
-   * conventions.
+   * bucketName. If not supplied, defaults to usage. The report is stored as a
+   * CSV file named report_name_prefix_gce_YYYYMMDD.csv where YYYYMMDD is the
+   * day of the usage according to Pacific Time. If you supply a prefix, it
+   * should conform to Cloud Storage object naming conventions.
    */
   core.String reportNamePrefix;
 
@@ -15949,18 +17330,460 @@
 }
 
 
-/** Not documented yet. */
-class ZoneMaintenanceWindows {
-  /** Begin time of the maintenance window, in RFC 3339 format. */
-  core.String beginTime;
+class VpnTunnel {
+  /** [Output Only] Creation timestamp in RFC3339 text format. */
+  core.String creationTimestamp;
 
-  /** Textual description of the maintenance window. */
+  /**
+   * An optional textual description of the resource. Provided by the client
+   * when the resource is created.
+   */
   core.String description;
 
-  /** End time of the maintenance window, in RFC 3339 format. */
+  /** [Output Only] Detailed status message for the VPN tunnel. */
+  core.String detailedStatus;
+
+  /**
+   * [Output Only] Unique identifier for the resource. Defined by the server.
+   */
+  core.String id;
+
+  /**
+   * IKE networks to use when establishing the VPN tunnel with peer VPN gateway.
+   * The value should be a CIDR formatted string, for example: 192.168.0.0/16.
+   * The ranges should be disjoint.
+   */
+  core.List<core.String> ikeNetworks;
+
+  /**
+   * IKE protocol version to use when establishing the VPN tunnel with peer VPN
+   * gateway. Acceptable IKE versions are 1 or 2. Default version is 2.
+   */
+  core.int ikeVersion;
+
+  /**
+   * [Output Only] Type of resource. Always compute#vpnTunnel for VPN tunnels.
+   */
+  core.String kind;
+
+  /**
+   * Name of the resource. Provided by the client when the resource is created.
+   * The name must be 1-63 characters long and comply with RFC1035.
+   */
+  core.String name;
+
+  /** IP address of the peer VPN gateway. */
+  core.String peerIp;
+
+  /** [Output Only] URL of the region where the VPN tunnel resides. */
+  core.String region;
+
+  /** [Output Only] Server defined URL for the resource. */
+  core.String selfLink;
+
+  /**
+   * Shared secret used to set the secure session between the GCE VPN gateway
+   * and the peer VPN gateway.
+   */
+  core.String sharedSecret;
+
+  /** Hash of the shared secret. */
+  core.String sharedSecretHash;
+
+  /**
+   * [Output Only] The status of the VPN tunnel.
+   * Possible string values are:
+   * - "AUTHORIZATION_ERROR"
+   * - "DEPROVISIONING"
+   * - "ESTABLISHED"
+   * - "FAILED"
+   * - "FIRST_HANDSHAKE"
+   * - "NEGOTIATION_FAILURE"
+   * - "NETWORK_ERROR"
+   * - "PROVISIONING"
+   * - "WAITING_FOR_FULL_CONFIG"
+   */
+  core.String status;
+
+  /**
+   * URL of the VPN gateway to which this VPN tunnel is associated. Provided by
+   * the client when the VPN tunnel is created.
+   */
+  core.String targetVpnGateway;
+
+
+  VpnTunnel();
+
+  VpnTunnel.fromJson(core.Map _json) {
+    if (_json.containsKey("creationTimestamp")) {
+      creationTimestamp = _json["creationTimestamp"];
+    }
+    if (_json.containsKey("description")) {
+      description = _json["description"];
+    }
+    if (_json.containsKey("detailedStatus")) {
+      detailedStatus = _json["detailedStatus"];
+    }
+    if (_json.containsKey("id")) {
+      id = _json["id"];
+    }
+    if (_json.containsKey("ikeNetworks")) {
+      ikeNetworks = _json["ikeNetworks"];
+    }
+    if (_json.containsKey("ikeVersion")) {
+      ikeVersion = _json["ikeVersion"];
+    }
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+    if (_json.containsKey("name")) {
+      name = _json["name"];
+    }
+    if (_json.containsKey("peerIp")) {
+      peerIp = _json["peerIp"];
+    }
+    if (_json.containsKey("region")) {
+      region = _json["region"];
+    }
+    if (_json.containsKey("selfLink")) {
+      selfLink = _json["selfLink"];
+    }
+    if (_json.containsKey("sharedSecret")) {
+      sharedSecret = _json["sharedSecret"];
+    }
+    if (_json.containsKey("sharedSecretHash")) {
+      sharedSecretHash = _json["sharedSecretHash"];
+    }
+    if (_json.containsKey("status")) {
+      status = _json["status"];
+    }
+    if (_json.containsKey("targetVpnGateway")) {
+      targetVpnGateway = _json["targetVpnGateway"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (creationTimestamp != null) {
+      _json["creationTimestamp"] = creationTimestamp;
+    }
+    if (description != null) {
+      _json["description"] = description;
+    }
+    if (detailedStatus != null) {
+      _json["detailedStatus"] = detailedStatus;
+    }
+    if (id != null) {
+      _json["id"] = id;
+    }
+    if (ikeNetworks != null) {
+      _json["ikeNetworks"] = ikeNetworks;
+    }
+    if (ikeVersion != null) {
+      _json["ikeVersion"] = ikeVersion;
+    }
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    if (name != null) {
+      _json["name"] = name;
+    }
+    if (peerIp != null) {
+      _json["peerIp"] = peerIp;
+    }
+    if (region != null) {
+      _json["region"] = region;
+    }
+    if (selfLink != null) {
+      _json["selfLink"] = selfLink;
+    }
+    if (sharedSecret != null) {
+      _json["sharedSecret"] = sharedSecret;
+    }
+    if (sharedSecretHash != null) {
+      _json["sharedSecretHash"] = sharedSecretHash;
+    }
+    if (status != null) {
+      _json["status"] = status;
+    }
+    if (targetVpnGateway != null) {
+      _json["targetVpnGateway"] = targetVpnGateway;
+    }
+    return _json;
+  }
+}
+
+
+class VpnTunnelAggregatedList {
+  /**
+   * [Output Only] Unique identifier for the resource; defined by the server.
+   */
+  core.String id;
+
+  /** [Output Only] A map of scoped vpn tunnel lists. */
+  core.Map<core.String, VpnTunnelsScopedList> items;
+
+  /**
+   * [Output Only] Type of resource. Always compute#vpnTunnel for VPN tunnels.
+   */
+  core.String kind;
+
+  /** [Output Only] A token used to continue a truncated list request. */
+  core.String nextPageToken;
+
+  /** [Output Only] Server defined URL for this resource. */
+  core.String selfLink;
+
+
+  VpnTunnelAggregatedList();
+
+  VpnTunnelAggregatedList.fromJson(core.Map _json) {
+    if (_json.containsKey("id")) {
+      id = _json["id"];
+    }
+    if (_json.containsKey("items")) {
+      items = commons.mapMap(_json["items"], (item) => new VpnTunnelsScopedList.fromJson(item));
+    }
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+    if (_json.containsKey("nextPageToken")) {
+      nextPageToken = _json["nextPageToken"];
+    }
+    if (_json.containsKey("selfLink")) {
+      selfLink = _json["selfLink"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (id != null) {
+      _json["id"] = id;
+    }
+    if (items != null) {
+      _json["items"] = commons.mapMap(items, (item) => (item).toJson());
+    }
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    if (nextPageToken != null) {
+      _json["nextPageToken"] = nextPageToken;
+    }
+    if (selfLink != null) {
+      _json["selfLink"] = selfLink;
+    }
+    return _json;
+  }
+}
+
+
+/** Contains a list of VpnTunnel resources. */
+class VpnTunnelList {
+  /**
+   * [Output Only] Unique identifier for the resource; defined by the server.
+   */
+  core.String id;
+
+  /** [Output Only] A list of VpnTunnel resources. */
+  core.List<VpnTunnel> items;
+
+  /**
+   * [Output Only] Type of resource. Always compute#vpnTunnel for VPN tunnels.
+   */
+  core.String kind;
+
+  /** [Output Only] A token used to continue a truncated list request. */
+  core.String nextPageToken;
+
+  /** [Output Only] Server-defined URL for the resource. */
+  core.String selfLink;
+
+
+  VpnTunnelList();
+
+  VpnTunnelList.fromJson(core.Map _json) {
+    if (_json.containsKey("id")) {
+      id = _json["id"];
+    }
+    if (_json.containsKey("items")) {
+      items = _json["items"].map((value) => new VpnTunnel.fromJson(value)).toList();
+    }
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+    if (_json.containsKey("nextPageToken")) {
+      nextPageToken = _json["nextPageToken"];
+    }
+    if (_json.containsKey("selfLink")) {
+      selfLink = _json["selfLink"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (id != null) {
+      _json["id"] = id;
+    }
+    if (items != null) {
+      _json["items"] = items.map((value) => (value).toJson()).toList();
+    }
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    if (nextPageToken != null) {
+      _json["nextPageToken"] = nextPageToken;
+    }
+    if (selfLink != null) {
+      _json["selfLink"] = selfLink;
+    }
+    return _json;
+  }
+}
+
+
+class VpnTunnelsScopedListWarningData {
+  /** [Output Only] A key for the warning data. */
+  core.String key;
+
+  /** [Output Only] A warning data value corresponding to the key. */
+  core.String value;
+
+
+  VpnTunnelsScopedListWarningData();
+
+  VpnTunnelsScopedListWarningData.fromJson(core.Map _json) {
+    if (_json.containsKey("key")) {
+      key = _json["key"];
+    }
+    if (_json.containsKey("value")) {
+      value = _json["value"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (key != null) {
+      _json["key"] = key;
+    }
+    if (value != null) {
+      _json["value"] = value;
+    }
+    return _json;
+  }
+}
+
+
+/**
+ * Informational warning which replaces the list of addresses when the list is
+ * empty.
+ */
+class VpnTunnelsScopedListWarning {
+  /**
+   * [Output Only] The warning type identifier for this warning.
+   * Possible string values are:
+   * - "DEPRECATED_RESOURCE_USED"
+   * - "DISK_SIZE_LARGER_THAN_IMAGE_SIZE"
+   * - "INJECTED_KERNELS_DEPRECATED"
+   * - "NEXT_HOP_ADDRESS_NOT_ASSIGNED"
+   * - "NEXT_HOP_CANNOT_IP_FORWARD"
+   * - "NEXT_HOP_INSTANCE_NOT_FOUND"
+   * - "NEXT_HOP_INSTANCE_NOT_ON_NETWORK"
+   * - "NEXT_HOP_NOT_RUNNING"
+   * - "NO_RESULTS_ON_PAGE"
+   * - "REQUIRED_TOS_AGREEMENT"
+   * - "RESOURCE_NOT_DELETED"
+   * - "SINGLE_INSTANCE_PROPERTY_TEMPLATE"
+   * - "UNREACHABLE"
+   */
+  core.String code;
+
+  /** [Output Only] Metadata for this warning in key: value format. */
+  core.List<VpnTunnelsScopedListWarningData> data;
+
+  /** [Output Only] Optional human-readable details for this warning. */
+  core.String message;
+
+
+  VpnTunnelsScopedListWarning();
+
+  VpnTunnelsScopedListWarning.fromJson(core.Map _json) {
+    if (_json.containsKey("code")) {
+      code = _json["code"];
+    }
+    if (_json.containsKey("data")) {
+      data = _json["data"].map((value) => new VpnTunnelsScopedListWarningData.fromJson(value)).toList();
+    }
+    if (_json.containsKey("message")) {
+      message = _json["message"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (code != null) {
+      _json["code"] = code;
+    }
+    if (data != null) {
+      _json["data"] = data.map((value) => (value).toJson()).toList();
+    }
+    if (message != null) {
+      _json["message"] = message;
+    }
+    return _json;
+  }
+}
+
+
+class VpnTunnelsScopedList {
+  /** List of vpn tunnels contained in this scope. */
+  core.List<VpnTunnel> vpnTunnels;
+
+  /**
+   * Informational warning which replaces the list of addresses when the list is
+   * empty.
+   */
+  VpnTunnelsScopedListWarning warning;
+
+
+  VpnTunnelsScopedList();
+
+  VpnTunnelsScopedList.fromJson(core.Map _json) {
+    if (_json.containsKey("vpnTunnels")) {
+      vpnTunnels = _json["vpnTunnels"].map((value) => new VpnTunnel.fromJson(value)).toList();
+    }
+    if (_json.containsKey("warning")) {
+      warning = new VpnTunnelsScopedListWarning.fromJson(_json["warning"]);
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (vpnTunnels != null) {
+      _json["vpnTunnels"] = vpnTunnels.map((value) => (value).toJson()).toList();
+    }
+    if (warning != null) {
+      _json["warning"] = (warning).toJson();
+    }
+    return _json;
+  }
+}
+
+
+class ZoneMaintenanceWindows {
+  /**
+   * [Output Only] Starting time of the maintenance window, in RFC3339 format.
+   */
+  core.String beginTime;
+
+  /** [Output Only] Textual description of the maintenance window. */
+  core.String description;
+
+  /**
+   * [Output Only] Ending time of the maintenance window, in RFC3339 format.
+   */
   core.String endTime;
 
-  /** Name of the maintenance window. */
+  /** [Output Only] Name of the maintenance window. */
   core.String name;
 
 
@@ -16000,43 +17823,43 @@
 }
 
 
-/** A zone resource. */
+/** A Zone resource. */
 class Zone {
-  /** Creation timestamp in RFC3339 text format (output only). */
+  /** [Output Only] Creation timestamp in RFC3339 text format. */
   core.String creationTimestamp;
 
-  /** The deprecation status associated with this zone. */
+  /** [Output Only] The deprecation status associated with this zone. */
   DeprecationStatus deprecated;
 
-  /** Textual description of the resource. */
+  /** [Output Only] Textual description of the resource. */
   core.String description;
 
   /**
-   * Unique identifier for the resource; defined by the server (output only).
+   * [Output Only] Unique identifier for the resource; defined by the server.
    */
   core.String id;
 
-  /** Type of the resource. */
+  /** [Output Only] Type of the resource. Always kind#zone for zones. */
   core.String kind;
 
   /**
-   * Scheduled maintenance windows for the zone. When the zone is in a
-   * maintenance window, all resources which reside in the zone will be
-   * unavailable.
+   * [Output Only] Any scheduled maintenance windows for this zone. When the
+   * zone is in a maintenance window, all resources which reside in the zone
+   * will be unavailable. For more information, see Maintenance Windows
    */
   core.List<ZoneMaintenanceWindows> maintenanceWindows;
 
-  /** Name of the resource. */
+  /** [Output Only] Name of the resource. */
   core.String name;
 
-  /** Full URL reference to the region which hosts the zone (output only). */
+  /** [Output Only] Full URL reference to the region which hosts the zone. */
   core.String region;
 
-  /** Server defined URL for the resource (output only). */
+  /** [Output Only] Server defined URL for the resource. */
   core.String selfLink;
 
   /**
-   * Status of the zone. "UP" or "DOWN".
+   * [Output Only] Status of the zone, either UP or DOWN.
    * Possible string values are:
    * - "DOWN"
    * - "UP"
@@ -16119,17 +17942,17 @@
 /** Contains a list of zone resources. */
 class ZoneList {
   /**
-   * Unique identifier for the resource; defined by the server (output only).
+   * [Output Only] Unique identifier for the resource; defined by the server.
    */
   core.String id;
 
-  /** A list of Zone resources. */
+  /** [Output Only] A list of Zone resources. */
   core.List<Zone> items;
 
   /** Type of resource. */
   core.String kind;
 
-  /** A token used to continue a truncated list request (output only). */
+  /** [Output Only] A token used to continue a truncated list request. */
   core.String nextPageToken;
 
   /** Server defined URL for this resource (output only). */
@@ -16176,5 +17999,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/content/v2.dart b/generated/googleapis/lib/content/v2.dart
index 20b2f7e..ca3dc93 100644
--- a/generated/googleapis/lib/content/v2.dart
+++ b/generated/googleapis/lib/content/v2.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.content.v2;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client content/v2';
 
 /**
  * Manage product items, inventory, and Merchant Center accounts for Google
@@ -22,7 +25,7 @@
   static const ContentScope = "https://www.googleapis.com/auth/content";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AccountsResourceApi get accounts => new AccountsResourceApi(_requester);
   AccountshippingResourceApi get accountshipping => new AccountshippingResourceApi(_requester);
@@ -35,18 +38,52 @@
   ProductstatusesResourceApi get productstatuses => new ProductstatusesResourceApi(_requester);
 
   ContentApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "content/v2/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class AccountsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsResourceApi(common_internal.ApiRequester client) : 
+  AccountsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
+   * Returns information about the authenticated user.
+   *
+   * Request parameters:
+   *
+   * Completes with a [AccountsAuthInfoResponse].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<AccountsAuthInfoResponse> authinfo() {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+
+
+    _url = 'accounts/authinfo';
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new AccountsAuthInfoResponse.fromJson(data));
+  }
+
+  /**
    * Retrieves, inserts, updates, and deletes multiple Merchant Center
    * (sub-)accounts in a single request.
    *
@@ -56,7 +93,7 @@
    *
    * Completes with a [AccountsCustomBatchResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -67,7 +104,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -96,7 +133,7 @@
    *
    * [accountId] - The ID of the account.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -107,7 +144,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (merchantId == null) {
@@ -119,7 +156,7 @@
 
     _downloadOptions = null;
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/accounts/' + common_internal.Escaper.ecapeVariable('$accountId');
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/accounts/' + commons.Escaper.ecapeVariable('$accountId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -142,7 +179,7 @@
    *
    * Completes with a [Account].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -153,7 +190,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (merchantId == null) {
@@ -164,7 +201,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/accounts/' + common_internal.Escaper.ecapeVariable('$accountId');
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/accounts/' + commons.Escaper.ecapeVariable('$accountId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -187,7 +224,7 @@
    *
    * Completes with a [Account].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -198,7 +235,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -209,7 +246,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/accounts';
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/accounts';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -235,7 +272,7 @@
    *
    * Completes with a [AccountsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -246,7 +283,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (merchantId == null) {
@@ -260,7 +297,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/accounts';
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/accounts';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -285,7 +322,7 @@
    *
    * Completes with a [Account].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -296,7 +333,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -310,7 +347,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/accounts/' + common_internal.Escaper.ecapeVariable('$accountId');
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/accounts/' + commons.Escaper.ecapeVariable('$accountId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -335,7 +372,7 @@
    *
    * Completes with a [Account].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -346,7 +383,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -360,7 +397,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/accounts/' + common_internal.Escaper.ecapeVariable('$accountId');
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/accounts/' + commons.Escaper.ecapeVariable('$accountId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -375,11 +412,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountshippingResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountshippingResourceApi(common_internal.ApiRequester client) : 
+  AccountshippingResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -392,7 +428,7 @@
    *
    * Completes with a [AccountshippingCustomBatchResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -403,7 +439,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -435,7 +471,7 @@
    *
    * Completes with a [AccountShipping].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -446,7 +482,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (merchantId == null) {
@@ -457,7 +493,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/accountshipping/' + common_internal.Escaper.ecapeVariable('$accountId');
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/accountshipping/' + commons.Escaper.ecapeVariable('$accountId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -484,7 +520,7 @@
    *
    * Completes with a [AccountshippingListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -495,7 +531,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (merchantId == null) {
@@ -509,7 +545,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/accountshipping';
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/accountshipping';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -536,7 +572,7 @@
    *
    * Completes with a [AccountShipping].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -547,7 +583,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -561,7 +597,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/accountshipping/' + common_internal.Escaper.ecapeVariable('$accountId');
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/accountshipping/' + commons.Escaper.ecapeVariable('$accountId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -587,7 +623,7 @@
    *
    * Completes with a [AccountShipping].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -598,7 +634,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -612,7 +648,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/accountshipping/' + common_internal.Escaper.ecapeVariable('$accountId');
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/accountshipping/' + commons.Escaper.ecapeVariable('$accountId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -627,23 +663,20 @@
 }
 
 
-/** Not documented yet. */
 class AccountstatusesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountstatusesResourceApi(common_internal.ApiRequester client) : 
+  AccountstatusesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
-   * Not documented yet.
-   *
    * [request] - The metadata request object.
    *
    * Request parameters:
    *
    * Completes with a [AccountstatusesCustomBatchResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -654,7 +687,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -685,7 +718,7 @@
    *
    * Completes with a [AccountStatus].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -696,7 +729,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (merchantId == null) {
@@ -707,7 +740,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/accountstatuses/' + common_internal.Escaper.ecapeVariable('$accountId');
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/accountstatuses/' + commons.Escaper.ecapeVariable('$accountId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -733,7 +766,7 @@
    *
    * Completes with a [AccountstatusesListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -744,7 +777,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (merchantId == null) {
@@ -758,7 +791,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/accountstatuses';
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/accountstatuses';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -773,11 +806,10 @@
 }
 
 
-/** Not documented yet. */
 class AccounttaxResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccounttaxResourceApi(common_internal.ApiRequester client) : 
+  AccounttaxResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -790,7 +822,7 @@
    *
    * Completes with a [AccounttaxCustomBatchResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -801,7 +833,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -833,7 +865,7 @@
    *
    * Completes with a [AccountTax].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -844,7 +876,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (merchantId == null) {
@@ -855,7 +887,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/accounttax/' + common_internal.Escaper.ecapeVariable('$accountId');
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/accounttax/' + commons.Escaper.ecapeVariable('$accountId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -881,7 +913,7 @@
    *
    * Completes with a [AccounttaxListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -892,7 +924,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (merchantId == null) {
@@ -906,7 +938,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/accounttax';
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/accounttax';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -933,7 +965,7 @@
    *
    * Completes with a [AccountTax].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -944,7 +976,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -958,7 +990,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/accounttax/' + common_internal.Escaper.ecapeVariable('$accountId');
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/accounttax/' + commons.Escaper.ecapeVariable('$accountId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -984,7 +1016,7 @@
    *
    * Completes with a [AccountTax].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -995,7 +1027,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1009,7 +1041,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/accounttax/' + common_internal.Escaper.ecapeVariable('$accountId');
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/accounttax/' + commons.Escaper.ecapeVariable('$accountId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1024,23 +1056,20 @@
 }
 
 
-/** Not documented yet. */
 class DatafeedsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  DatafeedsResourceApi(common_internal.ApiRequester client) : 
+  DatafeedsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
-   * Not documented yet.
-   *
    * [request] - The metadata request object.
    *
    * Request parameters:
    *
    * Completes with a [DatafeedsCustomBatchResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1051,7 +1080,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1080,7 +1109,7 @@
    *
    * [datafeedId] - null
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1091,7 +1120,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (merchantId == null) {
@@ -1103,7 +1132,7 @@
 
     _downloadOptions = null;
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/datafeeds/' + common_internal.Escaper.ecapeVariable('$datafeedId');
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/datafeeds/' + commons.Escaper.ecapeVariable('$datafeedId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1126,7 +1155,7 @@
    *
    * Completes with a [Datafeed].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1137,7 +1166,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (merchantId == null) {
@@ -1148,7 +1177,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/datafeeds/' + common_internal.Escaper.ecapeVariable('$datafeedId');
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/datafeeds/' + commons.Escaper.ecapeVariable('$datafeedId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1171,7 +1200,7 @@
    *
    * Completes with a [Datafeed].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1182,7 +1211,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1193,7 +1222,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/datafeeds';
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/datafeeds';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1219,7 +1248,7 @@
    *
    * Completes with a [DatafeedsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1230,7 +1259,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (merchantId == null) {
@@ -1244,7 +1273,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/datafeeds';
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/datafeeds';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1270,7 +1299,7 @@
    *
    * Completes with a [Datafeed].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1281,7 +1310,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1295,7 +1324,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/datafeeds/' + common_internal.Escaper.ecapeVariable('$datafeedId');
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/datafeeds/' + commons.Escaper.ecapeVariable('$datafeedId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1320,7 +1349,7 @@
    *
    * Completes with a [Datafeed].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1331,7 +1360,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1345,7 +1374,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/datafeeds/' + common_internal.Escaper.ecapeVariable('$datafeedId');
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/datafeeds/' + commons.Escaper.ecapeVariable('$datafeedId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1360,23 +1389,20 @@
 }
 
 
-/** Not documented yet. */
 class DatafeedstatusesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  DatafeedstatusesResourceApi(common_internal.ApiRequester client) : 
+  DatafeedstatusesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
-   * Not documented yet.
-   *
    * [request] - The metadata request object.
    *
    * Request parameters:
    *
    * Completes with a [DatafeedstatusesCustomBatchResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1387,7 +1413,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1418,7 +1444,7 @@
    *
    * Completes with a [DatafeedStatus].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1429,7 +1455,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (merchantId == null) {
@@ -1440,7 +1466,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/datafeedstatuses/' + common_internal.Escaper.ecapeVariable('$datafeedId');
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/datafeedstatuses/' + commons.Escaper.ecapeVariable('$datafeedId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1466,7 +1492,7 @@
    *
    * Completes with a [DatafeedstatusesListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1477,7 +1503,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (merchantId == null) {
@@ -1491,7 +1517,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/datafeedstatuses';
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/datafeedstatuses';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1506,11 +1532,10 @@
 }
 
 
-/** Not documented yet. */
 class InventoryResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  InventoryResourceApi(common_internal.ApiRequester client) : 
+  InventoryResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1523,7 +1548,7 @@
    *
    * Completes with a [InventoryCustomBatchResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1534,7 +1559,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1573,7 +1598,7 @@
    *
    * Completes with a [InventorySetResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1584,7 +1609,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1601,7 +1626,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/inventory/' + common_internal.Escaper.ecapeVariable('$storeCode') + '/products/' + common_internal.Escaper.ecapeVariable('$productId');
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/inventory/' + commons.Escaper.ecapeVariable('$storeCode') + '/products/' + commons.Escaper.ecapeVariable('$productId');
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1616,11 +1641,10 @@
 }
 
 
-/** Not documented yet. */
 class ProductsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ProductsResourceApi(common_internal.ApiRequester client) : 
+  ProductsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1634,7 +1658,7 @@
    *
    * Completes with a [ProductsCustomBatchResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1645,7 +1669,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1679,7 +1703,7 @@
    *
    * [dryRun] - Flag to run the request in dry-run mode.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1690,7 +1714,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (merchantId == null) {
@@ -1705,7 +1729,7 @@
 
     _downloadOptions = null;
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/products/' + common_internal.Escaper.ecapeVariable('$productId');
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/products/' + commons.Escaper.ecapeVariable('$productId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1728,7 +1752,7 @@
    *
    * Completes with a [Product].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1739,7 +1763,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (merchantId == null) {
@@ -1750,7 +1774,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/products/' + common_internal.Escaper.ecapeVariable('$productId');
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/products/' + commons.Escaper.ecapeVariable('$productId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1775,7 +1799,7 @@
    *
    * Completes with a [Product].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1786,7 +1810,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1800,7 +1824,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/products';
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/products';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1826,7 +1850,7 @@
    *
    * Completes with a [ProductsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1837,7 +1861,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (merchantId == null) {
@@ -1851,7 +1875,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/products';
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/products';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1866,11 +1890,10 @@
 }
 
 
-/** Not documented yet. */
 class ProductstatusesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ProductstatusesResourceApi(common_internal.ApiRequester client) : 
+  ProductstatusesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1882,7 +1905,7 @@
    *
    * Completes with a [ProductstatusesCustomBatchResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1893,7 +1916,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1924,7 +1947,7 @@
    *
    * Completes with a [ProductStatus].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1935,7 +1958,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (merchantId == null) {
@@ -1946,7 +1969,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/productstatuses/' + common_internal.Escaper.ecapeVariable('$productId');
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/productstatuses/' + commons.Escaper.ecapeVariable('$productId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1972,7 +1995,7 @@
    *
    * Completes with a [ProductstatusesListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1983,7 +2006,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (merchantId == null) {
@@ -1997,7 +2020,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$merchantId') + '/productstatuses';
+    _url = commons.Escaper.ecapeVariable('$merchantId') + '/productstatuses';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2117,7 +2140,6 @@
 }
 
 
-/** Not documented yet. */
 class AccountAdwordsLink {
   /** Customer ID of the AdWords account. */
   core.String adwordsId;
@@ -2153,6 +2175,41 @@
 }
 
 
+class AccountIdentifier {
+  /**
+   * The aggregator ID, set for aggregators and subaccounts (in that case, it
+   * represents the aggregator of the subaccount).
+   */
+  core.String aggregatorId;
+
+  /** The merchant account ID, set for individual accounts and subaccounts. */
+  core.String merchantId;
+
+
+  AccountIdentifier();
+
+  AccountIdentifier.fromJson(core.Map _json) {
+    if (_json.containsKey("aggregatorId")) {
+      aggregatorId = _json["aggregatorId"];
+    }
+    if (_json.containsKey("merchantId")) {
+      merchantId = _json["merchantId"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (aggregatorId != null) {
+      _json["aggregatorId"] = aggregatorId;
+    }
+    if (merchantId != null) {
+      _json["merchantId"] = merchantId;
+    }
+    return _json;
+  }
+}
+
+
 /** The shipping settings of a merchant account. */
 class AccountShipping {
   /** The ID of the account to which these account shipping settings belong. */
@@ -2312,7 +2369,6 @@
 }
 
 
-/** Not documented yet. */
 class AccountShippingCondition {
   /**
    * Delivery location in terms of a location group name. A location group with
@@ -2569,7 +2625,6 @@
 }
 
 
-/** Not documented yet. */
 class AccountShippingRateTableCell {
   /**
    * Conditions for which the cell is valid. All cells in a table must use the
@@ -2843,7 +2898,6 @@
 }
 
 
-/** Not documented yet. */
 class AccountStatusDataQualityIssue {
   /** Country for which this issue is reported. */
   core.String country;
@@ -3110,7 +3164,6 @@
 }
 
 
-/** Not documented yet. */
 class AccountUser {
   /** Whether user is an admin. */
   core.bool admin;
@@ -3143,7 +3196,47 @@
 }
 
 
-/** Not documented yet. */
+class AccountsAuthInfoResponse {
+  /**
+   * The account identifiers corresponding to the authenticated user.
+   * - For an individual account: only the merchant ID is defined
+   * - For an aggregator: only the aggregator ID is defined
+   * - For a subaccount of an MCA: both the merchant ID and the aggregator ID
+   * are defined.
+   */
+  core.List<AccountIdentifier> accountIdentifiers;
+
+  /**
+   * Identifies what kind of resource this is. Value: the fixed string
+   * "content#accountsAuthInfoResponse".
+   */
+  core.String kind;
+
+
+  AccountsAuthInfoResponse();
+
+  AccountsAuthInfoResponse.fromJson(core.Map _json) {
+    if (_json.containsKey("accountIdentifiers")) {
+      accountIdentifiers = _json["accountIdentifiers"].map((value) => new AccountIdentifier.fromJson(value)).toList();
+    }
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (accountIdentifiers != null) {
+      _json["accountIdentifiers"] = accountIdentifiers.map((value) => (value).toJson()).toList();
+    }
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    return _json;
+  }
+}
+
+
 class AccountsCustomBatchRequest {
   /** The request entries to be processed in the batch. */
   core.List<AccountsCustomBatchRequestEntry> entries;
@@ -3187,7 +3280,6 @@
   /** The ID of the managing account. */
   core.String merchantId;
 
-  /** Not documented yet. */
   core.String method;
 
 
@@ -3233,7 +3325,6 @@
 }
 
 
-/** Not documented yet. */
 class AccountsCustomBatchResponse {
   /** The result of the execution of the batch requests. */
   core.List<AccountsCustomBatchResponseEntry> entries;
@@ -3326,7 +3417,6 @@
 }
 
 
-/** Not documented yet. */
 class AccountsListResponse {
   /**
    * Identifies what kind of resource this is. Value: the fixed string
@@ -3337,7 +3427,6 @@
   /** The token for the retrieval of the next page of accounts. */
   core.String nextPageToken;
 
-  /** Not documented yet. */
   core.List<Account> resources;
 
 
@@ -3371,7 +3460,6 @@
 }
 
 
-/** Not documented yet. */
 class AccountshippingCustomBatchRequest {
   /** The request entries to be processed in the batch. */
   core.List<AccountshippingCustomBatchRequestEntry> entries;
@@ -3414,7 +3502,6 @@
   /** The ID of the managing account. */
   core.String merchantId;
 
-  /** Not documented yet. */
   core.String method;
 
 
@@ -3460,7 +3547,6 @@
 }
 
 
-/** Not documented yet. */
 class AccountshippingCustomBatchResponse {
   /** The result of the execution of the batch requests. */
   core.List<AccountshippingCustomBatchResponseEntry> entries;
@@ -3550,7 +3636,6 @@
 }
 
 
-/** Not documented yet. */
 class AccountshippingListResponse {
   /**
    * Identifies what kind of resource this is. Value: the fixed string
@@ -3563,7 +3648,6 @@
    */
   core.String nextPageToken;
 
-  /** Not documented yet. */
   core.List<AccountShipping> resources;
 
 
@@ -3597,7 +3681,6 @@
 }
 
 
-/** Not documented yet. */
 class AccountstatusesCustomBatchRequest {
   /** The request entries to be processed in the batch. */
   core.List<AccountstatusesCustomBatchRequestEntry> entries;
@@ -3672,7 +3755,6 @@
 }
 
 
-/** Not documented yet. */
 class AccountstatusesCustomBatchResponse {
   /** The result of the execution of the batch requests. */
   core.List<AccountstatusesCustomBatchResponseEntry> entries;
@@ -3753,7 +3835,6 @@
 }
 
 
-/** Not documented yet. */
 class AccountstatusesListResponse {
   /**
    * Identifies what kind of resource this is. Value: the fixed string
@@ -3764,7 +3845,6 @@
   /** The token for the retrieval of the next page of account statuses. */
   core.String nextPageToken;
 
-  /** Not documented yet. */
   core.List<AccountStatus> resources;
 
 
@@ -3798,7 +3878,6 @@
 }
 
 
-/** Not documented yet. */
 class AccounttaxCustomBatchRequest {
   /** The request entries to be processed in the batch. */
   core.List<AccounttaxCustomBatchRequestEntry> entries;
@@ -3838,7 +3917,6 @@
   /** The ID of the managing account. */
   core.String merchantId;
 
-  /** Not documented yet. */
   core.String method;
 
 
@@ -3884,7 +3962,6 @@
 }
 
 
-/** Not documented yet. */
 class AccounttaxCustomBatchResponse {
   /** The result of the execution of the batch requests. */
   core.List<AccounttaxCustomBatchResponseEntry> entries;
@@ -3974,7 +4051,6 @@
 }
 
 
-/** Not documented yet. */
 class AccounttaxListResponse {
   /**
    * Identifies what kind of resource this is. Value: the fixed string
@@ -3985,7 +4061,6 @@
   /** The token for the retrieval of the next page of account tax settings. */
   core.String nextPageToken;
 
-  /** Not documented yet. */
   core.List<AccountTax> resources;
 
 
@@ -4235,7 +4310,6 @@
 }
 
 
-/** Not documented yet. */
 class DatafeedFormat {
   /**
    * Delimiter for the separation of values in a delimiter-separated values
@@ -4464,7 +4538,6 @@
 }
 
 
-/** Not documented yet. */
 class DatafeedsCustomBatchRequest {
   /** The request entries to be processed in the batch. */
   core.List<DatafeedsCustomBatchRequestEntry> entries;
@@ -4502,7 +4575,6 @@
   /** The ID of the managing account. */
   core.String merchantId;
 
-  /** Not documented yet. */
   core.String method;
 
 
@@ -4548,7 +4620,6 @@
 }
 
 
-/** Not documented yet. */
 class DatafeedsCustomBatchResponse {
   /** The result of the execution of the batch requests. */
   core.List<DatafeedsCustomBatchResponseEntry> entries;
@@ -4628,7 +4699,6 @@
 }
 
 
-/** Not documented yet. */
 class DatafeedsListResponse {
   /**
    * Identifies what kind of resource this is. Value: the fixed string
@@ -4639,7 +4709,6 @@
   /** The token for the retrieval of the next page of datafeeds. */
   core.String nextPageToken;
 
-  /** Not documented yet. */
   core.List<Datafeed> resources;
 
 
@@ -4673,7 +4742,6 @@
 }
 
 
-/** Not documented yet. */
 class DatafeedstatusesCustomBatchRequest {
   /** The request entries to be processed in the batch. */
   core.List<DatafeedstatusesCustomBatchRequestEntry> entries;
@@ -4708,7 +4776,6 @@
   /** The ID of the managing account. */
   core.String merchantId;
 
-  /** Not documented yet. */
   core.String method;
 
 
@@ -4748,7 +4815,6 @@
 }
 
 
-/** Not documented yet. */
 class DatafeedstatusesCustomBatchResponse {
   /** The result of the execution of the batch requests. */
   core.List<DatafeedstatusesCustomBatchResponseEntry> entries;
@@ -4829,7 +4895,6 @@
 }
 
 
-/** Not documented yet. */
 class DatafeedstatusesListResponse {
   /**
    * Identifies what kind of resource this is. Value: the fixed string
@@ -4840,7 +4905,6 @@
   /** The token for the retrieval of the next page of datafeed statuses. */
   core.String nextPageToken;
 
-  /** Not documented yet. */
   core.List<DatafeedStatus> resources;
 
 
@@ -4958,7 +5022,6 @@
 }
 
 
-/** Not documented yet. */
 class Inventory {
   /** The availability of the product. */
   core.String availability;
@@ -5039,7 +5102,6 @@
 }
 
 
-/** Not documented yet. */
 class InventoryCustomBatchRequest {
   /** The request entries to be processed in the batch. */
   core.List<InventoryCustomBatchRequestEntry> entries;
@@ -5126,7 +5188,6 @@
 }
 
 
-/** Not documented yet. */
 class InventoryCustomBatchResponse {
   /** The result of the execution of the batch requests. */
   core.List<InventoryCustomBatchResponseEntry> entries;
@@ -5207,7 +5268,6 @@
 }
 
 
-/** Not documented yet. */
 class InventorySetRequest {
   /** The availability of the product. */
   core.String availability;
@@ -5276,7 +5336,6 @@
 }
 
 
-/** Not documented yet. */
 class InventorySetResponse {
   /**
    * Identifies what kind of resource this is. Value: the fixed string
@@ -5303,7 +5362,6 @@
 }
 
 
-/** Not documented yet. */
 class LoyaltyPoints {
   /**
    * Name of loyalty points program. It is recommended to limit the name to 12
@@ -5352,7 +5410,6 @@
 }
 
 
-/** Not documented yet. */
 class Price {
   /** The currency of the price. */
   core.String currency;
@@ -5411,6 +5468,9 @@
   /** Target age group of the item. */
   core.String ageGroup;
 
+  /** Specifies the intended aspects for the product. */
+  core.List<ProductAspect> aspects;
+
   /** Availability status of the item. */
   core.String availability;
 
@@ -5654,6 +5714,9 @@
     if (_json.containsKey("ageGroup")) {
       ageGroup = _json["ageGroup"];
     }
+    if (_json.containsKey("aspects")) {
+      aspects = _json["aspects"].map((value) => new ProductAspect.fromJson(value)).toList();
+    }
     if (_json.containsKey("availability")) {
       availability = _json["availability"];
     }
@@ -5862,6 +5925,9 @@
     if (ageGroup != null) {
       _json["ageGroup"] = ageGroup;
     }
+    if (aspects != null) {
+      _json["aspects"] = aspects.map((value) => (value).toJson()).toList();
+    }
     if (availability != null) {
       _json["availability"] = availability;
     }
@@ -6053,7 +6119,47 @@
 }
 
 
-/** Not documented yet. */
+class ProductAspect {
+  /** The name of the aspect. */
+  core.String aspectName;
+
+  /** The name of the destination. Leave out to apply to all destinations. */
+  core.String destinationName;
+
+  /** Whether the aspect is required, excluded or should be validated. */
+  core.String intention;
+
+
+  ProductAspect();
+
+  ProductAspect.fromJson(core.Map _json) {
+    if (_json.containsKey("aspectName")) {
+      aspectName = _json["aspectName"];
+    }
+    if (_json.containsKey("destinationName")) {
+      destinationName = _json["destinationName"];
+    }
+    if (_json.containsKey("intention")) {
+      intention = _json["intention"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (aspectName != null) {
+      _json["aspectName"] = aspectName;
+    }
+    if (destinationName != null) {
+      _json["destinationName"] = destinationName;
+    }
+    if (intention != null) {
+      _json["intention"] = intention;
+    }
+    return _json;
+  }
+}
+
+
 class ProductCustomAttribute {
   /**
    * The name of the attribute. Underscores will be replaced by spaces upon
@@ -6110,7 +6216,6 @@
 }
 
 
-/** Not documented yet. */
 class ProductCustomGroup {
   /** The sub-attributes. */
   core.List<ProductCustomAttribute> attributes;
@@ -6146,7 +6251,6 @@
 }
 
 
-/** Not documented yet. */
 class ProductDestination {
   /** The name of the destination. */
   core.String destinationName;
@@ -6179,7 +6283,6 @@
 }
 
 
-/** Not documented yet. */
 class ProductInstallment {
   /** The amount the buyer has to pay per month. */
   Price amount;
@@ -6212,7 +6315,6 @@
 }
 
 
-/** Not documented yet. */
 class ProductShipping {
   /**
    * The two-letter ISO 3166 country code for the country to which an item will
@@ -6305,7 +6407,6 @@
 }
 
 
-/** Not documented yet. */
 class ProductShippingDimension {
   /**
    * The unit of value.
@@ -6347,7 +6448,6 @@
 }
 
 
-/** Not documented yet. */
 class ProductShippingWeight {
   /** The unit of value. */
   core.String unit;
@@ -6484,7 +6584,6 @@
 }
 
 
-/** Not documented yet. */
 class ProductStatusDataQualityIssue {
   /** A more detailed error string. */
   core.String detail;
@@ -6571,7 +6670,6 @@
 }
 
 
-/** Not documented yet. */
 class ProductStatusDestinationStatus {
   /** The destination's approval status. */
   core.String approvalStatus;
@@ -6616,7 +6714,6 @@
 }
 
 
-/** Not documented yet. */
 class ProductTax {
   /**
    * The country within which the item is taxed, specified with a two-letter ISO
@@ -6696,7 +6793,6 @@
 }
 
 
-/** Not documented yet. */
 class ProductUnitPricingBaseMeasure {
   /** The unit of the denominator. */
   core.String unit;
@@ -6729,7 +6825,6 @@
 }
 
 
-/** Not documented yet. */
 class ProductUnitPricingMeasure {
   /** The unit of the measure. */
   core.String unit;
@@ -6762,7 +6857,6 @@
 }
 
 
-/** Not documented yet. */
 class ProductsCustomBatchRequest {
   /** The request entries to be processed in the batch. */
   core.List<ProductsCustomBatchRequestEntry> entries;
@@ -6794,7 +6888,6 @@
   /** The ID of the managing account. */
   core.String merchantId;
 
-  /** Not documented yet. */
   core.String method;
 
   /** The product to insert. Only required if the method is insert. */
@@ -6849,7 +6942,6 @@
 }
 
 
-/** Not documented yet. */
 class ProductsCustomBatchResponse {
   /** The result of the execution of the batch requests. */
   core.List<ProductsCustomBatchResponseEntry> entries;
@@ -6942,7 +7034,6 @@
 }
 
 
-/** Not documented yet. */
 class ProductsListResponse {
   /**
    * Identifies what kind of resource this is. Value: the fixed string
@@ -6953,7 +7044,6 @@
   /** The token for the retrieval of the next page of products. */
   core.String nextPageToken;
 
-  /** Not documented yet. */
   core.List<Product> resources;
 
 
@@ -6987,7 +7077,6 @@
 }
 
 
-/** Not documented yet. */
 class ProductstatusesCustomBatchRequest {
   /** The request entries to be processed in the batch. */
   core.List<ProductstatusesCustomBatchRequestEntry> entries;
@@ -7019,7 +7108,6 @@
   /** The ID of the managing account. */
   core.String merchantId;
 
-  /** Not documented yet. */
   core.String method;
 
   /** The ID of the product whose status to get. */
@@ -7062,7 +7150,6 @@
 }
 
 
-/** Not documented yet. */
 class ProductstatusesCustomBatchResponse {
   /** The result of the execution of the batch requests. */
   core.List<ProductstatusesCustomBatchResponseEntry> entries;
@@ -7154,7 +7241,6 @@
 }
 
 
-/** Not documented yet. */
 class ProductstatusesListResponse {
   /**
    * Identifies what kind of resource this is. Value: the fixed string
@@ -7165,7 +7251,6 @@
   /** The token for the retrieval of the next page of products statuses. */
   core.String nextPageToken;
 
-  /** Not documented yet. */
   core.List<ProductStatus> resources;
 
 
@@ -7199,7 +7284,6 @@
 }
 
 
-/** Not documented yet. */
 class Weight {
   /** The weight unit. */
   core.String unit;
@@ -7230,5 +7314,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/coordinate/v1.dart b/generated/googleapis/lib/coordinate/v1.dart
index 5c3a754..c535ae9 100644
--- a/generated/googleapis/lib/coordinate/v1.dart
+++ b/generated/googleapis/lib/coordinate/v1.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.coordinate.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client coordinate/v1';
 
 /** Lets you view and manage jobs in a Coordinate team. */
 class CoordinateApi {
@@ -22,7 +25,7 @@
   static const CoordinateReadonlyScope = "https://www.googleapis.com/auth/coordinate.readonly";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   CustomFieldDefResourceApi get customFieldDef => new CustomFieldDefResourceApi(_requester);
   JobsResourceApi get jobs => new JobsResourceApi(_requester);
@@ -32,15 +35,14 @@
   WorkerResourceApi get worker => new WorkerResourceApi(_requester);
 
   CoordinateApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "coordinate/v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class CustomFieldDefResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  CustomFieldDefResourceApi(common_internal.ApiRequester client) : 
+  CustomFieldDefResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -52,7 +54,7 @@
    *
    * Completes with a [CustomFieldDefListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -63,7 +65,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (teamId == null) {
@@ -71,7 +73,7 @@
     }
 
 
-    _url = 'teams/' + common_internal.Escaper.ecapeVariable('$teamId') + '/custom_fields';
+    _url = 'teams/' + commons.Escaper.ecapeVariable('$teamId') + '/custom_fields';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -86,11 +88,10 @@
 }
 
 
-/** Not documented yet. */
 class JobsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  JobsResourceApi(common_internal.ApiRequester client) : 
+  JobsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -104,7 +105,7 @@
    *
    * Completes with a [Job].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -115,7 +116,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (teamId == null) {
@@ -126,7 +127,7 @@
     }
 
 
-    _url = 'teams/' + common_internal.Escaper.ecapeVariable('$teamId') + '/jobs/' + common_internal.Escaper.ecapeVariable('$jobId');
+    _url = 'teams/' + commons.Escaper.ecapeVariable('$teamId') + '/jobs/' + commons.Escaper.ecapeVariable('$jobId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -172,7 +173,7 @@
    *
    * Completes with a [Job].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -183,7 +184,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -225,7 +226,7 @@
     }
 
 
-    _url = 'teams/' + common_internal.Escaper.ecapeVariable('$teamId') + '/jobs';
+    _url = 'teams/' + commons.Escaper.ecapeVariable('$teamId') + '/jobs';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -253,7 +254,7 @@
    *
    * Completes with a [JobListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -264,7 +265,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (teamId == null) {
@@ -281,7 +282,7 @@
     }
 
 
-    _url = 'teams/' + common_internal.Escaper.ecapeVariable('$teamId') + '/jobs';
+    _url = 'teams/' + commons.Escaper.ecapeVariable('$teamId') + '/jobs';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -338,7 +339,7 @@
    *
    * Completes with a [Job].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -349,7 +350,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -393,7 +394,7 @@
     }
 
 
-    _url = 'teams/' + common_internal.Escaper.ecapeVariable('$teamId') + '/jobs/' + common_internal.Escaper.ecapeVariable('$jobId');
+    _url = 'teams/' + commons.Escaper.ecapeVariable('$teamId') + '/jobs/' + commons.Escaper.ecapeVariable('$jobId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -449,7 +450,7 @@
    *
    * Completes with a [Job].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -460,7 +461,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -504,7 +505,7 @@
     }
 
 
-    _url = 'teams/' + common_internal.Escaper.ecapeVariable('$teamId') + '/jobs/' + common_internal.Escaper.ecapeVariable('$jobId');
+    _url = 'teams/' + commons.Escaper.ecapeVariable('$teamId') + '/jobs/' + commons.Escaper.ecapeVariable('$jobId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -519,11 +520,10 @@
 }
 
 
-/** Not documented yet. */
 class LocationResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  LocationResourceApi(common_internal.ApiRequester client) : 
+  LocationResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -543,7 +543,7 @@
    *
    * Completes with a [LocationListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -554,7 +554,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (teamId == null) {
@@ -575,7 +575,7 @@
     }
 
 
-    _url = 'teams/' + common_internal.Escaper.ecapeVariable('$teamId') + '/workers/' + common_internal.Escaper.ecapeVariable('$workerEmail') + '/locations';
+    _url = 'teams/' + commons.Escaper.ecapeVariable('$teamId') + '/workers/' + commons.Escaper.ecapeVariable('$workerEmail') + '/locations';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -590,11 +590,10 @@
 }
 
 
-/** Not documented yet. */
 class ScheduleResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ScheduleResourceApi(common_internal.ApiRequester client) : 
+  ScheduleResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -608,7 +607,7 @@
    *
    * Completes with a [Schedule].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -619,7 +618,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (teamId == null) {
@@ -630,7 +629,7 @@
     }
 
 
-    _url = 'teams/' + common_internal.Escaper.ecapeVariable('$teamId') + '/jobs/' + common_internal.Escaper.ecapeVariable('$jobId') + '/schedule';
+    _url = 'teams/' + commons.Escaper.ecapeVariable('$teamId') + '/jobs/' + commons.Escaper.ecapeVariable('$jobId') + '/schedule';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -665,7 +664,7 @@
    *
    * Completes with a [Schedule].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -676,7 +675,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -702,7 +701,7 @@
     }
 
 
-    _url = 'teams/' + common_internal.Escaper.ecapeVariable('$teamId') + '/jobs/' + common_internal.Escaper.ecapeVariable('$jobId') + '/schedule';
+    _url = 'teams/' + commons.Escaper.ecapeVariable('$teamId') + '/jobs/' + commons.Escaper.ecapeVariable('$jobId') + '/schedule';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -736,7 +735,7 @@
    *
    * Completes with a [Schedule].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -747,7 +746,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -773,7 +772,7 @@
     }
 
 
-    _url = 'teams/' + common_internal.Escaper.ecapeVariable('$teamId') + '/jobs/' + common_internal.Escaper.ecapeVariable('$jobId') + '/schedule';
+    _url = 'teams/' + commons.Escaper.ecapeVariable('$teamId') + '/jobs/' + commons.Escaper.ecapeVariable('$jobId') + '/schedule';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -788,11 +787,10 @@
 }
 
 
-/** Not documented yet. */
 class TeamResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  TeamResourceApi(common_internal.ApiRequester client) : 
+  TeamResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -809,7 +807,7 @@
    *
    * Completes with a [TeamListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -820,7 +818,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (admin != null) {
@@ -849,11 +847,10 @@
 }
 
 
-/** Not documented yet. */
 class WorkerResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  WorkerResourceApi(common_internal.ApiRequester client) : 
+  WorkerResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -865,7 +862,7 @@
    *
    * Completes with a [WorkerListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -876,7 +873,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (teamId == null) {
@@ -884,7 +881,7 @@
     }
 
 
-    _url = 'teams/' + common_internal.Escaper.ecapeVariable('$teamId') + '/workers';
+    _url = 'teams/' + commons.Escaper.ecapeVariable('$teamId') + '/workers';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1790,5 +1787,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/customsearch/v1.dart b/generated/googleapis/lib/customsearch/v1.dart
index 0a98b3b..1c93eb8 100644
--- a/generated/googleapis/lib/customsearch/v1.dart
+++ b/generated/googleapis/lib/customsearch/v1.dart
@@ -1,35 +1,37 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.customsearch.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client customsearch/v1';
 
 /** Lets you search over a website or collection of websites */
 class CustomsearchApi {
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   CseResourceApi get cse => new CseResourceApi(_requester);
 
   CustomsearchApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "customsearch/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class CseResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  CseResourceApi(common_internal.ApiRequester client) : 
+  CseResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -198,7 +200,7 @@
    *
    * Completes with a [Search].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -209,7 +211,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (q == null) {
@@ -327,15 +329,11 @@
 
 
 
-/** Not documented yet. */
 class ContextFacets {
-  /** Not documented yet. */
   core.String anchor;
 
-  /** Not documented yet. */
   core.String label;
 
-  /** Not documented yet. */
   core.String labelWithOp;
 
 
@@ -369,12 +367,9 @@
 }
 
 
-/** Not documented yet. */
 class Context {
-  /** Not documented yet. */
   core.List<core.List<ContextFacets>> facets;
 
-  /** Not documented yet. */
   core.String title;
 
 
@@ -402,18 +397,13 @@
 }
 
 
-/** Not documented yet. */
 class PromotionBodyLines {
-  /** Not documented yet. */
   core.String htmlTitle;
 
-  /** Not documented yet. */
   core.String link;
 
-  /** Not documented yet. */
   core.String title;
 
-  /** Not documented yet. */
   core.String url;
 
 
@@ -453,15 +443,11 @@
 }
 
 
-/** Not documented yet. */
 class PromotionImage {
-  /** Not documented yet. */
   core.int height;
 
-  /** Not documented yet. */
   core.String source;
 
-  /** Not documented yet. */
   core.int width;
 
 
@@ -495,24 +481,17 @@
 }
 
 
-/** Not documented yet. */
 class Promotion {
-  /** Not documented yet. */
   core.List<PromotionBodyLines> bodyLines;
 
-  /** Not documented yet. */
   core.String displayLink;
 
-  /** Not documented yet. */
   core.String htmlTitle;
 
-  /** Not documented yet. */
   PromotionImage image;
 
-  /** Not documented yet. */
   core.String link;
 
-  /** Not documented yet. */
   core.String title;
 
 
@@ -564,117 +543,79 @@
 }
 
 
-/** Not documented yet. */
 class Query {
-  /** Not documented yet. */
   core.int count;
 
-  /** Not documented yet. */
   core.String cr;
 
-  /** Not documented yet. */
   core.String cref;
 
-  /** Not documented yet. */
   core.String cx;
 
-  /** Not documented yet. */
   core.String dateRestrict;
 
-  /** Not documented yet. */
   core.String disableCnTwTranslation;
 
-  /** Not documented yet. */
   core.String exactTerms;
 
-  /** Not documented yet. */
   core.String excludeTerms;
 
-  /** Not documented yet. */
   core.String fileType;
 
-  /** Not documented yet. */
   core.String filter;
 
-  /** Not documented yet. */
   core.String gl;
 
-  /** Not documented yet. */
   core.String googleHost;
 
-  /** Not documented yet. */
   core.String highRange;
 
-  /** Not documented yet. */
   core.String hl;
 
-  /** Not documented yet. */
   core.String hq;
 
-  /** Not documented yet. */
   core.String imgColorType;
 
-  /** Not documented yet. */
   core.String imgDominantColor;
 
-  /** Not documented yet. */
   core.String imgSize;
 
-  /** Not documented yet. */
   core.String imgType;
 
-  /** Not documented yet. */
   core.String inputEncoding;
 
-  /** Not documented yet. */
   core.String language;
 
-  /** Not documented yet. */
   core.String linkSite;
 
-  /** Not documented yet. */
   core.String lowRange;
 
-  /** Not documented yet. */
   core.String orTerms;
 
-  /** Not documented yet. */
   core.String outputEncoding;
 
-  /** Not documented yet. */
   core.String relatedSite;
 
-  /** Not documented yet. */
   core.String rights;
 
-  /** Not documented yet. */
   core.String safe;
 
-  /** Not documented yet. */
   core.String searchTerms;
 
-  /** Not documented yet. */
   core.String searchType;
 
-  /** Not documented yet. */
   core.String siteSearch;
 
-  /** Not documented yet. */
   core.String siteSearchFilter;
 
-  /** Not documented yet. */
   core.String sort;
 
-  /** Not documented yet. */
   core.int startIndex;
 
-  /** Not documented yet. */
   core.int startPage;
 
-  /** Not documented yet. */
   core.String title;
 
-  /** Not documented yet. */
   core.String totalResults;
 
 
@@ -912,27 +853,19 @@
 }
 
 
-/** Not documented yet. */
 class ResultImage {
-  /** Not documented yet. */
   core.int byteSize;
 
-  /** Not documented yet. */
   core.String contextLink;
 
-  /** Not documented yet. */
   core.int height;
 
-  /** Not documented yet. */
   core.int thumbnailHeight;
 
-  /** Not documented yet. */
   core.String thumbnailLink;
 
-  /** Not documented yet. */
   core.int thumbnailWidth;
 
-  /** Not documented yet. */
   core.int width;
 
 
@@ -990,15 +923,11 @@
 }
 
 
-/** Not documented yet. */
 class ResultLabels {
-  /** Not documented yet. */
   core.String displayName;
 
-  /** Not documented yet. */
   core.String labelWithOp;
 
-  /** Not documented yet. */
   core.String name;
 
 
@@ -1032,56 +961,41 @@
 }
 
 
-/** Not documented yet. */
 class Result {
-  /** Not documented yet. */
   core.String cacheId;
 
-  /** Not documented yet. */
   core.String displayLink;
 
-  /** Not documented yet. */
   core.String fileFormat;
 
-  /** Not documented yet. */
   core.String formattedUrl;
 
-  /** Not documented yet. */
   core.String htmlFormattedUrl;
 
-  /** Not documented yet. */
   core.String htmlSnippet;
 
-  /** Not documented yet. */
   core.String htmlTitle;
 
-  /** Not documented yet. */
   ResultImage image;
 
-  /** Not documented yet. */
   core.String kind;
 
-  /** Not documented yet. */
   core.List<ResultLabels> labels;
 
-  /** Not documented yet. */
   core.String link;
 
-  /** Not documented yet. */
   core.String mime;
 
   /**
-   * Not documented yet.
+   *
    *
    * The values for Object must be JSON objects. It can consist of `num`,
    * `String`, `bool` and `null` as well as `Map` and `List` values.
    */
   core.Map<core.String, core.List<core.Map<core.String, core.Object>>> pagemap;
 
-  /** Not documented yet. */
   core.String snippet;
 
-  /** Not documented yet. */
   core.String title;
 
 
@@ -1187,18 +1101,13 @@
 }
 
 
-/** Not documented yet. */
 class SearchSearchInformation {
-  /** Not documented yet. */
   core.String formattedSearchTime;
 
-  /** Not documented yet. */
   core.String formattedTotalResults;
 
-  /** Not documented yet. */
   core.double searchTime;
 
-  /** Not documented yet. */
   core.String totalResults;
 
 
@@ -1238,12 +1147,9 @@
 }
 
 
-/** Not documented yet. */
 class SearchSpelling {
-  /** Not documented yet. */
   core.String correctedQuery;
 
-  /** Not documented yet. */
   core.String htmlCorrectedQuery;
 
 
@@ -1271,12 +1177,9 @@
 }
 
 
-/** Not documented yet. */
 class SearchUrl {
-  /** Not documented yet. */
   core.String template;
 
-  /** Not documented yet. */
   core.String type;
 
 
@@ -1304,30 +1207,21 @@
 }
 
 
-/** Not documented yet. */
 class Search {
-  /** Not documented yet. */
   Context context;
 
-  /** Not documented yet. */
   core.List<Result> items;
 
-  /** Not documented yet. */
   core.String kind;
 
-  /** Not documented yet. */
   core.List<Promotion> promotions;
 
-  /** Not documented yet. */
   core.Map<core.String, core.List<Query>> queries;
 
-  /** Not documented yet. */
   SearchSearchInformation searchInformation;
 
-  /** Not documented yet. */
   SearchSpelling spelling;
 
-  /** Not documented yet. */
   SearchUrl url;
 
 
@@ -1347,7 +1241,7 @@
       promotions = _json["promotions"].map((value) => new Promotion.fromJson(value)).toList();
     }
     if (_json.containsKey("queries")) {
-      queries = common_internal.mapMap(_json["queries"], (item) => item.map((value) => new Query.fromJson(value)).toList());
+      queries = commons.mapMap(_json["queries"], (item) => item.map((value) => new Query.fromJson(value)).toList());
     }
     if (_json.containsKey("searchInformation")) {
       searchInformation = new SearchSearchInformation.fromJson(_json["searchInformation"]);
@@ -1375,7 +1269,7 @@
       _json["promotions"] = promotions.map((value) => (value).toJson()).toList();
     }
     if (queries != null) {
-      _json["queries"] = common_internal.mapMap(queries, (item) => item.map((value) => (value).toJson()).toList());
+      _json["queries"] = commons.mapMap(queries, (item) => item.map((value) => (value).toJson()).toList());
     }
     if (searchInformation != null) {
       _json["searchInformation"] = (searchInformation).toJson();
@@ -1389,5 +1283,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/dfareporting/v1_3.dart b/generated/googleapis/lib/dfareporting/v1_3.dart
index 09f014f..3dbd287 100644
--- a/generated/googleapis/lib/dfareporting/v1_3.dart
+++ b/generated/googleapis/lib/dfareporting/v1_3.dart
@@ -1,17 +1,22 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.dfareporting.v1_3;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError, Media, UploadOptions,
+    ResumableUploadOptions, DownloadOptions, PartialDownloadOptions,
+    ByteRange;
+
+const core.String USER_AGENT = 'dart-api-client dfareporting/v1.3';
 
 /** Lets you create, run and download reports. */
 class DfareportingApi {
@@ -19,7 +24,7 @@
   static const DfareportingScope = "https://www.googleapis.com/auth/dfareporting";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   DimensionValuesResourceApi get dimensionValues => new DimensionValuesResourceApi(_requester);
   FilesResourceApi get files => new FilesResourceApi(_requester);
@@ -27,15 +32,14 @@
   UserProfilesResourceApi get userProfiles => new UserProfilesResourceApi(_requester);
 
   DfareportingApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "dfareporting/v1.3/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class DimensionValuesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  DimensionValuesResourceApi(common_internal.ApiRequester client) : 
+  DimensionValuesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -54,7 +58,7 @@
    *
    * Completes with a [DimensionValueList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -65,7 +69,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -82,7 +86,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/dimensionvalues/query';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/dimensionvalues/query';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -97,11 +101,10 @@
 }
 
 
-/** Not documented yet. */
 class FilesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  FilesResourceApi(common_internal.ApiRequester client) : 
+  FilesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -121,20 +124,20 @@
    *
    * - [File] for Metadata downloads (see [downloadOptions]).
    *
-   * - [common.Media] for Media downloads (see [downloadOptions]).
+   * - [commons.Media] for Media downloads (see [downloadOptions]).
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future get(core.String reportId, core.String fileId, {common.DownloadOptions downloadOptions: common.DownloadOptions.Metadata}) {
+  async.Future get(core.String reportId, core.String fileId, {commons.DownloadOptions downloadOptions: commons.DownloadOptions.Metadata}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (reportId == null) {
@@ -146,7 +149,7 @@
 
     _downloadOptions = downloadOptions;
 
-    _url = 'reports/' + common_internal.Escaper.ecapeVariable('$reportId') + '/files/' + common_internal.Escaper.ecapeVariable('$fileId');
+    _url = 'reports/' + commons.Escaper.ecapeVariable('$reportId') + '/files/' + commons.Escaper.ecapeVariable('$fileId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -156,7 +159,7 @@
                                        uploadMedia: _uploadMedia,
                                        downloadOptions: _downloadOptions);
     if (_downloadOptions == null ||
-        _downloadOptions == common.DownloadOptions.Metadata) {
+        _downloadOptions == commons.DownloadOptions.Metadata) {
       return _response.then((data) => new File.fromJson(data));
     } else {
       return _response;
@@ -194,7 +197,7 @@
    *
    * Completes with a [FileList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -205,7 +208,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -228,7 +231,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/files';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/files';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -243,14 +246,13 @@
 }
 
 
-/** Not documented yet. */
 class ReportsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   ReportsCompatibleFieldsResourceApi get compatibleFields => new ReportsCompatibleFieldsResourceApi(_requester);
   ReportsFilesResourceApi get files => new ReportsFilesResourceApi(_requester);
 
-  ReportsResourceApi(common_internal.ApiRequester client) : 
+  ReportsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -262,7 +264,7 @@
    *
    * [reportId] - The ID of the report.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -273,7 +275,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -285,7 +287,7 @@
 
     _downloadOptions = null;
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/reports/' + common_internal.Escaper.ecapeVariable('$reportId');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/reports/' + commons.Escaper.ecapeVariable('$reportId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -308,7 +310,7 @@
    *
    * Completes with a [Report].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -319,7 +321,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -330,7 +332,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/reports/' + common_internal.Escaper.ecapeVariable('$reportId');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/reports/' + commons.Escaper.ecapeVariable('$reportId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -353,7 +355,7 @@
    *
    * Completes with a [Report].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -364,7 +366,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -375,7 +377,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/reports';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/reports';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -418,7 +420,7 @@
    *
    * Completes with a [ReportList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -429,7 +431,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -452,7 +454,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/reports';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/reports';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -477,7 +479,7 @@
    *
    * Completes with a [Report].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -488,7 +490,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -502,7 +504,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/reports/' + common_internal.Escaper.ecapeVariable('$reportId');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/reports/' + commons.Escaper.ecapeVariable('$reportId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -527,7 +529,7 @@
    *
    * Completes with a [File].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -538,7 +540,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -552,7 +554,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/reports/' + common_internal.Escaper.ecapeVariable('$reportId') + '/run';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/reports/' + commons.Escaper.ecapeVariable('$reportId') + '/run';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -577,7 +579,7 @@
    *
    * Completes with a [Report].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -588,7 +590,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -602,7 +604,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/reports/' + common_internal.Escaper.ecapeVariable('$reportId');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/reports/' + commons.Escaper.ecapeVariable('$reportId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -617,11 +619,10 @@
 }
 
 
-/** Not documented yet. */
 class ReportsCompatibleFieldsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ReportsCompatibleFieldsResourceApi(common_internal.ApiRequester client) : 
+  ReportsCompatibleFieldsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -637,7 +638,7 @@
    *
    * Completes with a [CompatibleFields].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -648,7 +649,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -659,7 +660,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/reports/compatiblefields/query';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/reports/compatiblefields/query';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -674,11 +675,10 @@
 }
 
 
-/** Not documented yet. */
 class ReportsFilesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ReportsFilesResourceApi(common_internal.ApiRequester client) : 
+  ReportsFilesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -700,20 +700,20 @@
    *
    * - [File] for Metadata downloads (see [downloadOptions]).
    *
-   * - [common.Media] for Media downloads (see [downloadOptions]).
+   * - [commons.Media] for Media downloads (see [downloadOptions]).
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future get(core.String profileId, core.String reportId, core.String fileId, {common.DownloadOptions downloadOptions: common.DownloadOptions.Metadata}) {
+  async.Future get(core.String profileId, core.String reportId, core.String fileId, {commons.DownloadOptions downloadOptions: commons.DownloadOptions.Metadata}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -728,7 +728,7 @@
 
     _downloadOptions = downloadOptions;
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/reports/' + common_internal.Escaper.ecapeVariable('$reportId') + '/files/' + common_internal.Escaper.ecapeVariable('$fileId');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/reports/' + commons.Escaper.ecapeVariable('$reportId') + '/files/' + commons.Escaper.ecapeVariable('$fileId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -738,7 +738,7 @@
                                        uploadMedia: _uploadMedia,
                                        downloadOptions: _downloadOptions);
     if (_downloadOptions == null ||
-        _downloadOptions == common.DownloadOptions.Metadata) {
+        _downloadOptions == commons.DownloadOptions.Metadata) {
       return _response.then((data) => new File.fromJson(data));
     } else {
       return _response;
@@ -771,7 +771,7 @@
    *
    * Completes with a [FileList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -782,7 +782,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -805,7 +805,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/reports/' + common_internal.Escaper.ecapeVariable('$reportId') + '/files';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/reports/' + commons.Escaper.ecapeVariable('$reportId') + '/files';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -820,11 +820,10 @@
 }
 
 
-/** Not documented yet. */
 class UserProfilesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  UserProfilesResourceApi(common_internal.ApiRequester client) : 
+  UserProfilesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -836,7 +835,7 @@
    *
    * Completes with a [UserProfile].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -847,7 +846,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -855,7 +854,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -874,7 +873,7 @@
    *
    * Completes with a [UserProfileList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -885,7 +884,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -3372,5 +3371,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/dfareporting/v2_0.dart b/generated/googleapis/lib/dfareporting/v2_0.dart
index c98db49..44c6d50 100644
--- a/generated/googleapis/lib/dfareporting/v2_0.dart
+++ b/generated/googleapis/lib/dfareporting/v2_0.dart
@@ -1,17 +1,22 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.dfareporting.v2_0;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError, Media, UploadOptions,
+    ResumableUploadOptions, DownloadOptions, PartialDownloadOptions,
+    ByteRange;
+
+const core.String USER_AGENT = 'dart-api-client dfareporting/v2.0';
 
 /** Manage your DoubleClick Campaign Manager ad campaigns and reports. */
 class DfareportingApi {
@@ -25,7 +30,7 @@
   static const DfatraffickingScope = "https://www.googleapis.com/auth/dfatrafficking";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AccountActiveAdSummariesResourceApi get accountActiveAdSummaries => new AccountActiveAdSummariesResourceApi(_requester);
   AccountPermissionGroupsResourceApi get accountPermissionGroups => new AccountPermissionGroupsResourceApi(_requester);
@@ -77,15 +82,14 @@
   UserRolesResourceApi get userRoles => new UserRolesResourceApi(_requester);
 
   DfareportingApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "dfareporting/v2.0/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class AccountActiveAdSummariesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountActiveAdSummariesResourceApi(common_internal.ApiRequester client) : 
+  AccountActiveAdSummariesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -99,7 +103,7 @@
    *
    * Completes with a [AccountActiveAdSummary].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -110,7 +114,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -121,7 +125,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/accountActiveAdSummaries/' + common_internal.Escaper.ecapeVariable('$summaryAccountId');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/accountActiveAdSummaries/' + commons.Escaper.ecapeVariable('$summaryAccountId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -136,11 +140,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountPermissionGroupsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountPermissionGroupsResourceApi(common_internal.ApiRequester client) : 
+  AccountPermissionGroupsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -154,7 +157,7 @@
    *
    * Completes with a [AccountPermissionGroup].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -165,7 +168,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -176,7 +179,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/accountPermissionGroups/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/accountPermissionGroups/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -197,7 +200,7 @@
    *
    * Completes with a [AccountPermissionGroupsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -208,7 +211,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -216,7 +219,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/accountPermissionGroups';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/accountPermissionGroups';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -231,11 +234,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountPermissionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountPermissionsResourceApi(common_internal.ApiRequester client) : 
+  AccountPermissionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -249,7 +251,7 @@
    *
    * Completes with a [AccountPermission].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -260,7 +262,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -271,7 +273,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/accountPermissions/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/accountPermissions/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -292,7 +294,7 @@
    *
    * Completes with a [AccountPermissionsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -303,7 +305,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -311,7 +313,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/accountPermissions';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/accountPermissions';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -326,11 +328,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountUserProfilesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountUserProfilesResourceApi(common_internal.ApiRequester client) : 
+  AccountUserProfilesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -344,7 +345,7 @@
    *
    * Completes with a [AccountUserProfile].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -355,7 +356,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -366,7 +367,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/accountUserProfiles/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/accountUserProfiles/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -395,11 +396,11 @@
    *
    * [searchString] - Allows searching for objects by name, ID or email.
    * Wildcards (*) are allowed. For example, "user profile*2015" will return
-   * objects with names like "user profile June 2015", "user profile April 2015"
-   * or simply "user profile 2015". Most of the searches also add wildcards
-   * implicitly at the start and the end of the search string. For example, a
-   * search string of "user profile" will match objects with name "my user
-   * profile", "user profile 2015" or simply "user profile".
+   * objects with names like "user profile June 2015", "user profile April
+   * 2015", or simply "user profile 2015". Most of the searches also add
+   * wildcards implicitly at the start and the end of the search string. For
+   * example, a search string of "user profile" will match objects with name "my
+   * user profile", "user profile 2015", or simply "user profile".
    *
    * [sortField] - Field by which to sort the list.
    * Possible string values are:
@@ -418,7 +419,7 @@
    *
    * Completes with a [AccountUserProfilesListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -429,7 +430,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -464,7 +465,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/accountUserProfiles';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/accountUserProfiles';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -490,7 +491,7 @@
    *
    * Completes with a [AccountUserProfile].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -501,7 +502,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -516,7 +517,7 @@
     _queryParams["id"] = [id];
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/accountUserProfiles';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/accountUserProfiles';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -539,7 +540,7 @@
    *
    * Completes with a [AccountUserProfile].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -550,7 +551,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -561,7 +562,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/accountUserProfiles';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/accountUserProfiles';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -576,11 +577,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsResourceApi(common_internal.ApiRequester client) : 
+  AccountsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -594,7 +594,7 @@
    *
    * Completes with a [Account].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -605,7 +605,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -616,7 +616,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/accounts/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/accounts/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -646,10 +646,10 @@
    *
    * [searchString] - Allows searching for objects by name or ID. Wildcards (*)
    * are allowed. For example, "account*2015" will return objects with names
-   * like "account June 2015", "account April 2015" or simply "account 2015".
+   * like "account June 2015", "account April 2015", or simply "account 2015".
    * Most of the searches also add wildcards implicitly at the start and the end
    * of the search string. For example, a search string of "account" will match
-   * objects with name "my account", "account 2015" or simply "account".
+   * objects with name "my account", "account 2015", or simply "account".
    *
    * [sortField] - Field by which to sort the list.
    * Possible string values are:
@@ -663,7 +663,7 @@
    *
    * Completes with a [AccountsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -674,7 +674,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -703,7 +703,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/accounts';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/accounts';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -728,7 +728,7 @@
    *
    * Completes with a [Account].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -739,7 +739,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -754,7 +754,7 @@
     _queryParams["id"] = [id];
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/accounts';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/accounts';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -777,7 +777,7 @@
    *
    * Completes with a [Account].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -788,7 +788,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -799,7 +799,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/accounts';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/accounts';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -814,11 +814,10 @@
 }
 
 
-/** Not documented yet. */
 class AdsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AdsResourceApi(common_internal.ApiRequester client) : 
+  AdsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -832,7 +831,7 @@
    *
    * Completes with a [Ad].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -843,7 +842,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -854,7 +853,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/ads/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/ads/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -877,7 +876,7 @@
    *
    * Completes with a [Ad].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -888,7 +887,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -899,7 +898,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/ads';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/ads';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -993,10 +992,10 @@
    *
    * [searchString] - Allows searching for objects by name or ID. Wildcards (*)
    * are allowed. For example, "ad*2015" will return objects with names like "ad
-   * June 2015", "ad April 2015" or simply "ad 2015". Most of the searches also
+   * June 2015", "ad April 2015", or simply "ad 2015". Most of the searches also
    * add wildcards implicitly at the start and the end of the search string. For
    * example, a search string of "ad" will match objects with name "my ad", "ad
-   * 2015" or simply "ad".
+   * 2015", or simply "ad".
    *
    * [sizeIds] - Select only ads with these size IDs.
    *
@@ -1018,7 +1017,7 @@
    *
    * Completes with a [AdsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1029,7 +1028,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -1109,7 +1108,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/ads';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/ads';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1134,7 +1133,7 @@
    *
    * Completes with a [Ad].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1145,7 +1144,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1160,7 +1159,7 @@
     _queryParams["id"] = [id];
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/ads';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/ads';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1183,7 +1182,7 @@
    *
    * Completes with a [Ad].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1194,7 +1193,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1205,7 +1204,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/ads';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/ads';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1220,11 +1219,10 @@
 }
 
 
-/** Not documented yet. */
 class AdvertiserGroupsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AdvertiserGroupsResourceApi(common_internal.ApiRequester client) : 
+  AdvertiserGroupsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1236,7 +1234,7 @@
    *
    * [id] - Advertiser group ID.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1247,7 +1245,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -1259,7 +1257,7 @@
 
     _downloadOptions = null;
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/advertiserGroups/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/advertiserGroups/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1282,7 +1280,7 @@
    *
    * Completes with a [AdvertiserGroup].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1293,7 +1291,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -1304,7 +1302,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/advertiserGroups/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/advertiserGroups/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1327,7 +1325,7 @@
    *
    * Completes with a [AdvertiserGroup].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1338,7 +1336,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1349,7 +1347,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/advertiserGroups';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/advertiserGroups';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1376,11 +1374,11 @@
    *
    * [searchString] - Allows searching for objects by name or ID. Wildcards (*)
    * are allowed. For example, "advertiser*2015" will return objects with names
-   * like "advertiser group June 2015", "advertiser group April 2015" or simply
+   * like "advertiser group June 2015", "advertiser group April 2015", or simply
    * "advertiser group 2015". Most of the searches also add wildcards implicitly
    * at the start and the end of the search string. For example, a search string
    * of "advertisergroup" will match objects with name "my advertisergroup",
-   * "advertisergroup 2015" or simply "advertisergroup".
+   * "advertisergroup 2015", or simply "advertisergroup".
    *
    * [sortField] - Field by which to sort the list.
    * Possible string values are:
@@ -1394,7 +1392,7 @@
    *
    * Completes with a [AdvertiserGroupsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1405,7 +1403,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -1431,7 +1429,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/advertiserGroups';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/advertiserGroups';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1456,7 +1454,7 @@
    *
    * Completes with a [AdvertiserGroup].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1467,7 +1465,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1482,7 +1480,7 @@
     _queryParams["id"] = [id];
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/advertiserGroups';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/advertiserGroups';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1505,7 +1503,7 @@
    *
    * Completes with a [AdvertiserGroup].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1516,7 +1514,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1527,7 +1525,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/advertiserGroups';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/advertiserGroups';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1542,11 +1540,10 @@
 }
 
 
-/** Not documented yet. */
 class AdvertisersResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AdvertisersResourceApi(common_internal.ApiRequester client) : 
+  AdvertisersResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1560,7 +1557,7 @@
    *
    * Completes with a [Advertiser].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1571,7 +1568,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -1582,7 +1579,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/advertisers/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/advertisers/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1605,7 +1602,7 @@
    *
    * Completes with a [Advertiser].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1616,7 +1613,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1627,7 +1624,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/advertisers';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/advertisers';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1666,10 +1663,10 @@
    *
    * [searchString] - Allows searching for objects by name or ID. Wildcards (*)
    * are allowed. For example, "advertiser*2015" will return objects with names
-   * like "advertiser June 2015", "advertiser April 2015" or simply "advertiser
+   * like "advertiser June 2015", "advertiser April 2015", or simply "advertiser
    * 2015". Most of the searches also add wildcards implicitly at the start and
    * the end of the search string. For example, a search string of "advertiser"
-   * will match objects with name "my advertiser", "advertiser 2015" or simply
+   * will match objects with name "my advertiser", "advertiser 2015", or simply
    * "advertiser".
    *
    * [sortField] - Field by which to sort the list.
@@ -1691,7 +1688,7 @@
    *
    * Completes with a [AdvertisersListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1702,7 +1699,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -1746,7 +1743,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/advertisers';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/advertisers';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1771,7 +1768,7 @@
    *
    * Completes with a [Advertiser].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1782,7 +1779,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1797,7 +1794,7 @@
     _queryParams["id"] = [id];
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/advertisers';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/advertisers';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1820,7 +1817,7 @@
    *
    * Completes with a [Advertiser].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1831,7 +1828,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1842,7 +1839,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/advertisers';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/advertisers';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1857,11 +1854,10 @@
 }
 
 
-/** Not documented yet. */
 class BrowsersResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  BrowsersResourceApi(common_internal.ApiRequester client) : 
+  BrowsersResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1873,7 +1869,7 @@
    *
    * Completes with a [BrowsersListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1884,7 +1880,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -1892,7 +1888,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/browsers';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/browsers';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1907,11 +1903,10 @@
 }
 
 
-/** Not documented yet. */
 class CampaignCreativeAssociationsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  CampaignCreativeAssociationsResourceApi(common_internal.ApiRequester client) : 
+  CampaignCreativeAssociationsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1929,7 +1924,7 @@
    *
    * Completes with a [CampaignCreativeAssociation].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1940,7 +1935,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1954,7 +1949,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/campaigns/' + common_internal.Escaper.ecapeVariable('$campaignId') + '/campaignCreativeAssociations';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/campaigns/' + commons.Escaper.ecapeVariable('$campaignId') + '/campaignCreativeAssociations';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1986,7 +1981,7 @@
    *
    * Completes with a [CampaignCreativeAssociationsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1997,7 +1992,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -2017,7 +2012,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/campaigns/' + common_internal.Escaper.ecapeVariable('$campaignId') + '/campaignCreativeAssociations';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/campaigns/' + commons.Escaper.ecapeVariable('$campaignId') + '/campaignCreativeAssociations';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2032,11 +2027,10 @@
 }
 
 
-/** Not documented yet. */
 class CampaignsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  CampaignsResourceApi(common_internal.ApiRequester client) : 
+  CampaignsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2050,7 +2044,7 @@
    *
    * Completes with a [Campaign].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2061,7 +2055,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -2072,7 +2066,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/campaigns/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/campaigns/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2100,7 +2094,7 @@
    *
    * Completes with a [Campaign].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2111,7 +2105,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2130,7 +2124,7 @@
     _queryParams["defaultLandingPageUrl"] = [defaultLandingPageUrl];
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/campaigns';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/campaigns';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2173,10 +2167,10 @@
    *
    * [searchString] - Allows searching for campaigns by name or ID. Wildcards
    * (*) are allowed. For example, "campaign*2015" will return campaigns with
-   * names like "campaign June 2015", "campaign April 2015" or simply "campaign
+   * names like "campaign June 2015", "campaign April 2015", or simply "campaign
    * 2015". Most of the searches also add wildcards implicitly at the start and
    * the end of the search string. For example, a search string of "campaign"
-   * will match campaigns with name "my campaign", "campaign 2015" or simply
+   * will match campaigns with name "my campaign", "campaign 2015", or simply
    * "campaign".
    *
    * [sortField] - Field by which to sort the list.
@@ -2193,7 +2187,7 @@
    *
    * Completes with a [CampaignsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2204,7 +2198,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -2251,7 +2245,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/campaigns';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/campaigns';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2276,7 +2270,7 @@
    *
    * Completes with a [Campaign].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2287,7 +2281,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2302,7 +2296,7 @@
     _queryParams["id"] = [id];
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/campaigns';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/campaigns';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -2325,7 +2319,7 @@
    *
    * Completes with a [Campaign].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2336,7 +2330,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2347,7 +2341,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/campaigns';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/campaigns';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -2362,11 +2356,10 @@
 }
 
 
-/** Not documented yet. */
 class ChangeLogsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ChangeLogsResourceApi(common_internal.ApiRequester client) : 
+  ChangeLogsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2380,7 +2373,7 @@
    *
    * Completes with a [ChangeLog].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2391,7 +2384,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -2402,7 +2395,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/changeLogs/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/changeLogs/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2508,7 +2501,7 @@
    *
    * Completes with a [ChangeLogsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2519,7 +2512,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -2557,7 +2550,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/changeLogs';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/changeLogs';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2572,11 +2565,10 @@
 }
 
 
-/** Not documented yet. */
 class CitiesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  CitiesResourceApi(common_internal.ApiRequester client) : 
+  CitiesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2596,7 +2588,7 @@
    *
    * Completes with a [CitiesListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2607,7 +2599,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -2627,7 +2619,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/cities';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/cities';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2642,11 +2634,10 @@
 }
 
 
-/** Not documented yet. */
 class ConnectionTypesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ConnectionTypesResourceApi(common_internal.ApiRequester client) : 
+  ConnectionTypesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2658,7 +2649,7 @@
    *
    * Completes with a [ConnectionTypesListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2669,7 +2660,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -2677,7 +2668,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/connectionTypes';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/connectionTypes';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2692,11 +2683,10 @@
 }
 
 
-/** Not documented yet. */
 class ContentCategoriesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ContentCategoriesResourceApi(common_internal.ApiRequester client) : 
+  ContentCategoriesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2708,7 +2698,7 @@
    *
    * [id] - Content category ID.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2719,7 +2709,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -2731,7 +2721,7 @@
 
     _downloadOptions = null;
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/contentCategories/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/contentCategories/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -2754,7 +2744,7 @@
    *
    * Completes with a [ContentCategory].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2765,7 +2755,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -2776,7 +2766,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/contentCategories/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/contentCategories/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2799,7 +2789,7 @@
    *
    * Completes with a [ContentCategory].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2810,7 +2800,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2821,7 +2811,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/contentCategories';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/contentCategories';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2848,11 +2838,11 @@
    *
    * [searchString] - Allows searching for objects by name or ID. Wildcards (*)
    * are allowed. For example, "contentcategory*2015" will return objects with
-   * names like "contentcategory June 2015", "contentcategory April 2015" or
+   * names like "contentcategory June 2015", "contentcategory April 2015", or
    * simply "contentcategory 2015". Most of the searches also add wildcards
    * implicitly at the start and the end of the search string. For example, a
    * search string of "contentcategory" will match objects with name "my
-   * contentcategory", "contentcategory 2015" or simply "contentcategory".
+   * contentcategory", "contentcategory 2015", or simply "contentcategory".
    *
    * [sortField] - Field by which to sort the list.
    * Possible string values are:
@@ -2866,7 +2856,7 @@
    *
    * Completes with a [ContentCategoriesListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2877,7 +2867,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -2903,7 +2893,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/contentCategories';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/contentCategories';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2928,7 +2918,7 @@
    *
    * Completes with a [ContentCategory].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2939,7 +2929,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2954,7 +2944,7 @@
     _queryParams["id"] = [id];
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/contentCategories';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/contentCategories';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -2977,7 +2967,7 @@
    *
    * Completes with a [ContentCategory].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2988,7 +2978,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2999,7 +2989,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/contentCategories';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/contentCategories';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -3014,11 +3004,10 @@
 }
 
 
-/** Not documented yet. */
 class CountriesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  CountriesResourceApi(common_internal.ApiRequester client) : 
+  CountriesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3032,7 +3021,7 @@
    *
    * Completes with a [Country].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3043,7 +3032,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -3054,7 +3043,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/countries/' + common_internal.Escaper.ecapeVariable('$dartId');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/countries/' + commons.Escaper.ecapeVariable('$dartId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3075,7 +3064,7 @@
    *
    * Completes with a [CountriesListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3086,7 +3075,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -3094,7 +3083,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/countries';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/countries';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3109,11 +3098,10 @@
 }
 
 
-/** Not documented yet. */
 class CreativeAssetsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  CreativeAssetsResourceApi(common_internal.ApiRequester client) : 
+  CreativeAssetsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3134,18 +3122,18 @@
    *
    * Completes with a [CreativeAssetMetadata].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<CreativeAssetMetadata> insert(CreativeAssetMetadata request, core.String profileId, core.String advertiserId, {common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<CreativeAssetMetadata> insert(CreativeAssetMetadata request, core.String profileId, core.String advertiserId, {commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3162,11 +3150,11 @@
     _uploadOptions =  uploadOptions;
 
     if (_uploadMedia == null) {
-      _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/creativeAssets/' + common_internal.Escaper.ecapeVariable('$advertiserId') + '/creativeAssets';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/dfareporting/v2.0/userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/creativeAssets/' + common_internal.Escaper.ecapeVariable('$advertiserId') + '/creativeAssets';
+      _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/creativeAssets/' + commons.Escaper.ecapeVariable('$advertiserId') + '/creativeAssets';
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/dfareporting/v2.0/userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/creativeAssets/' + commons.Escaper.ecapeVariable('$advertiserId') + '/creativeAssets';
     } else {
-      _url = '/upload/dfareporting/v2.0/userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/creativeAssets/' + common_internal.Escaper.ecapeVariable('$advertiserId') + '/creativeAssets';
+      _url = '/upload/dfareporting/v2.0/userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/creativeAssets/' + commons.Escaper.ecapeVariable('$advertiserId') + '/creativeAssets';
     }
 
 
@@ -3183,11 +3171,10 @@
 }
 
 
-/** Not documented yet. */
 class CreativeFieldValuesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  CreativeFieldValuesResourceApi(common_internal.ApiRequester client) : 
+  CreativeFieldValuesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3201,7 +3188,7 @@
    *
    * [id] - Creative Field Value ID
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3212,7 +3199,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -3227,7 +3214,7 @@
 
     _downloadOptions = null;
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/creativeFields/' + common_internal.Escaper.ecapeVariable('$creativeFieldId') + '/creativeFieldValues/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/creativeFields/' + commons.Escaper.ecapeVariable('$creativeFieldId') + '/creativeFieldValues/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -3252,7 +3239,7 @@
    *
    * Completes with a [CreativeFieldValue].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3263,7 +3250,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -3277,7 +3264,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/creativeFields/' + common_internal.Escaper.ecapeVariable('$creativeFieldId') + '/creativeFieldValues/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/creativeFields/' + commons.Escaper.ecapeVariable('$creativeFieldId') + '/creativeFieldValues/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3302,7 +3289,7 @@
    *
    * Completes with a [CreativeFieldValue].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3313,7 +3300,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3327,7 +3314,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/creativeFields/' + common_internal.Escaper.ecapeVariable('$creativeFieldId') + '/creativeFieldValues';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/creativeFields/' + commons.Escaper.ecapeVariable('$creativeFieldId') + '/creativeFieldValues';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -3369,7 +3356,7 @@
    *
    * Completes with a [CreativeFieldValuesListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3380,7 +3367,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -3409,7 +3396,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/creativeFields/' + common_internal.Escaper.ecapeVariable('$creativeFieldId') + '/creativeFieldValues';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/creativeFields/' + commons.Escaper.ecapeVariable('$creativeFieldId') + '/creativeFieldValues';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3437,7 +3424,7 @@
    *
    * Completes with a [CreativeFieldValue].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3448,7 +3435,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3466,7 +3453,7 @@
     _queryParams["id"] = [id];
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/creativeFields/' + common_internal.Escaper.ecapeVariable('$creativeFieldId') + '/creativeFieldValues';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/creativeFields/' + commons.Escaper.ecapeVariable('$creativeFieldId') + '/creativeFieldValues';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -3491,7 +3478,7 @@
    *
    * Completes with a [CreativeFieldValue].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3502,7 +3489,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3516,7 +3503,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/creativeFields/' + common_internal.Escaper.ecapeVariable('$creativeFieldId') + '/creativeFieldValues';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/creativeFields/' + commons.Escaper.ecapeVariable('$creativeFieldId') + '/creativeFieldValues';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -3531,11 +3518,10 @@
 }
 
 
-/** Not documented yet. */
 class CreativeFieldsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  CreativeFieldsResourceApi(common_internal.ApiRequester client) : 
+  CreativeFieldsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3547,7 +3533,7 @@
    *
    * [id] - Creative Field ID
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3558,7 +3544,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -3570,7 +3556,7 @@
 
     _downloadOptions = null;
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/creativeFields/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/creativeFields/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -3593,7 +3579,7 @@
    *
    * Completes with a [CreativeField].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3604,7 +3590,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -3615,7 +3601,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/creativeFields/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/creativeFields/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3638,7 +3624,7 @@
    *
    * Completes with a [CreativeField].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3649,7 +3635,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3660,7 +3646,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/creativeFields';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/creativeFields';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -3691,10 +3677,10 @@
    * [searchString] - Allows searching for creative fields by name or ID.
    * Wildcards (*) are allowed. For example, "creativefield*2015" will return
    * creative fields with names like "creativefield June 2015", "creativefield
-   * April 2015" or simply "creativefield 2015". Most of the searches also add
+   * April 2015", or simply "creativefield 2015". Most of the searches also add
    * wild-cards implicitly at the start and the end of the search string. For
    * example, a search string of "creativefield" will match creative fields with
-   * the name "my creativefield", "creativefield 2015" or simply
+   * the name "my creativefield", "creativefield 2015", or simply
    * "creativefield".
    *
    * [sortField] - Field by which to sort the list.
@@ -3709,7 +3695,7 @@
    *
    * Completes with a [CreativeFieldsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3720,7 +3706,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -3749,7 +3735,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/creativeFields';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/creativeFields';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3774,7 +3760,7 @@
    *
    * Completes with a [CreativeField].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3785,7 +3771,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3800,7 +3786,7 @@
     _queryParams["id"] = [id];
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/creativeFields';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/creativeFields';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -3823,7 +3809,7 @@
    *
    * Completes with a [CreativeField].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3834,7 +3820,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3845,7 +3831,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/creativeFields';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/creativeFields';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -3860,11 +3846,10 @@
 }
 
 
-/** Not documented yet. */
 class CreativeGroupsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  CreativeGroupsResourceApi(common_internal.ApiRequester client) : 
+  CreativeGroupsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3878,7 +3863,7 @@
    *
    * Completes with a [CreativeGroup].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3889,7 +3874,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -3900,7 +3885,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/creativeGroups/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/creativeGroups/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3923,7 +3908,7 @@
    *
    * Completes with a [CreativeGroup].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3934,7 +3919,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3945,7 +3930,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/creativeGroups';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/creativeGroups';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -3978,10 +3963,10 @@
    * [searchString] - Allows searching for creative groups by name or ID.
    * Wildcards (*) are allowed. For example, "creativegroup*2015" will return
    * creative groups with names like "creativegroup June 2015", "creativegroup
-   * April 2015" or simply "creativegroup 2015". Most of the searches also add
+   * April 2015", or simply "creativegroup 2015". Most of the searches also add
    * wild-cards implicitly at the start and the end of the search string. For
    * example, a search string of "creativegroup" will match creative groups with
-   * the name "my creativegroup", "creativegroup 2015" or simply
+   * the name "my creativegroup", "creativegroup 2015", or simply
    * "creativegroup".
    *
    * [sortField] - Field by which to sort the list.
@@ -3996,7 +3981,7 @@
    *
    * Completes with a [CreativeGroupsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4007,7 +3992,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -4039,7 +4024,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/creativeGroups';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/creativeGroups';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -4064,7 +4049,7 @@
    *
    * Completes with a [CreativeGroup].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4075,7 +4060,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -4090,7 +4075,7 @@
     _queryParams["id"] = [id];
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/creativeGroups';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/creativeGroups';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -4113,7 +4098,7 @@
    *
    * Completes with a [CreativeGroup].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4124,7 +4109,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -4135,7 +4120,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/creativeGroups';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/creativeGroups';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -4150,11 +4135,10 @@
 }
 
 
-/** Not documented yet. */
 class CreativesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  CreativesResourceApi(common_internal.ApiRequester client) : 
+  CreativesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -4168,7 +4152,7 @@
    *
    * Completes with a [Creative].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4179,7 +4163,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -4190,7 +4174,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/creatives/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/creatives/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -4213,7 +4197,7 @@
    *
    * Completes with a [Creative].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4224,7 +4208,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -4235,7 +4219,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/creatives';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/creatives';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -4279,10 +4263,11 @@
    *
    * [searchString] - Allows searching for objects by name or ID. Wildcards (*)
    * are allowed. For example, "creative*2015" will return objects with names
-   * like "creative June 2015", "creative April 2015" or simply "creative 2015".
-   * Most of the searches also add wildcards implicitly at the start and the end
-   * of the search string. For example, a search string of "creative" will match
-   * objects with name "my creative", "creative 2015" or simply "creative".
+   * like "creative June 2015", "creative April 2015", or simply "creative
+   * 2015". Most of the searches also add wildcards implicitly at the start and
+   * the end of the search string. For example, a search string of "creative"
+   * will match objects with name "my creative", "creative 2015", or simply
+   * "creative".
    *
    * [sizeIds] - Select only creatives with these size IDs.
    *
@@ -4303,7 +4288,7 @@
    *
    * Completes with a [CreativesListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4314,7 +4299,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -4370,7 +4355,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/creatives';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/creatives';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -4395,7 +4380,7 @@
    *
    * Completes with a [Creative].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4406,7 +4391,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -4421,7 +4406,7 @@
     _queryParams["id"] = [id];
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/creatives';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/creatives';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -4444,7 +4429,7 @@
    *
    * Completes with a [Creative].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4455,7 +4440,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -4466,7 +4451,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/creatives';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/creatives';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -4481,11 +4466,10 @@
 }
 
 
-/** Not documented yet. */
 class DimensionValuesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  DimensionValuesResourceApi(common_internal.ApiRequester client) : 
+  DimensionValuesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -4504,7 +4488,7 @@
    *
    * Completes with a [DimensionValueList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4515,7 +4499,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -4532,7 +4516,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/dimensionvalues/query';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/dimensionvalues/query';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -4547,11 +4531,10 @@
 }
 
 
-/** Not documented yet. */
 class DirectorySiteContactsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  DirectorySiteContactsResourceApi(common_internal.ApiRequester client) : 
+  DirectorySiteContactsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -4565,7 +4548,7 @@
    *
    * Completes with a [DirectorySiteContact].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4576,7 +4559,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -4587,7 +4570,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/directorySiteContacts/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/directorySiteContacts/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -4618,11 +4601,11 @@
    * [searchString] - Allows searching for objects by name, ID or email.
    * Wildcards (*) are allowed. For example, "directory site contact*2015" will
    * return objects with names like "directory site contact June 2015",
-   * "directory site contact April 2015" or simply "directory site contact
+   * "directory site contact April 2015", or simply "directory site contact
    * 2015". Most of the searches also add wildcards implicitly at the start and
    * the end of the search string. For example, a search string of "directory
    * site contact" will match objects with name "my directory site contact",
-   * "directory site contact 2015" or simply "directory site contact".
+   * "directory site contact 2015", or simply "directory site contact".
    *
    * [sortField] - Field by which to sort the list.
    * Possible string values are:
@@ -4636,7 +4619,7 @@
    *
    * Completes with a [DirectorySiteContactsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4647,7 +4630,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -4676,7 +4659,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/directorySiteContacts';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/directorySiteContacts';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -4691,11 +4674,10 @@
 }
 
 
-/** Not documented yet. */
 class DirectorySitesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  DirectorySitesResourceApi(common_internal.ApiRequester client) : 
+  DirectorySitesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -4709,7 +4691,7 @@
    *
    * Completes with a [DirectorySite].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4720,7 +4702,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -4731,7 +4713,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/directorySites/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/directorySites/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -4776,11 +4758,11 @@
    *
    * [searchString] - Allows searching for objects by name, ID or URL. Wildcards
    * (*) are allowed. For example, "directory site*2015" will return objects
-   * with names like "directory site June 2015", "directory site April 2015" or
+   * with names like "directory site June 2015", "directory site April 2015", or
    * simply "directory site 2015". Most of the searches also add wildcards
    * implicitly at the start and the end of the search string. For example, a
    * search string of "directory site" will match objects with name "my
-   * directory site", "directory site 2015" or simply "directory site".
+   * directory site", "directory site 2015" or simply, "directory site".
    *
    * [sortField] - Field by which to sort the list.
    * Possible string values are:
@@ -4794,7 +4776,7 @@
    *
    * Completes with a [DirectorySitesListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4805,7 +4787,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -4852,7 +4834,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/directorySites';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/directorySites';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -4867,11 +4849,10 @@
 }
 
 
-/** Not documented yet. */
 class EventTagsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  EventTagsResourceApi(common_internal.ApiRequester client) : 
+  EventTagsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -4883,7 +4864,7 @@
    *
    * [id] - Event tag ID.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4894,7 +4875,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -4906,7 +4887,7 @@
 
     _downloadOptions = null;
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/eventTags/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/eventTags/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -4929,7 +4910,7 @@
    *
    * Completes with a [EventTag].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4940,7 +4921,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -4951,7 +4932,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/eventTags/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/eventTags/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -4974,7 +4955,7 @@
    *
    * Completes with a [EventTag].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4985,7 +4966,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -4996,7 +4977,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/eventTags';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/eventTags';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -5043,10 +5024,11 @@
    *
    * [searchString] - Allows searching for objects by name or ID. Wildcards (*)
    * are allowed. For example, "eventtag*2015" will return objects with names
-   * like "eventtag June 2015", "eventtag April 2015" or simply "eventtag 2015".
-   * Most of the searches also add wildcards implicitly at the start and the end
-   * of the search string. For example, a search string of "eventtag" will match
-   * objects with name "my eventtag", "eventtag 2015" or simply "eventtag".
+   * like "eventtag June 2015", "eventtag April 2015", or simply "eventtag
+   * 2015". Most of the searches also add wildcards implicitly at the start and
+   * the end of the search string. For example, a search string of "eventtag"
+   * will match objects with name "my eventtag", "eventtag 2015", or simply
+   * "eventtag".
    *
    * [sortField] - Field by which to sort the list.
    * Possible string values are:
@@ -5060,7 +5042,7 @@
    *
    * Completes with a [EventTagsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5071,7 +5053,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -5109,7 +5091,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/eventTags';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/eventTags';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -5134,7 +5116,7 @@
    *
    * Completes with a [EventTag].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5145,7 +5127,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -5160,7 +5142,7 @@
     _queryParams["id"] = [id];
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/eventTags';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/eventTags';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -5183,7 +5165,7 @@
    *
    * Completes with a [EventTag].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5194,7 +5176,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -5205,7 +5187,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/eventTags';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/eventTags';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -5220,11 +5202,10 @@
 }
 
 
-/** Not documented yet. */
 class FilesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  FilesResourceApi(common_internal.ApiRequester client) : 
+  FilesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -5244,20 +5225,20 @@
    *
    * - [File] for Metadata downloads (see [downloadOptions]).
    *
-   * - [common.Media] for Media downloads (see [downloadOptions]).
+   * - [commons.Media] for Media downloads (see [downloadOptions]).
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future get(core.String reportId, core.String fileId, {common.DownloadOptions downloadOptions: common.DownloadOptions.Metadata}) {
+  async.Future get(core.String reportId, core.String fileId, {commons.DownloadOptions downloadOptions: commons.DownloadOptions.Metadata}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (reportId == null) {
@@ -5269,7 +5250,7 @@
 
     _downloadOptions = downloadOptions;
 
-    _url = 'reports/' + common_internal.Escaper.ecapeVariable('$reportId') + '/files/' + common_internal.Escaper.ecapeVariable('$fileId');
+    _url = 'reports/' + commons.Escaper.ecapeVariable('$reportId') + '/files/' + commons.Escaper.ecapeVariable('$fileId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -5279,7 +5260,7 @@
                                        uploadMedia: _uploadMedia,
                                        downloadOptions: _downloadOptions);
     if (_downloadOptions == null ||
-        _downloadOptions == common.DownloadOptions.Metadata) {
+        _downloadOptions == commons.DownloadOptions.Metadata) {
       return _response.then((data) => new File.fromJson(data));
     } else {
       return _response;
@@ -5317,7 +5298,7 @@
    *
    * Completes with a [FileList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5328,7 +5309,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -5351,7 +5332,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/files';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/files';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -5366,11 +5347,10 @@
 }
 
 
-/** Not documented yet. */
 class FloodlightActivitiesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  FloodlightActivitiesResourceApi(common_internal.ApiRequester client) : 
+  FloodlightActivitiesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -5382,7 +5362,7 @@
    *
    * [id] - Floodlight activity ID.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5393,7 +5373,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -5405,7 +5385,7 @@
 
     _downloadOptions = null;
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/floodlightActivities/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/floodlightActivities/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -5429,7 +5409,7 @@
    *
    * Completes with a [FloodlightActivitiesGenerateTagResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5440,7 +5420,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -5451,7 +5431,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/floodlightActivities/generatetag';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/floodlightActivities/generatetag';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -5474,7 +5454,7 @@
    *
    * Completes with a [FloodlightActivity].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5485,7 +5465,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -5496,7 +5476,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/floodlightActivities/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/floodlightActivities/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -5519,7 +5499,7 @@
    *
    * Completes with a [FloodlightActivity].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5530,7 +5510,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -5541,7 +5521,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/floodlightActivities';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/floodlightActivities';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -5594,10 +5574,10 @@
    * [searchString] - Allows searching for objects by name or ID. Wildcards (*)
    * are allowed. For example, "floodlightactivity*2015" will return objects
    * with names like "floodlightactivity June 2015", "floodlightactivity April
-   * 2015" or simply "floodlightactivity 2015". Most of the searches also add
+   * 2015", or simply "floodlightactivity 2015". Most of the searches also add
    * wildcards implicitly at the start and the end of the search string. For
    * example, a search string of "floodlightactivity" will match objects with
-   * name "my floodlightactivity activity", "floodlightactivity 2015" or simply
+   * name "my floodlightactivity activity", "floodlightactivity 2015", or simply
    * "floodlightactivity".
    *
    * [sortField] - Field by which to sort the list.
@@ -5615,7 +5595,7 @@
    *
    * Completes with a [FloodlightActivitiesListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5626,7 +5606,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -5673,7 +5653,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/floodlightActivities';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/floodlightActivities';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -5699,7 +5679,7 @@
    *
    * Completes with a [FloodlightActivity].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5710,7 +5690,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -5725,7 +5705,7 @@
     _queryParams["id"] = [id];
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/floodlightActivities';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/floodlightActivities';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -5748,7 +5728,7 @@
    *
    * Completes with a [FloodlightActivity].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5759,7 +5739,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -5770,7 +5750,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/floodlightActivities';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/floodlightActivities';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -5785,11 +5765,10 @@
 }
 
 
-/** Not documented yet. */
 class FloodlightActivityGroupsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  FloodlightActivityGroupsResourceApi(common_internal.ApiRequester client) : 
+  FloodlightActivityGroupsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -5801,7 +5780,7 @@
    *
    * [id] - Floodlight activity Group ID.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5812,7 +5791,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -5824,7 +5803,7 @@
 
     _downloadOptions = null;
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/floodlightActivityGroups/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/floodlightActivityGroups/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -5847,7 +5826,7 @@
    *
    * Completes with a [FloodlightActivityGroup].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5858,7 +5837,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -5869,7 +5848,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/floodlightActivityGroups/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/floodlightActivityGroups/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -5892,7 +5871,7 @@
    *
    * Completes with a [FloodlightActivityGroup].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5903,7 +5882,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -5914,7 +5893,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/floodlightActivityGroups';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/floodlightActivityGroups';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -5934,16 +5913,16 @@
    * [profileId] - User profile ID associated with this request.
    *
    * [advertiserId] - Select only floodlight activity groups with the specified
-   * advertiser ID. Must specify either ids, advertiserId, or
+   * advertiser ID. Must specify either advertiserId or
    * floodlightConfigurationId for a non-empty result.
    *
    * [floodlightConfigurationId] - Select only floodlight activity groups with
-   * the specified floodlight configuration ID. Must specify either ids,
+   * the specified floodlight configuration ID. Must specify either
    * advertiserId, or floodlightConfigurationId for a non-empty result.
    *
    * [ids] - Select only floodlight activity groups with the specified IDs. Must
-   * specify either ids, advertiserId, or floodlightConfigurationId for a
-   * non-empty result.
+   * specify either advertiserId or floodlightConfigurationId for a non-empty
+   * result.
    *
    * [maxResults] - Maximum number of results to return.
    *
@@ -5952,12 +5931,12 @@
    * [searchString] - Allows searching for objects by name or ID. Wildcards (*)
    * are allowed. For example, "floodlightactivitygroup*2015" will return
    * objects with names like "floodlightactivitygroup June 2015",
-   * "floodlightactivitygroup April 2015" or simply "floodlightactivitygroup
+   * "floodlightactivitygroup April 2015", or simply "floodlightactivitygroup
    * 2015". Most of the searches also add wildcards implicitly at the start and
    * the end of the search string. For example, a search string of
    * "floodlightactivitygroup" will match objects with name "my
-   * floodlightactivitygroup activity", "floodlightactivitygroup 2015" or simply
-   * "floodlightactivitygroup".
+   * floodlightactivitygroup activity", "floodlightactivitygroup 2015", or
+   * simply "floodlightactivitygroup".
    *
    * [sortField] - Field by which to sort the list.
    * Possible string values are:
@@ -5977,7 +5956,7 @@
    *
    * Completes with a [FloodlightActivityGroupsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -5988,7 +5967,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -6023,7 +6002,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/floodlightActivityGroups';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/floodlightActivityGroups';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -6049,7 +6028,7 @@
    *
    * Completes with a [FloodlightActivityGroup].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6060,7 +6039,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -6075,7 +6054,7 @@
     _queryParams["id"] = [id];
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/floodlightActivityGroups';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/floodlightActivityGroups';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -6098,7 +6077,7 @@
    *
    * Completes with a [FloodlightActivityGroup].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6109,7 +6088,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -6120,7 +6099,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/floodlightActivityGroups';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/floodlightActivityGroups';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -6135,11 +6114,10 @@
 }
 
 
-/** Not documented yet. */
 class FloodlightConfigurationsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  FloodlightConfigurationsResourceApi(common_internal.ApiRequester client) : 
+  FloodlightConfigurationsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -6153,7 +6131,7 @@
    *
    * Completes with a [FloodlightConfiguration].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6164,7 +6142,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -6175,7 +6153,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/floodlightConfigurations/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/floodlightConfigurations/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -6199,7 +6177,7 @@
    *
    * Completes with a [FloodlightConfigurationsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6210,7 +6188,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -6221,7 +6199,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/floodlightConfigurations';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/floodlightConfigurations';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -6247,7 +6225,7 @@
    *
    * Completes with a [FloodlightConfiguration].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6258,7 +6236,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -6273,7 +6251,7 @@
     _queryParams["id"] = [id];
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/floodlightConfigurations';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/floodlightConfigurations';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -6296,7 +6274,7 @@
    *
    * Completes with a [FloodlightConfiguration].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6307,7 +6285,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -6318,7 +6296,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/floodlightConfigurations';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/floodlightConfigurations';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -6333,11 +6311,10 @@
 }
 
 
-/** Not documented yet. */
 class LandingPagesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  LandingPagesResourceApi(common_internal.ApiRequester client) : 
+  LandingPagesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -6351,7 +6328,7 @@
    *
    * [id] - Landing page ID.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6362,7 +6339,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -6377,7 +6354,7 @@
 
     _downloadOptions = null;
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/campaigns/' + common_internal.Escaper.ecapeVariable('$campaignId') + '/landingPages/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/campaigns/' + commons.Escaper.ecapeVariable('$campaignId') + '/landingPages/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -6402,7 +6379,7 @@
    *
    * Completes with a [LandingPage].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6413,7 +6390,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -6427,7 +6404,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/campaigns/' + common_internal.Escaper.ecapeVariable('$campaignId') + '/landingPages/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/campaigns/' + commons.Escaper.ecapeVariable('$campaignId') + '/landingPages/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -6452,7 +6429,7 @@
    *
    * Completes with a [LandingPage].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6463,7 +6440,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -6477,7 +6454,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/campaigns/' + common_internal.Escaper.ecapeVariable('$campaignId') + '/landingPages';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/campaigns/' + commons.Escaper.ecapeVariable('$campaignId') + '/landingPages';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -6500,7 +6477,7 @@
    *
    * Completes with a [LandingPagesListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6511,7 +6488,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -6522,7 +6499,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/campaigns/' + common_internal.Escaper.ecapeVariable('$campaignId') + '/landingPages';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/campaigns/' + commons.Escaper.ecapeVariable('$campaignId') + '/landingPages';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -6550,7 +6527,7 @@
    *
    * Completes with a [LandingPage].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6561,7 +6538,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -6579,7 +6556,7 @@
     _queryParams["id"] = [id];
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/campaigns/' + common_internal.Escaper.ecapeVariable('$campaignId') + '/landingPages';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/campaigns/' + commons.Escaper.ecapeVariable('$campaignId') + '/landingPages';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -6604,7 +6581,7 @@
    *
    * Completes with a [LandingPage].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6615,7 +6592,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -6629,7 +6606,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/campaigns/' + common_internal.Escaper.ecapeVariable('$campaignId') + '/landingPages';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/campaigns/' + commons.Escaper.ecapeVariable('$campaignId') + '/landingPages';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -6644,11 +6621,10 @@
 }
 
 
-/** Not documented yet. */
 class MetrosResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  MetrosResourceApi(common_internal.ApiRequester client) : 
+  MetrosResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -6660,7 +6636,7 @@
    *
    * Completes with a [MetrosListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6671,7 +6647,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -6679,7 +6655,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/metros';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/metros';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -6694,11 +6670,10 @@
 }
 
 
-/** Not documented yet. */
 class MobileCarriersResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  MobileCarriersResourceApi(common_internal.ApiRequester client) : 
+  MobileCarriersResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -6710,7 +6685,7 @@
    *
    * Completes with a [MobileCarriersListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6721,7 +6696,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -6729,7 +6704,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/mobileCarriers';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/mobileCarriers';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -6744,11 +6719,10 @@
 }
 
 
-/** Not documented yet. */
 class OperatingSystemVersionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  OperatingSystemVersionsResourceApi(common_internal.ApiRequester client) : 
+  OperatingSystemVersionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -6760,7 +6734,7 @@
    *
    * Completes with a [OperatingSystemVersionsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6771,7 +6745,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -6779,7 +6753,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/operatingSystemVersions';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/operatingSystemVersions';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -6794,11 +6768,10 @@
 }
 
 
-/** Not documented yet. */
 class OperatingSystemsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  OperatingSystemsResourceApi(common_internal.ApiRequester client) : 
+  OperatingSystemsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -6810,7 +6783,7 @@
    *
    * Completes with a [OperatingSystemsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6821,7 +6794,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -6829,7 +6802,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/operatingSystems';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/operatingSystems';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -6844,11 +6817,10 @@
 }
 
 
-/** Not documented yet. */
 class PlacementGroupsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PlacementGroupsResourceApi(common_internal.ApiRequester client) : 
+  PlacementGroupsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -6862,7 +6834,7 @@
    *
    * Completes with a [PlacementGroup].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6873,7 +6845,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -6884,7 +6856,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/placementGroups/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/placementGroups/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -6907,7 +6879,7 @@
    *
    * Completes with a [PlacementGroup].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -6918,7 +6890,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -6929,7 +6901,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/placementGroups';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/placementGroups';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -6987,10 +6959,10 @@
    * [searchString] - Allows searching for placement groups by name or ID.
    * Wildcards (*) are allowed. For example, "placement*2015" will return
    * placement groups with names like "placement group June 2015", "placement
-   * group May 2015" or simply "placements 2015". Most of the searches also add
+   * group May 2015", or simply "placements 2015". Most of the searches also add
    * wildcards implicitly at the start and the end of the search string. For
    * example, a search string of "placementgroup" will match placement groups
-   * with name "my placementgroup", "placementgroup 2015" or simply
+   * with name "my placementgroup", "placementgroup 2015", or simply
    * "placementgroup".
    *
    * [siteIds] - Select only placement groups that are associated with these
@@ -7008,7 +6980,7 @@
    *
    * Completes with a [PlacementGroupsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7019,7 +6991,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -7072,7 +7044,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/placementGroups';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/placementGroups';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -7097,7 +7069,7 @@
    *
    * Completes with a [PlacementGroup].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7108,7 +7080,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -7123,7 +7095,7 @@
     _queryParams["id"] = [id];
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/placementGroups';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/placementGroups';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -7146,7 +7118,7 @@
    *
    * Completes with a [PlacementGroup].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7157,7 +7129,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -7168,7 +7140,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/placementGroups';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/placementGroups';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -7183,11 +7155,10 @@
 }
 
 
-/** Not documented yet. */
 class PlacementStrategiesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PlacementStrategiesResourceApi(common_internal.ApiRequester client) : 
+  PlacementStrategiesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -7199,7 +7170,7 @@
    *
    * [id] - Placement strategy ID.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7210,7 +7181,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -7222,7 +7193,7 @@
 
     _downloadOptions = null;
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/placementStrategies/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/placementStrategies/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -7245,7 +7216,7 @@
    *
    * Completes with a [PlacementStrategy].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7256,7 +7227,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -7267,7 +7238,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/placementStrategies/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/placementStrategies/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -7290,7 +7261,7 @@
    *
    * Completes with a [PlacementStrategy].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7301,7 +7272,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -7312,7 +7283,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/placementStrategies';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/placementStrategies';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -7339,11 +7310,12 @@
    *
    * [searchString] - Allows searching for objects by name or ID. Wildcards (*)
    * are allowed. For example, "placementstrategy*2015" will return objects with
-   * names like "placementstrategy June 2015", "placementstrategy April 2015" or
-   * simply "placementstrategy 2015". Most of the searches also add wildcards
+   * names like "placementstrategy June 2015", "placementstrategy April 2015",
+   * or simply "placementstrategy 2015". Most of the searches also add wildcards
    * implicitly at the start and the end of the search string. For example, a
    * search string of "placementstrategy" will match objects with name "my
-   * placementstrategy", "placementstrategy 2015" or simply "placementstrategy".
+   * placementstrategy", "placementstrategy 2015", or simply
+   * "placementstrategy".
    *
    * [sortField] - Field by which to sort the list.
    * Possible string values are:
@@ -7357,7 +7329,7 @@
    *
    * Completes with a [PlacementStrategiesListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7368,7 +7340,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -7394,7 +7366,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/placementStrategies';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/placementStrategies';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -7420,7 +7392,7 @@
    *
    * Completes with a [PlacementStrategy].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7431,7 +7403,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -7446,7 +7418,7 @@
     _queryParams["id"] = [id];
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/placementStrategies';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/placementStrategies';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -7469,7 +7441,7 @@
    *
    * Completes with a [PlacementStrategy].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7480,7 +7452,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -7491,7 +7463,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/placementStrategies';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/placementStrategies';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -7506,11 +7478,10 @@
 }
 
 
-/** Not documented yet. */
 class PlacementsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PlacementsResourceApi(common_internal.ApiRequester client) : 
+  PlacementsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -7529,7 +7500,7 @@
    *
    * Completes with a [PlacementsGenerateTagsResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7540,7 +7511,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -7557,7 +7528,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/placements/generatetags';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/placements/generatetags';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -7580,7 +7551,7 @@
    *
    * Completes with a [Placement].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7591,7 +7562,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -7602,7 +7573,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/placements/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/placements/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -7625,7 +7596,7 @@
    *
    * Completes with a [Placement].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7636,7 +7607,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -7647,7 +7618,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/placements';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/placements';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -7706,11 +7677,11 @@
    *
    * [searchString] - Allows searching for placements by name or ID. Wildcards
    * (*) are allowed. For example, "placement*2015" will return placements with
-   * names like "placement June 2015", "placement May 2015" or simply
+   * names like "placement June 2015", "placement May 2015", or simply
    * "placements 2015". Most of the searches also add wildcards implicitly at
    * the start and the end of the search string. For example, a search string of
    * "placement" will match placements with name "my placement", "placement
-   * 2015" or simply "placement".
+   * 2015", or simply "placement".
    *
    * [siteIds] - Select only placements that are associated with these sites.
    *
@@ -7728,7 +7699,7 @@
    *
    * Completes with a [PlacementsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7739,7 +7710,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -7801,7 +7772,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/placements';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/placements';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -7826,7 +7797,7 @@
    *
    * Completes with a [Placement].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7837,7 +7808,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -7852,7 +7823,7 @@
     _queryParams["id"] = [id];
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/placements';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/placements';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -7875,7 +7846,7 @@
    *
    * Completes with a [Placement].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7886,7 +7857,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -7897,7 +7868,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/placements';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/placements';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -7912,11 +7883,10 @@
 }
 
 
-/** Not documented yet. */
 class PlatformTypesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PlatformTypesResourceApi(common_internal.ApiRequester client) : 
+  PlatformTypesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -7928,7 +7898,7 @@
    *
    * Completes with a [PlatformTypesListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7939,7 +7909,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -7947,7 +7917,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/platformTypes';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/platformTypes';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -7962,11 +7932,10 @@
 }
 
 
-/** Not documented yet. */
 class PostalCodesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PostalCodesResourceApi(common_internal.ApiRequester client) : 
+  PostalCodesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -7978,7 +7947,7 @@
    *
    * Completes with a [PostalCodesListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -7989,7 +7958,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -7997,7 +7966,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/postalCodes';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/postalCodes';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -8012,11 +7981,10 @@
 }
 
 
-/** Not documented yet. */
 class RegionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  RegionsResourceApi(common_internal.ApiRequester client) : 
+  RegionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -8028,7 +7996,7 @@
    *
    * Completes with a [RegionsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -8039,7 +8007,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -8047,7 +8015,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/regions';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/regions';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -8062,14 +8030,13 @@
 }
 
 
-/** Not documented yet. */
 class ReportsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   ReportsCompatibleFieldsResourceApi get compatibleFields => new ReportsCompatibleFieldsResourceApi(_requester);
   ReportsFilesResourceApi get files => new ReportsFilesResourceApi(_requester);
 
-  ReportsResourceApi(common_internal.ApiRequester client) : 
+  ReportsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -8081,7 +8048,7 @@
    *
    * [reportId] - The ID of the report.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -8092,7 +8059,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -8104,7 +8071,7 @@
 
     _downloadOptions = null;
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/reports/' + common_internal.Escaper.ecapeVariable('$reportId');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/reports/' + commons.Escaper.ecapeVariable('$reportId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -8127,7 +8094,7 @@
    *
    * Completes with a [Report].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -8138,7 +8105,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -8149,7 +8116,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/reports/' + common_internal.Escaper.ecapeVariable('$reportId');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/reports/' + commons.Escaper.ecapeVariable('$reportId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -8172,7 +8139,7 @@
    *
    * Completes with a [Report].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -8183,7 +8150,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -8194,7 +8161,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/reports';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/reports';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -8237,7 +8204,7 @@
    *
    * Completes with a [ReportList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -8248,7 +8215,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -8271,7 +8238,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/reports';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/reports';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -8296,7 +8263,7 @@
    *
    * Completes with a [Report].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -8307,7 +8274,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -8321,7 +8288,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/reports/' + common_internal.Escaper.ecapeVariable('$reportId');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/reports/' + commons.Escaper.ecapeVariable('$reportId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -8346,7 +8313,7 @@
    *
    * Completes with a [File].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -8357,7 +8324,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -8371,7 +8338,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/reports/' + common_internal.Escaper.ecapeVariable('$reportId') + '/run';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/reports/' + commons.Escaper.ecapeVariable('$reportId') + '/run';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -8396,7 +8363,7 @@
    *
    * Completes with a [Report].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -8407,7 +8374,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -8421,7 +8388,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/reports/' + common_internal.Escaper.ecapeVariable('$reportId');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/reports/' + commons.Escaper.ecapeVariable('$reportId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -8436,11 +8403,10 @@
 }
 
 
-/** Not documented yet. */
 class ReportsCompatibleFieldsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ReportsCompatibleFieldsResourceApi(common_internal.ApiRequester client) : 
+  ReportsCompatibleFieldsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -8456,7 +8422,7 @@
    *
    * Completes with a [CompatibleFields].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -8467,7 +8433,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -8478,7 +8444,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/reports/compatiblefields/query';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/reports/compatiblefields/query';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -8493,11 +8459,10 @@
 }
 
 
-/** Not documented yet. */
 class ReportsFilesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ReportsFilesResourceApi(common_internal.ApiRequester client) : 
+  ReportsFilesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -8519,20 +8484,20 @@
    *
    * - [File] for Metadata downloads (see [downloadOptions]).
    *
-   * - [common.Media] for Media downloads (see [downloadOptions]).
+   * - [commons.Media] for Media downloads (see [downloadOptions]).
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future get(core.String profileId, core.String reportId, core.String fileId, {common.DownloadOptions downloadOptions: common.DownloadOptions.Metadata}) {
+  async.Future get(core.String profileId, core.String reportId, core.String fileId, {commons.DownloadOptions downloadOptions: commons.DownloadOptions.Metadata}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -8547,7 +8512,7 @@
 
     _downloadOptions = downloadOptions;
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/reports/' + common_internal.Escaper.ecapeVariable('$reportId') + '/files/' + common_internal.Escaper.ecapeVariable('$fileId');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/reports/' + commons.Escaper.ecapeVariable('$reportId') + '/files/' + commons.Escaper.ecapeVariable('$fileId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -8557,7 +8522,7 @@
                                        uploadMedia: _uploadMedia,
                                        downloadOptions: _downloadOptions);
     if (_downloadOptions == null ||
-        _downloadOptions == common.DownloadOptions.Metadata) {
+        _downloadOptions == commons.DownloadOptions.Metadata) {
       return _response.then((data) => new File.fromJson(data));
     } else {
       return _response;
@@ -8590,7 +8555,7 @@
    *
    * Completes with a [FileList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -8601,7 +8566,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -8624,7 +8589,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/reports/' + common_internal.Escaper.ecapeVariable('$reportId') + '/files';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/reports/' + commons.Escaper.ecapeVariable('$reportId') + '/files';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -8639,11 +8604,10 @@
 }
 
 
-/** Not documented yet. */
 class SitesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  SitesResourceApi(common_internal.ApiRequester client) : 
+  SitesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -8657,7 +8621,7 @@
    *
    * Completes with a [Site].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -8668,7 +8632,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -8679,7 +8643,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/sites/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/sites/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -8702,7 +8666,7 @@
    *
    * Completes with a [Site].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -8713,7 +8677,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -8724,7 +8688,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/sites';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/sites';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -8768,10 +8732,10 @@
    *
    * [searchString] - Allows searching for objects by name, ID or keyName.
    * Wildcards (*) are allowed. For example, "site*2015" will return objects
-   * with names like "site June 2015", "site April 2015" or simply "site 2015".
+   * with names like "site June 2015", "site April 2015", or simply "site 2015".
    * Most of the searches also add wildcards implicitly at the start and the end
    * of the search string. For example, a search string of "site" will match
-   * objects with name "my site", "site 2015" or simply "site".
+   * objects with name "my site", "site 2015", or simply "site".
    *
    * [sortField] - Field by which to sort the list.
    * Possible string values are:
@@ -8790,7 +8754,7 @@
    *
    * Completes with a [SitesListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -8801,7 +8765,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -8854,7 +8818,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/sites';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/sites';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -8879,7 +8843,7 @@
    *
    * Completes with a [Site].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -8890,7 +8854,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -8905,7 +8869,7 @@
     _queryParams["id"] = [id];
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/sites';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/sites';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -8928,7 +8892,7 @@
    *
    * Completes with a [Site].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -8939,7 +8903,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -8950,7 +8914,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/sites';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/sites';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -8965,11 +8929,10 @@
 }
 
 
-/** Not documented yet. */
 class SizesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  SizesResourceApi(common_internal.ApiRequester client) : 
+  SizesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -8983,7 +8946,7 @@
    *
    * Completes with a [Size].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -8994,7 +8957,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -9005,7 +8968,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/sizes/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/sizes/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -9028,7 +8991,7 @@
    *
    * Completes with a [Size].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -9039,7 +9002,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -9050,7 +9013,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/sizes';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/sizes';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -9079,7 +9042,7 @@
    *
    * Completes with a [SizesListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -9090,7 +9053,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -9110,7 +9073,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/sizes';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/sizes';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -9125,11 +9088,10 @@
 }
 
 
-/** Not documented yet. */
 class SubaccountsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  SubaccountsResourceApi(common_internal.ApiRequester client) : 
+  SubaccountsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -9143,7 +9105,7 @@
    *
    * Completes with a [Subaccount].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -9154,7 +9116,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -9165,7 +9127,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/subaccounts/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/subaccounts/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -9188,7 +9150,7 @@
    *
    * Completes with a [Subaccount].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -9199,7 +9161,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -9210,7 +9172,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/subaccounts';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/subaccounts';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -9237,10 +9199,10 @@
    *
    * [searchString] - Allows searching for objects by name or ID. Wildcards (*)
    * are allowed. For example, "subaccount*2015" will return objects with names
-   * like "subaccount June 2015", "subaccount April 2015" or simply "subaccount
+   * like "subaccount June 2015", "subaccount April 2015", or simply "subaccount
    * 2015". Most of the searches also add wildcards implicitly at the start and
    * the end of the search string. For example, a search string of "subaccount"
-   * will match objects with name "my subaccount", "subaccount 2015" or simply
+   * will match objects with name "my subaccount", "subaccount 2015", or simply
    * "subaccount".
    *
    * [sortField] - Field by which to sort the list.
@@ -9255,7 +9217,7 @@
    *
    * Completes with a [SubaccountsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -9266,7 +9228,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -9292,7 +9254,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/subaccounts';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/subaccounts';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -9317,7 +9279,7 @@
    *
    * Completes with a [Subaccount].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -9328,7 +9290,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -9343,7 +9305,7 @@
     _queryParams["id"] = [id];
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/subaccounts';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/subaccounts';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -9366,7 +9328,7 @@
    *
    * Completes with a [Subaccount].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -9377,7 +9339,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -9388,7 +9350,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/subaccounts';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/subaccounts';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -9403,11 +9365,10 @@
 }
 
 
-/** Not documented yet. */
 class UserProfilesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  UserProfilesResourceApi(common_internal.ApiRequester client) : 
+  UserProfilesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -9419,7 +9380,7 @@
    *
    * Completes with a [UserProfile].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -9430,7 +9391,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -9438,7 +9399,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -9457,7 +9418,7 @@
    *
    * Completes with a [UserProfileList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -9468,7 +9429,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -9488,11 +9449,10 @@
 }
 
 
-/** Not documented yet. */
 class UserRolePermissionGroupsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  UserRolePermissionGroupsResourceApi(common_internal.ApiRequester client) : 
+  UserRolePermissionGroupsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -9506,7 +9466,7 @@
    *
    * Completes with a [UserRolePermissionGroup].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -9517,7 +9477,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -9528,7 +9488,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/userRolePermissionGroups/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/userRolePermissionGroups/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -9549,7 +9509,7 @@
    *
    * Completes with a [UserRolePermissionGroupsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -9560,7 +9520,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -9568,7 +9528,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/userRolePermissionGroups';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/userRolePermissionGroups';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -9583,11 +9543,10 @@
 }
 
 
-/** Not documented yet. */
 class UserRolePermissionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  UserRolePermissionsResourceApi(common_internal.ApiRequester client) : 
+  UserRolePermissionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -9601,7 +9560,7 @@
    *
    * Completes with a [UserRolePermission].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -9612,7 +9571,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -9623,7 +9582,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/userRolePermissions/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/userRolePermissions/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -9646,7 +9605,7 @@
    *
    * Completes with a [UserRolePermissionsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -9657,7 +9616,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -9668,7 +9627,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/userRolePermissions';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/userRolePermissions';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -9683,11 +9642,10 @@
 }
 
 
-/** Not documented yet. */
 class UserRolesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  UserRolesResourceApi(common_internal.ApiRequester client) : 
+  UserRolesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -9699,7 +9657,7 @@
    *
    * [id] - User role ID.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -9710,7 +9668,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -9722,7 +9680,7 @@
 
     _downloadOptions = null;
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/userRoles/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/userRoles/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -9745,7 +9703,7 @@
    *
    * Completes with a [UserRole].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -9756,7 +9714,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -9767,7 +9725,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/userRoles/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/userRoles/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -9790,7 +9748,7 @@
    *
    * Completes with a [UserRole].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -9801,7 +9759,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -9812,7 +9770,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/userRoles';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/userRoles';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -9842,10 +9800,11 @@
    *
    * [searchString] - Allows searching for objects by name or ID. Wildcards (*)
    * are allowed. For example, "userrole*2015" will return objects with names
-   * like "userrole June 2015", "userrole April 2015" or simply "userrole 2015".
-   * Most of the searches also add wildcards implicitly at the start and the end
-   * of the search string. For example, a search string of "userrole" will match
-   * objects with name "my userrole", "userrole 2015" or simply "userrole".
+   * like "userrole June 2015", "userrole April 2015", or simply "userrole
+   * 2015". Most of the searches also add wildcards implicitly at the start and
+   * the end of the search string. For example, a search string of "userrole"
+   * will match objects with name "my userrole", "userrole 2015", or simply
+   * "userrole".
    *
    * [sortField] - Field by which to sort the list.
    * Possible string values are:
@@ -9861,7 +9820,7 @@
    *
    * Completes with a [UserRolesListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -9872,7 +9831,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (profileId == null) {
@@ -9904,7 +9863,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/userRoles';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/userRoles';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -9929,7 +9888,7 @@
    *
    * Completes with a [UserRole].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -9940,7 +9899,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -9955,7 +9914,7 @@
     _queryParams["id"] = [id];
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/userRoles';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/userRoles';
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -9978,7 +9937,7 @@
    *
    * Completes with a [UserRole].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -9989,7 +9948,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -10000,7 +9959,7 @@
     }
 
 
-    _url = 'userprofiles/' + common_internal.Escaper.ecapeVariable('$profileId') + '/userRoles';
+    _url = 'userprofiles/' + commons.Escaper.ecapeVariable('$profileId') + '/userRoles';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -10499,7 +10458,7 @@
 
 /** Account Permission Group List Response */
 class AccountPermissionGroupsListResponse {
-  /** Account permission group collection */
+  /** Account permission group collection. */
   core.List<AccountPermissionGroup> accountPermissionGroups;
 
   /**
@@ -10535,7 +10494,7 @@
 
 /** Account Permission List Response */
 class AccountPermissionsListResponse {
-  /** Account permission collection */
+  /** Account permission collection. */
   core.List<AccountPermission> accountPermissions;
 
   /**
@@ -10790,7 +10749,7 @@
 
 /** Account User Profile List Response */
 class AccountUserProfilesListResponse {
-  /** Account user profile collection */
+  /** Account user profile collection. */
   core.List<AccountUserProfile> accountUserProfiles;
 
   /**
@@ -10835,7 +10794,7 @@
 
 /** Account List Response */
 class AccountsListResponse {
-  /** Account collection */
+  /** Account collection. */
   core.List<Account> accounts;
 
   /**
@@ -11369,7 +11328,7 @@
 
 /** Ad List Response */
 class AdsListResponse {
-  /** Ad collection */
+  /** Ad collection. */
   core.List<Ad> ads;
 
   /**
@@ -11655,7 +11614,7 @@
 
 /** Advertiser Group List Response */
 class AdvertiserGroupsListResponse {
-  /** Advertiser group collection */
+  /** Advertiser group collection. */
   core.List<AdvertiserGroup> advertiserGroups;
 
   /**
@@ -11700,7 +11659,7 @@
 
 /** Advertiser List Response */
 class AdvertisersListResponse {
-  /** Advertiser collection */
+  /** Advertiser collection. */
   core.List<Advertiser> advertisers;
 
   /**
@@ -11940,7 +11899,7 @@
 
 /** Browser List Response */
 class BrowsersListResponse {
-  /** Browser collection */
+  /** Browser collection. */
   core.List<Browser> browsers;
 
   /**
@@ -12371,7 +12330,7 @@
 
 /** Campaign List Response */
 class CampaignsListResponse {
-  /** Campaign collection */
+  /** Campaign collection. */
   core.List<Campaign> campaigns;
 
   /**
@@ -12567,7 +12526,7 @@
 
 /** Change Log List Response */
 class ChangeLogsListResponse {
-  /** Change log collection */
+  /** Change log collection. */
   core.List<ChangeLog> changeLogs;
 
   /**
@@ -12612,7 +12571,7 @@
 
 /** City List Response */
 class CitiesListResponse {
-  /** City collection */
+  /** City collection. */
   core.List<City> cities;
 
   /**
@@ -13009,7 +12968,9 @@
 
 
 /**
- * Contains information about a connection type that can be targeted by ads.
+ * Contains information about an internet connection type that can be targeted
+ * by ads. Clients can use the connection type to target mobile vs. broadband
+ * users.
  */
 class ConnectionType {
   /** ID of this connection type. */
@@ -13057,7 +13018,7 @@
 
 /** Connection Type List Response */
 class ConnectionTypesListResponse {
-  /** Connection Type Collection. */
+  /** Collection of connection types such as broadband and mobile. */
   core.List<ConnectionType> connectionTypes;
 
   /**
@@ -13093,7 +13054,7 @@
 
 /** Content Category List Response */
 class ContentCategoriesListResponse {
-  /** Content category collection */
+  /** Content category collection. */
   core.List<ContentCategory> contentCategories;
 
   /**
@@ -13141,7 +13102,7 @@
  */
 class ContentCategory {
   /**
-   * Account ID of this content category.This is a read-only field that can be
+   * Account ID of this content category. This is a read-only field that can be
    * left blank.
    */
   core.String accountId;
@@ -13212,7 +13173,7 @@
 
 /** Country List Response */
 class CountriesListResponse {
-  /** Country collection */
+  /** Country collection. */
   core.List<Country> countries;
 
   /**
@@ -13513,7 +13474,7 @@
   core.String htmlCode;
 
   /**
-   * Whether HTML code is DCM generated or manually entered. Set to true to
+   * Whether HTML code is DCM-generated or manually entered. Set to true to
    * ignore changes to htmlCode. Applicable to the following creative types:
    * FLASH_INPAGE and HTML5_BANNER.
    */
@@ -14228,7 +14189,7 @@
   core.bool hideSelectionBoxes;
 
   /**
-   * Wheter the asset is horizontally locked. This is a read-only field.
+   * Whether the asset is horizontally locked. This is a read-only field.
    * Applicable to the following creative types: all RICH_MEDIA.
    */
   core.bool horizontallyLocked;
@@ -15056,7 +15017,7 @@
   core.String id;
 
   /**
-   * Properties for rich media pop-up windows. This field is used only for exit
+   * Properties for rich media popup windows. This field is used only for exit
    * events.
    */
   PopupWindowProperties popupWindowProperties;
@@ -15332,7 +15293,7 @@
 
 /** Creative Field Value List Response */
 class CreativeFieldValuesListResponse {
-  /** Creative field value collection */
+  /** Creative field value collection. */
   core.List<CreativeFieldValue> creativeFieldValues;
 
   /**
@@ -15377,7 +15338,7 @@
 
 /** Creative Field List Response */
 class CreativeFieldsListResponse {
-  /** Creative field collection */
+  /** Creative field collection. */
   core.List<CreativeField> creativeFields;
 
   /**
@@ -15573,7 +15534,7 @@
 
 /** Creative Group List Response */
 class CreativeGroupsListResponse {
-  /** Creative group collection */
+  /** Creative group collection. */
   core.List<CreativeGroup> creativeGroups;
 
   /**
@@ -15790,7 +15751,7 @@
 
 /** Creative List Response */
 class CreativesListResponse {
-  /** Creative collection */
+  /** Creative collection. */
   core.List<Creative> creatives;
 
   /**
@@ -16229,7 +16190,10 @@
   /** Whether this directory site accepts publisher-paid tags. */
   core.bool pubPaidPlacementAccepted;
 
-  /** Whether this directory site is available only via Publisher Portal. */
+  /**
+   * Whether this directory site is available only via DoubleClick Publisher
+   * Portal.
+   */
   core.bool publisherPortalOnly;
 
 
@@ -16969,7 +16933,8 @@
   core.bool nielsenOcrOptOut;
 
   /**
-   * Whether this directory site has disabled generation of Verification tags.
+   * Whether this directory site has disabled generation of Verification ins
+   * tags.
    */
   core.bool verificationTagOptOut;
 
@@ -17036,7 +17001,7 @@
 
 /** Directory Site List Response */
 class DirectorySitesListResponse {
-  /** Directory site collection */
+  /** Directory site collection. */
   core.List<DirectorySite> directorySites;
 
   /**
@@ -17342,7 +17307,7 @@
 
 /** Event Tag List Response */
 class EventTagsListResponse {
-  /** Event tag collection */
+  /** Event tag collection. */
   core.List<EventTag> eventTags;
 
   /**
@@ -17629,7 +17594,7 @@
 
 /** Floodlight Activity List Response */
 class FloodlightActivitiesListResponse {
-  /** Floodlight activity collection */
+  /** Floodlight activity collection. */
   core.List<FloodlightActivity> floodlightActivities;
 
   /**
@@ -17675,7 +17640,7 @@
 /** Contains properties of a Floodlight activity. */
 class FloodlightActivity {
   /**
-   * Account ID of this floodlight activity.This is a read-only field that can
+   * Account ID of this floodlight activity. This is a read-only field that can
    * be left blank.
    */
   core.String accountId;
@@ -17775,8 +17740,8 @@
   core.String id;
 
   /**
-   * Dimension value for the ID of this floodlight activity.This is a read-only,
-   * auto-generated field.
+   * Dimension value for the ID of this floodlight activity. This is a
+   * read-only, auto-generated field.
    */
   DimensionValue idDimensionValue;
 
@@ -17814,7 +17779,7 @@
   core.bool sslRequired;
 
   /**
-   * Subaccount ID of this floodlight activity.This is a read-only field that
+   * Subaccount ID of this floodlight activity. This is a read-only field that
    * can be left blank.
    */
   core.String subaccountId;
@@ -18091,8 +18056,8 @@
 /** Contains properties of a Floodlight activity group. */
 class FloodlightActivityGroup {
   /**
-   * Account ID of this floodlight activity group.This is a read-only field that
-   * can be left blank.
+   * Account ID of this floodlight activity group. This is a read-only field
+   * that can be left blank.
    */
   core.String accountId;
 
@@ -18164,7 +18129,7 @@
   core.String tagString;
 
   /**
-   * The type of floodlight activity group. This is a required field that is
+   * Type of the floodlight activity group. This is a required field that is
    * read-only after insertion.
    * Possible string values are:
    * - "COUNTER"
@@ -18259,7 +18224,7 @@
 
 /** Floodlight Activity Group List Response */
 class FloodlightActivityGroupsListResponse {
-  /** Floodlight activity group collection */
+  /** Floodlight activity group collection. */
   core.List<FloodlightActivityGroup> floodlightActivityGroups;
 
   /**
@@ -18401,7 +18366,7 @@
   core.bool analyticsDataSharingEnabled;
 
   /**
-   * Whether the exposure to conversion report is enabled. This report shows
+   * Whether the exposure-to-conversion report is enabled. This report shows
    * detailed pathway information on up to 10 of the most recent ad exposures
    * seen by a user before converting.
    */
@@ -18593,7 +18558,7 @@
 
 /** Floodlight Configuration List Response */
 class FloodlightConfigurationsListResponse {
-  /** Floodlight configuration collection */
+  /** Floodlight configuration collection. */
   core.List<FloodlightConfiguration> floodlightConfigurations;
 
   /**
@@ -18946,8 +18911,8 @@
   core.String kind;
 
   /**
-   * Name of this landing page. This is a required field. Must be less than 256
-   * characters long, and must be unique among landing pages of the same
+   * Name of this landing page. This is a required field. It must be less than
+   * 256 characters long, and must be unique among landing pages of the same
    * campaign.
    */
   core.String name;
@@ -19250,7 +19215,7 @@
    */
   core.String kind;
 
-  /** Metro collection */
+  /** Metro collection. */
   core.List<Metro> metros;
 
 
@@ -19349,7 +19314,7 @@
    */
   core.String kind;
 
-  /** Mobile carrier collection */
+  /** Mobile carrier collection. */
   core.List<MobileCarrier> mobileCarriers;
 
 
@@ -19588,7 +19553,7 @@
   core.String majorVersion;
 
   /**
-   * Minor version (number after first dot on the left) of this operating system
+   * Minor version (number after the first dot) of this operating system
    * version.
    */
   core.String minorVersion;
@@ -19656,7 +19621,7 @@
    */
   core.String kind;
 
-  /** Operating system version collection */
+  /** Operating system version collection. */
   core.List<OperatingSystemVersion> operatingSystemVersions;
 
 
@@ -19692,7 +19657,7 @@
    */
   core.String kind;
 
-  /** Operating system collection */
+  /** Operating system collection. */
   core.List<OperatingSystem> operatingSystems;
 
 
@@ -20691,7 +20656,7 @@
   /** Pagination token to be used for the next list operation. */
   core.String nextPageToken;
 
-  /** Placement group collection */
+  /** Placement group collection. */
   core.List<PlacementGroup> placementGroups;
 
 
@@ -20736,7 +20701,7 @@
   /** Pagination token to be used for the next list operation. */
   core.String nextPageToken;
 
-  /** Placement strategy collection */
+  /** Placement strategy collection. */
   core.List<PlacementStrategy> placementStrategies;
 
 
@@ -20790,7 +20755,7 @@
   core.String kind;
 
   /**
-   * Name of this placement strategy. This is a required field. Must be less
+   * Name of this placement strategy. This is a required field. It must be less
    * than 256 characters long and unique among placement strategies of the same
    * account.
    */
@@ -20913,7 +20878,7 @@
   /** Pagination token to be used for the next list operation. */
   core.String nextPageToken;
 
-  /** Placement collection */
+  /** Placement collection. */
   core.List<Placement> placements;
 
 
@@ -21000,7 +20965,7 @@
    */
   core.String kind;
 
-  /** Platform type collection */
+  /** Platform type collection. */
   core.List<PlatformType> platformTypes;
 
 
@@ -21197,7 +21162,7 @@
    */
   core.String kind;
 
-  /** Postal code collection */
+  /** Postal code collection. */
   core.List<PostalCode> postalCodes;
 
 
@@ -21240,7 +21205,7 @@
   core.bool disregardOverdelivery;
 
   /**
-   * Placement end date. This date must be later than or be the same day as the
+   * Placement end date. This date must be later than, or the same day as, the
    * placement start date, but not later than the campaign end date. If, for
    * example, you set 6/25/2015 as both the start and end dates, the effective
    * placement date is just that day only, 6/25/2015. The hours, minutes, and
@@ -21276,9 +21241,10 @@
   core.String pricingType;
 
   /**
-   * Placement start date. This date cannot be earlier than the campaign start
-   * date. The hours, minutes, and seconds of the start date should not be set,
-   * as doing so will result in an error. This field is required on insertion.
+   * Placement start date. This date must be later than, or the same day as, the
+   * campaign start date. The hours, minutes, and seconds of the start date
+   * should not be set, as doing so will result in an error. This field is
+   * required on insertion.
    */
   core.DateTime startDate;
 
@@ -21358,7 +21324,7 @@
 /** Pricing Period */
 class PricingSchedulePricingPeriod {
   /**
-   * Pricing period end date. This date must be later than or be the same day as
+   * Pricing period end date. This date must be later than, or the same day as,
    * the pricing period start date, but not later than the placement end date.
    * The period end date can be the same date as the period start date. If, for
    * example, you set 6/25/2015 as both the start and end dates, the effective
@@ -21375,9 +21341,9 @@
   core.String rateOrCostNanos;
 
   /**
-   * Pricing period start date. This date cannot be earlier than the placement
-   * start date. The hours, minutes, and seconds of the start date should not be
-   * set, as doing so will result in an error.
+   * Pricing period start date. This date must be later than, or the same day
+   * as, the placement start date. The hours, minutes, and seconds of the start
+   * date should not be set, as doing so will result in an error.
    */
   core.DateTime startDate;
 
@@ -21716,7 +21682,7 @@
    */
   core.String kind;
 
-  /** Region Collection. */
+  /** Region collection. */
   core.List<Region> regions;
 
 
@@ -23361,7 +23327,7 @@
    */
   core.String kind;
 
-  /** Size collection */
+  /** Size collection. */
   core.List<Size> sizes;
 
 
@@ -23518,7 +23484,7 @@
   /** Pagination token to be used for the next list operation. */
   core.String nextPageToken;
 
-  /** Subaccount collection */
+  /** Subaccount collection. */
   core.List<Subaccount> subaccounts;
 
 
@@ -23932,8 +23898,8 @@
 
   /**
    * User-friendly name for the variable which will appear in reports. This is a
-   * required field, must be less than 65 characters long, and cannot contain
-   * the following characters: """.
+   * required field, must be less than 64 characters long, and cannot contain
+   * the following characters: ""<>".
    */
   core.String reportName;
 
@@ -23942,6 +23908,7 @@
    * Possible string values are:
    * - "U1"
    * - "U10"
+   * - "U100"
    * - "U11"
    * - "U12"
    * - "U13"
@@ -23953,13 +23920,92 @@
    * - "U19"
    * - "U2"
    * - "U20"
+   * - "U21"
+   * - "U22"
+   * - "U23"
+   * - "U24"
+   * - "U25"
+   * - "U26"
+   * - "U27"
+   * - "U28"
+   * - "U29"
    * - "U3"
+   * - "U30"
+   * - "U31"
+   * - "U32"
+   * - "U33"
+   * - "U34"
+   * - "U35"
+   * - "U36"
+   * - "U37"
+   * - "U38"
+   * - "U39"
    * - "U4"
+   * - "U40"
+   * - "U41"
+   * - "U42"
+   * - "U43"
+   * - "U44"
+   * - "U45"
+   * - "U46"
+   * - "U47"
+   * - "U48"
+   * - "U49"
    * - "U5"
+   * - "U50"
+   * - "U51"
+   * - "U52"
+   * - "U53"
+   * - "U54"
+   * - "U55"
+   * - "U56"
+   * - "U57"
+   * - "U58"
+   * - "U59"
    * - "U6"
+   * - "U60"
+   * - "U61"
+   * - "U62"
+   * - "U63"
+   * - "U64"
+   * - "U65"
+   * - "U66"
+   * - "U67"
+   * - "U68"
+   * - "U69"
    * - "U7"
+   * - "U70"
+   * - "U71"
+   * - "U72"
+   * - "U73"
+   * - "U74"
+   * - "U75"
+   * - "U76"
+   * - "U77"
+   * - "U78"
+   * - "U79"
    * - "U8"
+   * - "U80"
+   * - "U81"
+   * - "U82"
+   * - "U83"
+   * - "U84"
+   * - "U85"
+   * - "U86"
+   * - "U87"
+   * - "U88"
+   * - "U89"
    * - "U9"
+   * - "U90"
+   * - "U91"
+   * - "U92"
+   * - "U93"
+   * - "U94"
+   * - "U95"
+   * - "U96"
+   * - "U97"
+   * - "U98"
+   * - "U99"
    */
   core.String variableType;
 
@@ -24356,7 +24402,7 @@
    */
   core.String kind;
 
-  /** User role permission group collection */
+  /** User role permission group collection. */
   core.List<UserRolePermissionGroup> userRolePermissionGroups;
 
 
@@ -24392,7 +24438,7 @@
    */
   core.String kind;
 
-  /** User role permission collection */
+  /** User role permission collection. */
   core.List<UserRolePermission> userRolePermissions;
 
 
@@ -24431,7 +24477,7 @@
   /** Pagination token to be used for the next list operation. */
   core.String nextPageToken;
 
-  /** User role collection */
+  /** User role collection. */
   core.List<UserRole> userRoles;
 
 
@@ -24463,5 +24509,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/discovery/v1.dart b/generated/googleapis/lib/discovery/v1.dart
index ea737ed..017aade 100644
--- a/generated/googleapis/lib/discovery/v1.dart
+++ b/generated/googleapis/lib/discovery/v1.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.discovery.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client discovery/v1';
 
 /**
  * Lets you discover information about other Google APIs, such as what APIs are
@@ -19,20 +22,19 @@
  */
 class DiscoveryApi {
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   ApisResourceApi get apis => new ApisResourceApi(_requester);
 
   DiscoveryApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "discovery/v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class ApisResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ApisResourceApi(common_internal.ApiRequester client) : 
+  ApisResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -46,7 +48,7 @@
    *
    * Completes with a [RestDescription].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -57,7 +59,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (api == null) {
@@ -68,7 +70,7 @@
     }
 
 
-    _url = 'apis/' + common_internal.Escaper.ecapeVariable('$api') + '/' + common_internal.Escaper.ecapeVariable('$version') + '/rest';
+    _url = 'apis/' + commons.Escaper.ecapeVariable('$api') + '/' + commons.Escaper.ecapeVariable('$version') + '/rest';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -91,7 +93,7 @@
    *
    * Completes with a [DirectoryList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -102,7 +104,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (name != null) {
@@ -162,7 +164,6 @@
 }
 
 
-/** Not documented yet. */
 class DirectoryListItems {
   /** The description of this API. */
   core.String description;
@@ -285,7 +286,6 @@
 }
 
 
-/** Not documented yet. */
 class DirectoryList {
   /** Indicate the version of the Discovery API used to generate this doc. */
   core.String discoveryVersion;
@@ -351,12 +351,9 @@
 }
 
 
-/** Not documented yet. */
 class JsonSchemaVariantMap {
-  /** Not documented yet. */
   core.String P_ref;
 
-  /** Not documented yet. */
   core.String typeValue;
 
 
@@ -421,7 +418,6 @@
 }
 
 
-/** Not documented yet. */
 class JsonSchema {
   /**
    * A reference to another schema. The value of this property is the "id" of
@@ -566,7 +562,7 @@
       pattern = _json["pattern"];
     }
     if (_json.containsKey("properties")) {
-      properties = common_internal.mapMap(_json["properties"], (item) => new JsonSchema.fromJson(item));
+      properties = commons.mapMap(_json["properties"], (item) => new JsonSchema.fromJson(item));
     }
     if (_json.containsKey("readOnly")) {
       readOnly = _json["readOnly"];
@@ -630,7 +626,7 @@
       _json["pattern"] = pattern;
     }
     if (properties != null) {
-      _json["properties"] = common_internal.mapMap(properties, (item) => (item).toJson());
+      _json["properties"] = commons.mapMap(properties, (item) => (item).toJson());
     }
     if (readOnly != null) {
       _json["readOnly"] = readOnly;
@@ -686,14 +682,14 @@
 
   RestDescriptionAuthOauth2.fromJson(core.Map _json) {
     if (_json.containsKey("scopes")) {
-      scopes = common_internal.mapMap(_json["scopes"], (item) => new RestDescriptionAuthOauth2ScopesValue.fromJson(item));
+      scopes = commons.mapMap(_json["scopes"], (item) => new RestDescriptionAuthOauth2ScopesValue.fromJson(item));
     }
   }
 
   core.Map toJson() {
     var _json = new core.Map();
     if (scopes != null) {
-      _json["scopes"] = common_internal.mapMap(scopes, (item) => (item).toJson());
+      _json["scopes"] = commons.mapMap(scopes, (item) => (item).toJson());
     }
     return _json;
   }
@@ -757,7 +753,6 @@
 }
 
 
-/** Not documented yet. */
 class RestDescription {
   /** Authentication information. */
   RestDescriptionAuth auth;
@@ -897,7 +892,7 @@
       labels = _json["labels"];
     }
     if (_json.containsKey("methods")) {
-      methods = common_internal.mapMap(_json["methods"], (item) => new RestMethod.fromJson(item));
+      methods = commons.mapMap(_json["methods"], (item) => new RestMethod.fromJson(item));
     }
     if (_json.containsKey("name")) {
       name = _json["name"];
@@ -912,13 +907,13 @@
       packagePath = _json["packagePath"];
     }
     if (_json.containsKey("parameters")) {
-      parameters = common_internal.mapMap(_json["parameters"], (item) => new JsonSchema.fromJson(item));
+      parameters = commons.mapMap(_json["parameters"], (item) => new JsonSchema.fromJson(item));
     }
     if (_json.containsKey("protocol")) {
       protocol = _json["protocol"];
     }
     if (_json.containsKey("resources")) {
-      resources = common_internal.mapMap(_json["resources"], (item) => new RestResource.fromJson(item));
+      resources = commons.mapMap(_json["resources"], (item) => new RestResource.fromJson(item));
     }
     if (_json.containsKey("revision")) {
       revision = _json["revision"];
@@ -927,7 +922,7 @@
       rootUrl = _json["rootUrl"];
     }
     if (_json.containsKey("schemas")) {
-      schemas = common_internal.mapMap(_json["schemas"], (item) => new JsonSchema.fromJson(item));
+      schemas = commons.mapMap(_json["schemas"], (item) => new JsonSchema.fromJson(item));
     }
     if (_json.containsKey("servicePath")) {
       servicePath = _json["servicePath"];
@@ -985,7 +980,7 @@
       _json["labels"] = labels;
     }
     if (methods != null) {
-      _json["methods"] = common_internal.mapMap(methods, (item) => (item).toJson());
+      _json["methods"] = commons.mapMap(methods, (item) => (item).toJson());
     }
     if (name != null) {
       _json["name"] = name;
@@ -1000,13 +995,13 @@
       _json["packagePath"] = packagePath;
     }
     if (parameters != null) {
-      _json["parameters"] = common_internal.mapMap(parameters, (item) => (item).toJson());
+      _json["parameters"] = commons.mapMap(parameters, (item) => (item).toJson());
     }
     if (protocol != null) {
       _json["protocol"] = protocol;
     }
     if (resources != null) {
-      _json["resources"] = common_internal.mapMap(resources, (item) => (item).toJson());
+      _json["resources"] = commons.mapMap(resources, (item) => (item).toJson());
     }
     if (revision != null) {
       _json["revision"] = revision;
@@ -1015,7 +1010,7 @@
       _json["rootUrl"] = rootUrl;
     }
     if (schemas != null) {
-      _json["schemas"] = common_internal.mapMap(schemas, (item) => (item).toJson());
+      _json["schemas"] = commons.mapMap(schemas, (item) => (item).toJson());
     }
     if (servicePath != null) {
       _json["servicePath"] = servicePath;
@@ -1235,7 +1230,6 @@
 }
 
 
-/** Not documented yet. */
 class RestMethod {
   /** Description of this method. */
   core.String description;
@@ -1292,6 +1286,12 @@
   /** Whether this method supports subscriptions. */
   core.bool supportsSubscription;
 
+  /**
+   * Indicates that downloads from this method should use the download service
+   * URL (i.e. "/download"). Only applies if the method supports media download.
+   */
+  core.bool useMediaDownloadService;
+
 
   RestMethod();
 
@@ -1315,7 +1315,7 @@
       parameterOrder = _json["parameterOrder"];
     }
     if (_json.containsKey("parameters")) {
-      parameters = common_internal.mapMap(_json["parameters"], (item) => new JsonSchema.fromJson(item));
+      parameters = commons.mapMap(_json["parameters"], (item) => new JsonSchema.fromJson(item));
     }
     if (_json.containsKey("path")) {
       path = _json["path"];
@@ -1338,6 +1338,9 @@
     if (_json.containsKey("supportsSubscription")) {
       supportsSubscription = _json["supportsSubscription"];
     }
+    if (_json.containsKey("useMediaDownloadService")) {
+      useMediaDownloadService = _json["useMediaDownloadService"];
+    }
   }
 
   core.Map toJson() {
@@ -1361,7 +1364,7 @@
       _json["parameterOrder"] = parameterOrder;
     }
     if (parameters != null) {
-      _json["parameters"] = common_internal.mapMap(parameters, (item) => (item).toJson());
+      _json["parameters"] = commons.mapMap(parameters, (item) => (item).toJson());
     }
     if (path != null) {
       _json["path"] = path;
@@ -1384,12 +1387,14 @@
     if (supportsSubscription != null) {
       _json["supportsSubscription"] = supportsSubscription;
     }
+    if (useMediaDownloadService != null) {
+      _json["useMediaDownloadService"] = useMediaDownloadService;
+    }
     return _json;
   }
 }
 
 
-/** Not documented yet. */
 class RestResource {
   /** Methods on this resource. */
   core.Map<core.String, RestMethod> methods;
@@ -1402,23 +1407,21 @@
 
   RestResource.fromJson(core.Map _json) {
     if (_json.containsKey("methods")) {
-      methods = common_internal.mapMap(_json["methods"], (item) => new RestMethod.fromJson(item));
+      methods = commons.mapMap(_json["methods"], (item) => new RestMethod.fromJson(item));
     }
     if (_json.containsKey("resources")) {
-      resources = common_internal.mapMap(_json["resources"], (item) => new RestResource.fromJson(item));
+      resources = commons.mapMap(_json["resources"], (item) => new RestResource.fromJson(item));
     }
   }
 
   core.Map toJson() {
     var _json = new core.Map();
     if (methods != null) {
-      _json["methods"] = common_internal.mapMap(methods, (item) => (item).toJson());
+      _json["methods"] = commons.mapMap(methods, (item) => (item).toJson());
     }
     if (resources != null) {
-      _json["resources"] = common_internal.mapMap(resources, (item) => (item).toJson());
+      _json["resources"] = commons.mapMap(resources, (item) => (item).toJson());
     }
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/doubleclickbidmanager/v1.dart b/generated/googleapis/lib/doubleclickbidmanager/v1.dart
index 7505c98..7c45b4a 100644
--- a/generated/googleapis/lib/doubleclickbidmanager/v1.dart
+++ b/generated/googleapis/lib/doubleclickbidmanager/v1.dart
@@ -1,37 +1,39 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.doubleclickbidmanager.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client doubleclickbidmanager/v1';
 
 /** API for viewing and managing your reports in DoubleClick Bid Manager. */
 class DoubleclickbidmanagerApi {
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   LineitemsResourceApi get lineitems => new LineitemsResourceApi(_requester);
   QueriesResourceApi get queries => new QueriesResourceApi(_requester);
   ReportsResourceApi get reports => new ReportsResourceApi(_requester);
 
   DoubleclickbidmanagerApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "doubleclickbidmanager/v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class LineitemsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  LineitemsResourceApi(common_internal.ApiRequester client) : 
+  LineitemsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -43,7 +45,7 @@
    *
    * Completes with a [DownloadLineItemsResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -54,7 +56,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -83,7 +85,7 @@
    *
    * Completes with a [UploadLineItemsResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -94,7 +96,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -117,11 +119,10 @@
 }
 
 
-/** Not documented yet. */
 class QueriesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  QueriesResourceApi(common_internal.ApiRequester client) : 
+  QueriesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -133,7 +134,7 @@
    *
    * Completes with a [Query].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -144,7 +145,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -171,7 +172,7 @@
    *
    * [queryId] - Query ID to delete.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -182,7 +183,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (queryId == null) {
@@ -191,7 +192,7 @@
 
     _downloadOptions = null;
 
-    _url = 'query/' + common_internal.Escaper.ecapeVariable('$queryId');
+    _url = 'query/' + commons.Escaper.ecapeVariable('$queryId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -212,7 +213,7 @@
    *
    * Completes with a [Query].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -223,7 +224,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (queryId == null) {
@@ -231,7 +232,7 @@
     }
 
 
-    _url = 'query/' + common_internal.Escaper.ecapeVariable('$queryId');
+    _url = 'query/' + commons.Escaper.ecapeVariable('$queryId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -250,7 +251,7 @@
    *
    * Completes with a [ListQueriesResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -261,7 +262,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -287,7 +288,7 @@
    *
    * [queryId] - Query ID to run.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -298,7 +299,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -310,7 +311,7 @@
 
     _downloadOptions = null;
 
-    _url = 'query/' + common_internal.Escaper.ecapeVariable('$queryId');
+    _url = 'query/' + commons.Escaper.ecapeVariable('$queryId');
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -325,11 +326,10 @@
 }
 
 
-/** Not documented yet. */
 class ReportsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ReportsResourceApi(common_internal.ApiRequester client) : 
+  ReportsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -341,7 +341,7 @@
    *
    * Completes with a [ListReportsResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -352,7 +352,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (queryId == null) {
@@ -360,7 +360,7 @@
     }
 
 
-    _url = 'queries/' + common_internal.Escaper.ecapeVariable('$queryId') + '/reports';
+    _url = 'queries/' + commons.Escaper.ecapeVariable('$queryId') + '/reports';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -491,6 +491,7 @@
    * - "FILTER_INSERTION_ORDER"
    * - "FILTER_INVENTORY_FORMAT"
    * - "FILTER_INVENTORY_SOURCE"
+   * - "FILTER_INVENTORY_SOURCE_TYPE"
    * - "FILTER_KEYWORD"
    * - "FILTER_LINE_ITEM"
    * - "FILTER_LINE_ITEM_DAILY_FREQUENCY"
@@ -526,6 +527,8 @@
    * - "FILTER_USER_LIST_FIRST_PARTY"
    * - "FILTER_USER_LIST_THIRD_PARTY"
    * - "FILTER_VIDEO_AD_POSITION_IN_STREAM"
+   * - "FILTER_VIDEO_COMPANION_SIZE"
+   * - "FILTER_VIDEO_COMPANION_TYPE"
    * - "FILTER_VIDEO_CREATIVE_DURATION"
    * - "FILTER_VIDEO_CREATIVE_DURATION_SKIPPABLE"
    * - "FILTER_VIDEO_DURATION_SECONDS"
@@ -1548,5 +1551,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/doubleclicksearch/v2.dart b/generated/googleapis/lib/doubleclicksearch/v2.dart
index eed87be..d0a63f6 100644
--- a/generated/googleapis/lib/doubleclicksearch/v2.dart
+++ b/generated/googleapis/lib/doubleclicksearch/v2.dart
@@ -1,17 +1,22 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.doubleclicksearch.v2;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError, Media, UploadOptions,
+    ResumableUploadOptions, DownloadOptions, PartialDownloadOptions,
+    ByteRange;
+
+const core.String USER_AGENT = 'dart-api-client doubleclicksearch/v2';
 
 /**
  * Report and modify your advertising data in DoubleClick Search (for example,
@@ -22,22 +27,21 @@
   static const DoubleclicksearchScope = "https://www.googleapis.com/auth/doubleclicksearch";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   ConversionResourceApi get conversion => new ConversionResourceApi(_requester);
   ReportsResourceApi get reports => new ReportsResourceApi(_requester);
   SavedColumnsResourceApi get savedColumns => new SavedColumnsResourceApi(_requester);
 
   DoubleclicksearchApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "doubleclicksearch/v2/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class ConversionResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ConversionResourceApi(common_internal.ApiRequester client) : 
+  ConversionResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -74,7 +78,7 @@
    *
    * Completes with a [ConversionList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -85,7 +89,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (agencyId == null) {
@@ -127,7 +131,7 @@
     }
 
 
-    _url = 'agency/' + common_internal.Escaper.ecapeVariable('$agencyId') + '/advertiser/' + common_internal.Escaper.ecapeVariable('$advertiserId') + '/engine/' + common_internal.Escaper.ecapeVariable('$engineAccountId') + '/conversion';
+    _url = 'agency/' + commons.Escaper.ecapeVariable('$agencyId') + '/advertiser/' + commons.Escaper.ecapeVariable('$advertiserId') + '/engine/' + commons.Escaper.ecapeVariable('$engineAccountId') + '/conversion';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -148,7 +152,7 @@
    *
    * Completes with a [ConversionList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -159,7 +163,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -208,7 +212,7 @@
    *
    * Completes with a [ConversionList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -219,7 +223,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -276,7 +280,7 @@
    *
    * Completes with a [ConversionList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -287,7 +291,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -317,7 +321,7 @@
    *
    * Completes with a [UpdateAvailabilityResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -328,7 +332,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -351,11 +355,10 @@
 }
 
 
-/** Not documented yet. */
 class ReportsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ReportsResourceApi(common_internal.ApiRequester client) : 
+  ReportsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -367,7 +370,7 @@
    *
    * Completes with a [Report].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -378,7 +381,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request_1 != null) {
@@ -407,7 +410,7 @@
    *
    * Completes with a [Report].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -418,7 +421,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (reportId == null) {
@@ -426,7 +429,7 @@
     }
 
 
-    _url = 'reports/' + common_internal.Escaper.ecapeVariable('$reportId');
+    _url = 'reports/' + commons.Escaper.ecapeVariable('$reportId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -439,7 +442,7 @@
   }
 
   /**
-   * Downloads a report file.
+   * Downloads a report file encoded in UTF-8.
    *
    * Request parameters:
    *
@@ -451,18 +454,18 @@
    * Metadata (default) or Media download. Partial Media downloads are possible
    * as well.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future getFile(core.String reportId, core.int reportFragment, {common.DownloadOptions downloadOptions: common.DownloadOptions.Metadata}) {
+  async.Future getFile(core.String reportId, core.int reportFragment, {commons.DownloadOptions downloadOptions: commons.DownloadOptions.Metadata}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (reportId == null) {
@@ -474,7 +477,7 @@
 
     _downloadOptions = downloadOptions;
 
-    _url = 'reports/' + common_internal.Escaper.ecapeVariable('$reportId') + '/files/' + common_internal.Escaper.ecapeVariable('$reportFragment');
+    _url = 'reports/' + commons.Escaper.ecapeVariable('$reportId') + '/files/' + commons.Escaper.ecapeVariable('$reportFragment');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -484,7 +487,7 @@
                                        uploadMedia: _uploadMedia,
                                        downloadOptions: _downloadOptions);
     if (_downloadOptions == null ||
-        _downloadOptions == common.DownloadOptions.Metadata) {
+        _downloadOptions == commons.DownloadOptions.Metadata) {
       return _response.then((data) => null);
     } else {
       return _response;
@@ -500,7 +503,7 @@
    *
    * Completes with a [Report].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -511,7 +514,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request_1 != null) {
@@ -534,11 +537,10 @@
 }
 
 
-/** Not documented yet. */
 class SavedColumnsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  SavedColumnsResourceApi(common_internal.ApiRequester client) : 
+  SavedColumnsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -552,7 +554,7 @@
    *
    * Completes with a [SavedColumnList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -563,7 +565,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (agencyId == null) {
@@ -574,7 +576,7 @@
     }
 
 
-    _url = 'agency/' + common_internal.Escaper.ecapeVariable('$agencyId') + '/advertiser/' + common_internal.Escaper.ecapeVariable('$advertiserId') + '/savedcolumns';
+    _url = 'agency/' + commons.Escaper.ecapeVariable('$agencyId') + '/advertiser/' + commons.Escaper.ecapeVariable('$advertiserId') + '/savedcolumns';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -684,7 +686,7 @@
   /** DS agency ID. */
   core.String agencyId;
 
-  /** Attribution model name. */
+  /** Attribution model name. This field is ignored. */
   core.String attributionModel;
 
   /** DS campaign ID. */
@@ -704,7 +706,10 @@
   /** The time at which the conversion took place, in epoch millis UTC. */
   core.String conversionTimestamp;
 
-  /** Conversion count in millis. */
+  /**
+   * The number of conversions, formatted in millis (conversions multiplied by
+   * 1000). This field is ignored.
+   */
   core.String countMillis;
 
   /** DS criterion (keyword) ID. */
@@ -1035,7 +1040,6 @@
 }
 
 
-/** Not documented yet. */
 class ReportFiles {
   /** The size of this report file in bytes. */
   core.String byteCount;
@@ -1322,7 +1326,6 @@
 }
 
 
-/** Not documented yet. */
 class ReportRequestFilters {
   /**
    * Column to perform the filter on. This can be a DoubleClick Search column or
@@ -1375,7 +1378,6 @@
 }
 
 
-/** Not documented yet. */
 class ReportRequestOrderBy {
   /**
    * Column to perform the sort on. This can be a DoubleClick Search-defined
@@ -1918,5 +1920,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/drive/v2.dart b/generated/googleapis/lib/drive/v2.dart
index 49ba5d5..f2285aa 100644
--- a/generated/googleapis/lib/drive/v2.dart
+++ b/generated/googleapis/lib/drive/v2.dart
@@ -1,21 +1,26 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.drive.v2;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert_1;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert_1;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError, Media, UploadOptions,
+    ResumableUploadOptions, DownloadOptions, PartialDownloadOptions,
+    ByteRange;
+
+const core.String USER_AGENT = 'dart-api-client drive/v2';
 
 /** The API to interact with Drive. */
 class DriveApi {
-  /** View and manage the files and documents in your Google Drive */
+  /** View and manage the files in your Google Drive */
   static const DriveScope = "https://www.googleapis.com/auth/drive";
 
   /** View and manage its own configuration data in your Google Drive */
@@ -30,17 +35,17 @@
    */
   static const DriveFileScope = "https://www.googleapis.com/auth/drive.file";
 
-  /** View metadata for files and documents in your Google Drive */
+  /** View metadata for files in your Google Drive */
   static const DriveMetadataReadonlyScope = "https://www.googleapis.com/auth/drive.metadata.readonly";
 
-  /** View the files and documents in your Google Drive */
+  /** View the files in your Google Drive */
   static const DriveReadonlyScope = "https://www.googleapis.com/auth/drive.readonly";
 
   /** Modify your Google Apps Script scripts' behavior */
   static const DriveScriptsScope = "https://www.googleapis.com/auth/drive.scripts";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AboutResourceApi get about => new AboutResourceApi(_requester);
   AppsResourceApi get apps => new AppsResourceApi(_requester);
@@ -57,15 +62,14 @@
   RevisionsResourceApi get revisions => new RevisionsResourceApi(_requester);
 
   DriveApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "drive/v2/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class AboutResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AboutResourceApi(common_internal.ApiRequester client) : 
+  AboutResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -85,7 +89,7 @@
    *
    * Completes with a [About].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -96,7 +100,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (includeSubscribed != null) {
@@ -125,11 +129,10 @@
 }
 
 
-/** Not documented yet. */
 class AppsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AppsResourceApi(common_internal.ApiRequester client) : 
+  AppsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -141,7 +144,7 @@
    *
    * Completes with a [App].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -152,7 +155,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (appId == null) {
@@ -160,7 +163,7 @@
     }
 
 
-    _url = 'apps/' + common_internal.Escaper.ecapeVariable('$appId');
+    _url = 'apps/' + commons.Escaper.ecapeVariable('$appId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -195,7 +198,7 @@
    *
    * Completes with a [AppList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -206,7 +209,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (appFilterExtensions != null) {
@@ -235,11 +238,10 @@
 }
 
 
-/** Not documented yet. */
 class ChangesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ChangesResourceApi(common_internal.ApiRequester client) : 
+  ChangesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -251,7 +253,7 @@
    *
    * Completes with a [Change].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -262,7 +264,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (changeId == null) {
@@ -270,7 +272,7 @@
     }
 
 
-    _url = 'changes/' + common_internal.Escaper.ecapeVariable('$changeId');
+    _url = 'changes/' + commons.Escaper.ecapeVariable('$changeId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -302,7 +304,7 @@
    *
    * Completes with a [ChangeList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -313,7 +315,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (includeDeleted != null) {
@@ -367,7 +369,7 @@
    *
    * Completes with a [Channel].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -378,7 +380,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -416,11 +418,10 @@
 }
 
 
-/** Not documented yet. */
 class ChannelsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ChannelsResourceApi(common_internal.ApiRequester client) : 
+  ChannelsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -430,7 +431,7 @@
    *
    * Request parameters:
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -441,7 +442,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -465,11 +466,10 @@
 }
 
 
-/** Not documented yet. */
 class ChildrenResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ChildrenResourceApi(common_internal.ApiRequester client) : 
+  ChildrenResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -481,7 +481,7 @@
    *
    * [childId] - The ID of the child.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -492,7 +492,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (folderId == null) {
@@ -504,7 +504,7 @@
 
     _downloadOptions = null;
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$folderId') + '/children/' + common_internal.Escaper.ecapeVariable('$childId');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$folderId') + '/children/' + commons.Escaper.ecapeVariable('$childId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -527,7 +527,7 @@
    *
    * Completes with a [ChildReference].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -538,7 +538,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (folderId == null) {
@@ -549,7 +549,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$folderId') + '/children/' + common_internal.Escaper.ecapeVariable('$childId');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$folderId') + '/children/' + commons.Escaper.ecapeVariable('$childId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -572,7 +572,7 @@
    *
    * Completes with a [ChildReference].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -583,7 +583,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -594,7 +594,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$folderId') + '/children';
+    _url = 'files/' + commons.Escaper.ecapeVariable('$folderId') + '/children';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -621,7 +621,7 @@
    *
    * Completes with a [ChildList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -632,7 +632,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (folderId == null) {
@@ -649,7 +649,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$folderId') + '/children';
+    _url = 'files/' + commons.Escaper.ecapeVariable('$folderId') + '/children';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -664,11 +664,10 @@
 }
 
 
-/** Not documented yet. */
 class CommentsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  CommentsResourceApi(common_internal.ApiRequester client) : 
+  CommentsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -680,7 +679,7 @@
    *
    * [commentId] - The ID of the comment.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -691,7 +690,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (fileId == null) {
@@ -703,7 +702,7 @@
 
     _downloadOptions = null;
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/comments/' + common_internal.Escaper.ecapeVariable('$commentId');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/comments/' + commons.Escaper.ecapeVariable('$commentId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -729,7 +728,7 @@
    *
    * Completes with a [Comment].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -740,7 +739,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (fileId == null) {
@@ -754,7 +753,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/comments/' + common_internal.Escaper.ecapeVariable('$commentId');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/comments/' + commons.Escaper.ecapeVariable('$commentId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -777,7 +776,7 @@
    *
    * Completes with a [Comment].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -788,7 +787,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -799,7 +798,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/comments';
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/comments';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -834,7 +833,7 @@
    *
    * Completes with a [CommentList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -845,7 +844,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (fileId == null) {
@@ -865,7 +864,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/comments';
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/comments';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -890,7 +889,7 @@
    *
    * Completes with a [Comment].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -901,7 +900,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -915,7 +914,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/comments/' + common_internal.Escaper.ecapeVariable('$commentId');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/comments/' + commons.Escaper.ecapeVariable('$commentId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -940,7 +939,7 @@
    *
    * Completes with a [Comment].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -951,7 +950,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -965,7 +964,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/comments/' + common_internal.Escaper.ecapeVariable('$commentId');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/comments/' + commons.Escaper.ecapeVariable('$commentId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -980,11 +979,10 @@
 }
 
 
-/** Not documented yet. */
 class FilesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  FilesResourceApi(common_internal.ApiRequester client) : 
+  FilesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1020,7 +1018,7 @@
    *
    * Completes with a [File].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1031,7 +1029,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1063,7 +1061,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/copy';
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/copy';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1076,13 +1074,14 @@
   }
 
   /**
-   * Permanently deletes a file by ID. Skips the trash.
+   * Permanently deletes a file by ID. Skips the trash. The currently
+   * authenticated user must own the file.
    *
    * Request parameters:
    *
    * [fileId] - The ID of the file to delete.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1093,7 +1092,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (fileId == null) {
@@ -1102,7 +1101,7 @@
 
     _downloadOptions = null;
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1119,7 +1118,7 @@
    *
    * Request parameters:
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1130,7 +1129,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -1156,13 +1155,17 @@
    * [fileId] - The ID for the file in question.
    *
    * [acknowledgeAbuse] - Whether the user is acknowledging the risk of
-   * downloading known malware or other abusive files.
+   * downloading known malware or other abusive files. Ignored unless alt=media
+   * is specified.
    *
    * [projection] - This parameter is deprecated and has no function.
    * Possible string values are:
    * - "BASIC" : Deprecated
    * - "FULL" : Deprecated
    *
+   * [revisionId] - Specifies the Revision ID that should be downloaded. Ignored
+   * unless alt=media is specified.
+   *
    * [updateViewedDate] - Whether to update the view date after successfully
    * retrieving the file.
    *
@@ -1174,20 +1177,20 @@
    *
    * - [File] for Metadata downloads (see [downloadOptions]).
    *
-   * - [common.Media] for Media downloads (see [downloadOptions]).
+   * - [commons.Media] for Media downloads (see [downloadOptions]).
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future get(core.String fileId, {core.bool acknowledgeAbuse, core.String projection, core.bool updateViewedDate, common.DownloadOptions downloadOptions: common.DownloadOptions.Metadata}) {
+  async.Future get(core.String fileId, {core.bool acknowledgeAbuse, core.String projection, core.String revisionId, core.bool updateViewedDate, commons.DownloadOptions downloadOptions: commons.DownloadOptions.Metadata}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (fileId == null) {
@@ -1199,13 +1202,16 @@
     if (projection != null) {
       _queryParams["projection"] = [projection];
     }
+    if (revisionId != null) {
+      _queryParams["revisionId"] = [revisionId];
+    }
     if (updateViewedDate != null) {
       _queryParams["updateViewedDate"] = ["${updateViewedDate}"];
     }
 
     _downloadOptions = downloadOptions;
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1215,7 +1221,7 @@
                                        uploadMedia: _uploadMedia,
                                        downloadOptions: _downloadOptions);
     if (_downloadOptions == null ||
-        _downloadOptions == common.DownloadOptions.Metadata) {
+        _downloadOptions == commons.DownloadOptions.Metadata) {
       return _response.then((data) => new File.fromJson(data));
     } else {
       return _response;
@@ -1260,18 +1266,18 @@
    *
    * Completes with a [File].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<File> insert(File request, {core.bool convert, core.bool ocr, core.String ocrLanguage, core.bool pinned, core.String timedTextLanguage, core.String timedTextTrackName, core.bool useContentAsIndexableText, core.String visibility, common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<File> insert(File request, {core.bool convert, core.bool ocr, core.String ocrLanguage, core.bool pinned, core.String timedTextLanguage, core.String timedTextTrackName, core.bool useContentAsIndexableText, core.String visibility, commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1307,7 +1313,7 @@
 
     if (_uploadMedia == null) {
       _url = 'files';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
       _url = '/resumable/upload/drive/v2/files';
     } else {
       _url = '/upload/drive/v2/files';
@@ -1347,7 +1353,7 @@
    *
    * Completes with a [FileList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1358,7 +1364,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (corpus != null) {
@@ -1433,7 +1439,7 @@
    *
    * Completes with a [File].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1444,7 +1450,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1491,7 +1497,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1512,7 +1518,7 @@
    *
    * Completes with a [File].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1523,7 +1529,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (fileId == null) {
@@ -1531,7 +1537,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/touch';
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/touch';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1552,7 +1558,7 @@
    *
    * Completes with a [File].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1563,7 +1569,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (fileId == null) {
@@ -1571,7 +1577,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/trash';
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/trash';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1592,7 +1598,7 @@
    *
    * Completes with a [File].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1603,7 +1609,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (fileId == null) {
@@ -1611,7 +1617,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/untrash';
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/untrash';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1671,18 +1677,18 @@
    *
    * Completes with a [File].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<File> update(File request, core.String fileId, {core.String addParents, core.bool convert, core.bool newRevision, core.bool ocr, core.String ocrLanguage, core.bool pinned, core.String removeParents, core.bool setModifiedDate, core.String timedTextLanguage, core.String timedTextTrackName, core.bool updateViewedDate, core.bool useContentAsIndexableText, common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<File> update(File request, core.String fileId, {core.String addParents, core.bool convert, core.bool newRevision, core.bool ocr, core.String ocrLanguage, core.bool pinned, core.String removeParents, core.bool setModifiedDate, core.String timedTextLanguage, core.String timedTextTrackName, core.bool updateViewedDate, core.bool useContentAsIndexableText, commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1732,11 +1738,11 @@
     _uploadOptions =  uploadOptions;
 
     if (_uploadMedia == null) {
-      _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId');
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/drive/v2/files/' + common_internal.Escaper.ecapeVariable('$fileId');
+      _url = 'files/' + commons.Escaper.ecapeVariable('$fileId');
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/drive/v2/files/' + commons.Escaper.ecapeVariable('$fileId');
     } else {
-      _url = '/upload/drive/v2/files/' + common_internal.Escaper.ecapeVariable('$fileId');
+      _url = '/upload/drive/v2/files/' + commons.Escaper.ecapeVariable('$fileId');
     }
 
 
@@ -1760,13 +1766,17 @@
    * [fileId] - The ID for the file in question.
    *
    * [acknowledgeAbuse] - Whether the user is acknowledging the risk of
-   * downloading known malware or other abusive files.
+   * downloading known malware or other abusive files. Ignored unless alt=media
+   * is specified.
    *
    * [projection] - This parameter is deprecated and has no function.
    * Possible string values are:
    * - "BASIC" : Deprecated
    * - "FULL" : Deprecated
    *
+   * [revisionId] - Specifies the Revision ID that should be downloaded. Ignored
+   * unless alt=media is specified.
+   *
    * [updateViewedDate] - Whether to update the view date after successfully
    * retrieving the file.
    *
@@ -1778,20 +1788,20 @@
    *
    * - [Channel] for Metadata downloads (see [downloadOptions]).
    *
-   * - [common.Media] for Media downloads (see [downloadOptions]).
+   * - [commons.Media] for Media downloads (see [downloadOptions]).
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future watch(Channel request, core.String fileId, {core.bool acknowledgeAbuse, core.String projection, core.bool updateViewedDate, common.DownloadOptions downloadOptions: common.DownloadOptions.Metadata}) {
+  async.Future watch(Channel request, core.String fileId, {core.bool acknowledgeAbuse, core.String projection, core.String revisionId, core.bool updateViewedDate, commons.DownloadOptions downloadOptions: commons.DownloadOptions.Metadata}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1806,13 +1816,16 @@
     if (projection != null) {
       _queryParams["projection"] = [projection];
     }
+    if (revisionId != null) {
+      _queryParams["revisionId"] = [revisionId];
+    }
     if (updateViewedDate != null) {
       _queryParams["updateViewedDate"] = ["${updateViewedDate}"];
     }
 
     _downloadOptions = downloadOptions;
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/watch';
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/watch';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1822,7 +1835,7 @@
                                        uploadMedia: _uploadMedia,
                                        downloadOptions: _downloadOptions);
     if (_downloadOptions == null ||
-        _downloadOptions == common.DownloadOptions.Metadata) {
+        _downloadOptions == commons.DownloadOptions.Metadata) {
       return _response.then((data) => new Channel.fromJson(data));
     } else {
       return _response;
@@ -1832,11 +1845,10 @@
 }
 
 
-/** Not documented yet. */
 class ParentsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ParentsResourceApi(common_internal.ApiRequester client) : 
+  ParentsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1848,7 +1860,7 @@
    *
    * [parentId] - The ID of the parent.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1859,7 +1871,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (fileId == null) {
@@ -1871,7 +1883,7 @@
 
     _downloadOptions = null;
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/parents/' + common_internal.Escaper.ecapeVariable('$parentId');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/parents/' + commons.Escaper.ecapeVariable('$parentId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1894,7 +1906,7 @@
    *
    * Completes with a [ParentReference].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1905,7 +1917,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (fileId == null) {
@@ -1916,7 +1928,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/parents/' + common_internal.Escaper.ecapeVariable('$parentId');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/parents/' + commons.Escaper.ecapeVariable('$parentId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1939,7 +1951,7 @@
    *
    * Completes with a [ParentReference].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1950,7 +1962,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1961,7 +1973,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/parents';
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/parents';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1982,7 +1994,7 @@
    *
    * Completes with a [ParentList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1993,7 +2005,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (fileId == null) {
@@ -2001,7 +2013,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/parents';
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/parents';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2016,11 +2028,10 @@
 }
 
 
-/** Not documented yet. */
 class PermissionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PermissionsResourceApi(common_internal.ApiRequester client) : 
+  PermissionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2032,7 +2043,7 @@
    *
    * [permissionId] - The ID for the permission.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2043,7 +2054,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (fileId == null) {
@@ -2055,7 +2066,7 @@
 
     _downloadOptions = null;
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/permissions/' + common_internal.Escaper.ecapeVariable('$permissionId');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/permissions/' + commons.Escaper.ecapeVariable('$permissionId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -2078,7 +2089,7 @@
    *
    * Completes with a [Permission].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2089,7 +2100,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (fileId == null) {
@@ -2100,7 +2111,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/permissions/' + common_internal.Escaper.ecapeVariable('$permissionId');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/permissions/' + commons.Escaper.ecapeVariable('$permissionId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2121,7 +2132,7 @@
    *
    * Completes with a [PermissionId].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2132,7 +2143,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (email == null) {
@@ -2140,7 +2151,7 @@
     }
 
 
-    _url = 'permissionIds/' + common_internal.Escaper.ecapeVariable('$email');
+    _url = 'permissionIds/' + commons.Escaper.ecapeVariable('$email');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2169,7 +2180,7 @@
    *
    * Completes with a [Permission].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2180,7 +2191,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2197,7 +2208,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/permissions';
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/permissions';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2218,7 +2229,7 @@
    *
    * Completes with a [PermissionList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2229,7 +2240,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (fileId == null) {
@@ -2237,7 +2248,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/permissions';
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/permissions';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2260,12 +2271,13 @@
    *
    * [permissionId] - The ID for the permission.
    *
-   * [transferOwnership] - Whether changing a role to 'owner' should also
-   * downgrade the current owners to writers.
+   * [transferOwnership] - Whether changing a role to 'owner' downgrades the
+   * current owners to writers. Does nothing if the specified role is not
+   * 'owner'.
    *
    * Completes with a [Permission].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2276,7 +2288,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2293,7 +2305,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/permissions/' + common_internal.Escaper.ecapeVariable('$permissionId');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/permissions/' + commons.Escaper.ecapeVariable('$permissionId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -2316,12 +2328,13 @@
    *
    * [permissionId] - The ID for the permission.
    *
-   * [transferOwnership] - Whether changing a role to 'owner' should also
-   * downgrade the current owners to writers.
+   * [transferOwnership] - Whether changing a role to 'owner' downgrades the
+   * current owners to writers. Does nothing if the specified role is not
+   * 'owner'.
    *
    * Completes with a [Permission].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2332,7 +2345,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2349,7 +2362,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/permissions/' + common_internal.Escaper.ecapeVariable('$permissionId');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/permissions/' + commons.Escaper.ecapeVariable('$permissionId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -2364,11 +2377,10 @@
 }
 
 
-/** Not documented yet. */
 class PropertiesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PropertiesResourceApi(common_internal.ApiRequester client) : 
+  PropertiesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2382,7 +2394,7 @@
    *
    * [visibility] - The visibility of the property.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2393,7 +2405,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (fileId == null) {
@@ -2408,7 +2420,7 @@
 
     _downloadOptions = null;
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/properties/' + common_internal.Escaper.ecapeVariable('$propertyKey');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/properties/' + commons.Escaper.ecapeVariable('$propertyKey');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -2433,7 +2445,7 @@
    *
    * Completes with a [Property].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2444,7 +2456,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (fileId == null) {
@@ -2458,7 +2470,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/properties/' + common_internal.Escaper.ecapeVariable('$propertyKey');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/properties/' + commons.Escaper.ecapeVariable('$propertyKey');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2481,7 +2493,7 @@
    *
    * Completes with a [Property].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2492,7 +2504,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2503,7 +2515,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/properties';
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/properties';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2524,7 +2536,7 @@
    *
    * Completes with a [PropertyList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2535,7 +2547,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (fileId == null) {
@@ -2543,7 +2555,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/properties';
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/properties';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2570,7 +2582,7 @@
    *
    * Completes with a [Property].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2581,7 +2593,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2598,7 +2610,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/properties/' + common_internal.Escaper.ecapeVariable('$propertyKey');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/properties/' + commons.Escaper.ecapeVariable('$propertyKey');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -2625,7 +2637,7 @@
    *
    * Completes with a [Property].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2636,7 +2648,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2653,7 +2665,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/properties/' + common_internal.Escaper.ecapeVariable('$propertyKey');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/properties/' + commons.Escaper.ecapeVariable('$propertyKey');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -2668,11 +2680,10 @@
 }
 
 
-/** Not documented yet. */
 class RealtimeResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  RealtimeResourceApi(common_internal.ApiRequester client) : 
+  RealtimeResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2693,18 +2704,18 @@
    * Metadata (default) or Media download. Partial Media downloads are possible
    * as well.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future get(core.String fileId, {core.int revision, common.DownloadOptions downloadOptions: common.DownloadOptions.Metadata}) {
+  async.Future get(core.String fileId, {core.int revision, commons.DownloadOptions downloadOptions: commons.DownloadOptions.Metadata}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (fileId == null) {
@@ -2716,7 +2727,7 @@
 
     _downloadOptions = downloadOptions;
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/realtime';
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/realtime';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2726,7 +2737,7 @@
                                        uploadMedia: _uploadMedia,
                                        downloadOptions: _downloadOptions);
     if (_downloadOptions == null ||
-        _downloadOptions == common.DownloadOptions.Metadata) {
+        _downloadOptions == commons.DownloadOptions.Metadata) {
       return _response.then((data) => null);
     } else {
       return _response;
@@ -2753,18 +2764,18 @@
    * [uploadOptions] - Options for the media upload. Streaming Media without the
    * length being known ahead of time is only supported via resumable uploads.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future update(core.String fileId, {core.String baseRevision, common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future update(core.String fileId, {core.String baseRevision, commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (fileId == null) {
@@ -2779,11 +2790,11 @@
     _downloadOptions = null;
 
     if (_uploadMedia == null) {
-      _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/realtime';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/drive/v2/files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/realtime';
+      _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/realtime';
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/drive/v2/files/' + commons.Escaper.ecapeVariable('$fileId') + '/realtime';
     } else {
-      _url = '/upload/drive/v2/files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/realtime';
+      _url = '/upload/drive/v2/files/' + commons.Escaper.ecapeVariable('$fileId') + '/realtime';
     }
 
 
@@ -2800,11 +2811,10 @@
 }
 
 
-/** Not documented yet. */
 class RepliesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  RepliesResourceApi(common_internal.ApiRequester client) : 
+  RepliesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2818,7 +2828,7 @@
    *
    * [replyId] - The ID of the reply.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2829,7 +2839,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (fileId == null) {
@@ -2844,7 +2854,7 @@
 
     _downloadOptions = null;
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/comments/' + common_internal.Escaper.ecapeVariable('$commentId') + '/replies/' + common_internal.Escaper.ecapeVariable('$replyId');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/comments/' + commons.Escaper.ecapeVariable('$commentId') + '/replies/' + commons.Escaper.ecapeVariable('$replyId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -2872,7 +2882,7 @@
    *
    * Completes with a [CommentReply].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2883,7 +2893,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (fileId == null) {
@@ -2900,7 +2910,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/comments/' + common_internal.Escaper.ecapeVariable('$commentId') + '/replies/' + common_internal.Escaper.ecapeVariable('$replyId');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/comments/' + commons.Escaper.ecapeVariable('$commentId') + '/replies/' + commons.Escaper.ecapeVariable('$replyId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2925,7 +2935,7 @@
    *
    * Completes with a [CommentReply].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2936,7 +2946,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2950,7 +2960,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/comments/' + common_internal.Escaper.ecapeVariable('$commentId') + '/replies';
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/comments/' + commons.Escaper.ecapeVariable('$commentId') + '/replies';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2984,7 +2994,7 @@
    *
    * Completes with a [CommentReplyList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2995,7 +3005,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (fileId == null) {
@@ -3015,7 +3025,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/comments/' + common_internal.Escaper.ecapeVariable('$commentId') + '/replies';
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/comments/' + commons.Escaper.ecapeVariable('$commentId') + '/replies';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3042,7 +3052,7 @@
    *
    * Completes with a [CommentReply].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3053,7 +3063,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3070,7 +3080,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/comments/' + common_internal.Escaper.ecapeVariable('$commentId') + '/replies/' + common_internal.Escaper.ecapeVariable('$replyId');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/comments/' + commons.Escaper.ecapeVariable('$commentId') + '/replies/' + commons.Escaper.ecapeVariable('$replyId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -3097,7 +3107,7 @@
    *
    * Completes with a [CommentReply].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3108,7 +3118,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3125,7 +3135,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/comments/' + common_internal.Escaper.ecapeVariable('$commentId') + '/replies/' + common_internal.Escaper.ecapeVariable('$replyId');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/comments/' + commons.Escaper.ecapeVariable('$commentId') + '/replies/' + commons.Escaper.ecapeVariable('$replyId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -3140,11 +3150,10 @@
 }
 
 
-/** Not documented yet. */
 class RevisionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  RevisionsResourceApi(common_internal.ApiRequester client) : 
+  RevisionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3156,7 +3165,7 @@
    *
    * [revisionId] - The ID of the revision.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3167,7 +3176,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (fileId == null) {
@@ -3179,7 +3188,7 @@
 
     _downloadOptions = null;
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/revisions/' + common_internal.Escaper.ecapeVariable('$revisionId');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/revisions/' + commons.Escaper.ecapeVariable('$revisionId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -3202,7 +3211,7 @@
    *
    * Completes with a [Revision].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3213,7 +3222,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (fileId == null) {
@@ -3224,7 +3233,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/revisions/' + common_internal.Escaper.ecapeVariable('$revisionId');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/revisions/' + commons.Escaper.ecapeVariable('$revisionId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3245,7 +3254,7 @@
    *
    * Completes with a [RevisionList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3256,7 +3265,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (fileId == null) {
@@ -3264,7 +3273,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/revisions';
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/revisions';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3289,7 +3298,7 @@
    *
    * Completes with a [Revision].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3300,7 +3309,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3314,7 +3323,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/revisions/' + common_internal.Escaper.ecapeVariable('$revisionId');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/revisions/' + commons.Escaper.ecapeVariable('$revisionId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -3339,7 +3348,7 @@
    *
    * Completes with a [Revision].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3350,7 +3359,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3364,7 +3373,7 @@
     }
 
 
-    _url = 'files/' + common_internal.Escaper.ecapeVariable('$fileId') + '/revisions/' + common_internal.Escaper.ecapeVariable('$revisionId');
+    _url = 'files/' + commons.Escaper.ecapeVariable('$fileId') + '/revisions/' + commons.Escaper.ecapeVariable('$revisionId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -3380,7 +3389,6 @@
 
 
 
-/** Not documented yet. */
 class AboutAdditionalRoleInfoRoleSets {
   /** The supported additional roles with the primary role. */
   core.List<core.String> additionalRoles;
@@ -3413,7 +3421,6 @@
 }
 
 
-/** Not documented yet. */
 class AboutAdditionalRoleInfo {
   /** The supported additional roles per primary role. */
   core.List<AboutAdditionalRoleInfoRoleSets> roleSets;
@@ -3446,7 +3453,6 @@
 }
 
 
-/** Not documented yet. */
 class AboutExportFormats {
   /** The content type to convert from. */
   core.String source;
@@ -3479,7 +3485,6 @@
 }
 
 
-/** Not documented yet. */
 class AboutFeatures {
   /** The name of the feature. */
   core.String featureName;
@@ -3512,7 +3517,6 @@
 }
 
 
-/** Not documented yet. */
 class AboutImportFormats {
   /** The imported file's content type to convert from. */
   core.String source;
@@ -3545,7 +3549,6 @@
 }
 
 
-/** Not documented yet. */
 class AboutMaxUploadSizes {
   /** The max upload size for this type. */
   core.String size;
@@ -3578,7 +3581,6 @@
 }
 
 
-/** Not documented yet. */
 class AboutQuotaBytesByService {
   /** The storage quota bytes used by the service. */
   core.String bytesUsed;
@@ -3861,7 +3863,6 @@
 }
 
 
-/** Not documented yet. */
 class AppIcons {
   /**
    * Category of the icon. Allowed values are:
@@ -3959,7 +3960,8 @@
 
   /**
    * The template url for opening files with this app. The template will contain
-   * {ids} and/or {exportIds} to be replaced by the actual file ids.
+   * {ids} and/or {exportIds} to be replaced by the actual file ids. See  Open
+   * Files  for the full documentation.
    */
   core.String openUrlTemplate;
 
@@ -5345,7 +5347,11 @@
   /** Whether this file is starred by the user. */
   core.bool starred;
 
-  /** Whether this file has been trashed. */
+  /**
+   * Whether this file has been trashed. This label applies to all users
+   * accessing the file; however, only owners are allowed to see and untrash
+   * files.
+   */
   core.bool trashed;
 
   /** Whether this file has been viewed by this user. */
@@ -5399,7 +5405,10 @@
  * already thumbnailed by Google.
  */
 class FileThumbnail {
-  /** The URL-safe Base64 encoded bytes of the thumbnail image. */
+  /**
+   * The URL-safe Base64 encoded bytes of the thumbnail image. It should conform
+   * to RFC 4648 section 5.
+   */
   core.String image;
 
   core.List<core.int> get imageAsBytes {
@@ -5676,7 +5685,10 @@
    */
   FileThumbnail thumbnail;
 
-  /** A link to the file's thumbnail. */
+  /**
+   * A short-lived link to the file's thumbnail. Typically lasts on the order of
+   * hours.
+   */
   core.String thumbnailLink;
 
   /** The title of this file. */
@@ -6464,7 +6476,16 @@
 }
 
 
-/** A key-value pair that is either public or private to an application. */
+/**
+ * A key-value pair attached to a file that is either public or private to an
+ * application.
+ * The following limits apply to file properties:
+ * - Maximum of 100 properties total per file
+ * - Maximum of 30 private properties per app
+ * - Maximum of 30 public properties
+ * - Maximum of 124 bytes size limit on (key + value) string in UTF-8 encoding
+ * for a single property.
+ */
 class Property {
   /** ETag of the property. */
   core.String etag;
@@ -6936,5 +6957,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/fitness/v1.dart b/generated/googleapis/lib/fitness/v1.dart
index 8ccec4a..6d0894a 100644
--- a/generated/googleapis/lib/fitness/v1.dart
+++ b/generated/googleapis/lib/fitness/v1.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.fitness.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client fitness/v1';
 
 /** Google Fit API */
 class FitnessApi {
@@ -34,34 +37,32 @@
   static const FitnessLocationWriteScope = "https://www.googleapis.com/auth/fitness.location.write";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   UsersResourceApi get users => new UsersResourceApi(_requester);
 
   FitnessApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "fitness/v1/users/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class UsersResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   UsersDataSourcesResourceApi get dataSources => new UsersDataSourcesResourceApi(_requester);
   UsersSessionsResourceApi get sessions => new UsersSessionsResourceApi(_requester);
 
-  UsersResourceApi(common_internal.ApiRequester client) : 
+  UsersResourceApi(commons.ApiRequester client) : 
       _requester = client;
 }
 
 
-/** Not documented yet. */
 class UsersDataSourcesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   UsersDataSourcesDatasetsResourceApi get datasets => new UsersDataSourcesDatasetsResourceApi(_requester);
 
-  UsersDataSourcesResourceApi(common_internal.ApiRequester client) : 
+  UsersDataSourcesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -83,7 +84,7 @@
    *
    * Completes with a [DataSource].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -94,7 +95,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -105,7 +106,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/dataSources';
+    _url = commons.Escaper.ecapeVariable('$userId') + '/dataSources';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -129,7 +130,7 @@
    *
    * Completes with a [DataSource].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -140,7 +141,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -151,7 +152,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/dataSources/' + common_internal.Escaper.ecapeVariable('$dataSourceId');
+    _url = commons.Escaper.ecapeVariable('$userId') + '/dataSources/' + commons.Escaper.ecapeVariable('$dataSourceId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -179,7 +180,7 @@
    *
    * Completes with a [ListDataSourcesResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -190,7 +191,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -201,7 +202,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/dataSources';
+    _url = commons.Escaper.ecapeVariable('$userId') + '/dataSources';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -233,7 +234,7 @@
    *
    * Completes with a [DataSource].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -244,7 +245,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -258,7 +259,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/dataSources/' + common_internal.Escaper.ecapeVariable('$dataSourceId');
+    _url = commons.Escaper.ecapeVariable('$userId') + '/dataSources/' + commons.Escaper.ecapeVariable('$dataSourceId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -289,7 +290,7 @@
    *
    * Completes with a [DataSource].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -300,7 +301,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -314,7 +315,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/dataSources/' + common_internal.Escaper.ecapeVariable('$dataSourceId');
+    _url = commons.Escaper.ecapeVariable('$userId') + '/dataSources/' + commons.Escaper.ecapeVariable('$dataSourceId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -329,11 +330,10 @@
 }
 
 
-/** Not documented yet. */
 class UsersDataSourcesDatasetsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  UsersDataSourcesDatasetsResourceApi(common_internal.ApiRequester client) : 
+  UsersDataSourcesDatasetsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -363,7 +363,7 @@
    *
    * [modifiedTimeMillis] - When the operation was performed on the client.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -374,7 +374,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -395,7 +395,7 @@
 
     _downloadOptions = null;
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/dataSources/' + common_internal.Escaper.ecapeVariable('$dataSourceId') + '/datasets/' + common_internal.Escaper.ecapeVariable('$datasetId');
+    _url = commons.Escaper.ecapeVariable('$userId') + '/dataSources/' + commons.Escaper.ecapeVariable('$dataSourceId') + '/datasets/' + commons.Escaper.ecapeVariable('$datasetId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -439,7 +439,7 @@
    *
    * Completes with a [Dataset].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -450,7 +450,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -470,7 +470,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/dataSources/' + common_internal.Escaper.ecapeVariable('$dataSourceId') + '/datasets/' + common_internal.Escaper.ecapeVariable('$datasetId');
+    _url = commons.Escaper.ecapeVariable('$userId') + '/dataSources/' + commons.Escaper.ecapeVariable('$dataSourceId') + '/datasets/' + commons.Escaper.ecapeVariable('$datasetId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -509,7 +509,7 @@
    *
    * Completes with a [Dataset].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -520,7 +520,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -540,7 +540,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/dataSources/' + common_internal.Escaper.ecapeVariable('$dataSourceId') + '/datasets/' + common_internal.Escaper.ecapeVariable('$datasetId');
+    _url = commons.Escaper.ecapeVariable('$userId') + '/dataSources/' + commons.Escaper.ecapeVariable('$dataSourceId') + '/datasets/' + commons.Escaper.ecapeVariable('$datasetId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -555,11 +555,10 @@
 }
 
 
-/** Not documented yet. */
 class UsersSessionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  UsersSessionsResourceApi(common_internal.ApiRequester client) : 
+  UsersSessionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -575,7 +574,7 @@
    * [currentTimeMillis] - The client's current time in milliseconds since
    * epoch.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -586,7 +585,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -601,7 +600,7 @@
 
     _downloadOptions = null;
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/sessions/' + common_internal.Escaper.ecapeVariable('$sessionId');
+    _url = commons.Escaper.ecapeVariable('$userId') + '/sessions/' + commons.Escaper.ecapeVariable('$sessionId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -637,7 +636,7 @@
    *
    * Completes with a [ListSessionsResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -648,7 +647,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -668,7 +667,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/sessions';
+    _url = commons.Escaper.ecapeVariable('$userId') + '/sessions';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -697,7 +696,7 @@
    *
    * Completes with a [Session].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -708,7 +707,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -725,7 +724,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/sessions/' + common_internal.Escaper.ecapeVariable('$sessionId');
+    _url = commons.Escaper.ecapeVariable('$userId') + '/sessions/' + commons.Escaper.ecapeVariable('$sessionId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1138,7 +1137,6 @@
    */
   core.String name;
 
-  /** Not documented yet. */
   core.bool optional;
 
 
@@ -1344,7 +1342,6 @@
 }
 
 
-/** Not documented yet. */
 class ListDataSourcesResponse {
   /** A previously created data source. */
   core.List<DataSource> dataSource;
@@ -1368,7 +1365,6 @@
 }
 
 
-/** Not documented yet. */
 class ListSessionsResponse {
   /**
    * If includeDeleted is set to true in the request, this list will contain
@@ -1550,5 +1546,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/freebase/v1.dart b/generated/googleapis/lib/freebase/v1.dart
index 3ce9953..0449f15 100644
--- a/generated/googleapis/lib/freebase/v1.dart
+++ b/generated/googleapis/lib/freebase/v1.dart
@@ -1,25 +1,30 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.freebase.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError, Media, UploadOptions,
+    ResumableUploadOptions, DownloadOptions, PartialDownloadOptions,
+    ByteRange;
+
+const core.String USER_AGENT = 'dart-api-client freebase/v1';
 
 /** Find Freebase entities using textual queries and other constraints. */
 class FreebaseApi {
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   FreebaseApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "freebase/v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 
   /**
    * Reconcile entities to Freebase open data.
@@ -45,7 +50,7 @@
    *
    * Completes with a [ReconcileGet].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -56,7 +61,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (confidence != null) {
@@ -180,18 +185,18 @@
    * Metadata (default) or Media download. Partial Media downloads are possible
    * as well.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future search({core.String asOfTime, core.String callback, core.int cursor, core.List<core.String> domain, core.String encode, core.bool exact, core.List<core.String> filter, core.String format, core.String help, core.bool indent, core.List<core.String> lang, core.int limit, core.List<core.String> mid, core.String mqlOutput, core.String output, core.bool prefixed, core.String query, core.String scoring, core.String spell, core.bool stemmed, core.List<core.String> type, core.List<core.String> with_, core.List<core.String> without, common.DownloadOptions downloadOptions: common.DownloadOptions.Metadata}) {
+  async.Future search({core.String asOfTime, core.String callback, core.int cursor, core.List<core.String> domain, core.String encode, core.bool exact, core.List<core.String> filter, core.String format, core.String help, core.bool indent, core.List<core.String> lang, core.int limit, core.List<core.String> mid, core.String mqlOutput, core.String output, core.bool prefixed, core.String query, core.String scoring, core.String spell, core.bool stemmed, core.List<core.String> type, core.List<core.String> with_, core.List<core.String> without, commons.DownloadOptions downloadOptions: commons.DownloadOptions.Metadata}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (asOfTime != null) {
@@ -276,7 +281,7 @@
                                        uploadMedia: _uploadMedia,
                                        downloadOptions: _downloadOptions);
     if (_downloadOptions == null ||
-        _downloadOptions == common.DownloadOptions.Metadata) {
+        _downloadOptions == commons.DownloadOptions.Metadata) {
       return _response.then((data) => null);
     } else {
       return _response;
@@ -320,7 +325,6 @@
 }
 
 
-/** Not documented yet. */
 class ReconcileCandidate {
   /**
    * Percentage likelihood that this candidate is the unique matching entity.
@@ -416,7 +420,6 @@
 }
 
 
-/** Not documented yet. */
 class ReconcileGetWarning {
   /** Location of warning in the request e.g. invalid predicate. */
   core.String location;
@@ -458,7 +461,6 @@
 }
 
 
-/** Not documented yet. */
 class ReconcileGet {
   /**
    * If filled, then the listed candidates are potential matches, and such
@@ -520,5 +522,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/fusiontables/v1.dart b/generated/googleapis/lib/fusiontables/v1.dart
index 92e89f4..81a77c4 100644
--- a/generated/googleapis/lib/fusiontables/v1.dart
+++ b/generated/googleapis/lib/fusiontables/v1.dart
@@ -1,17 +1,22 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.fusiontables.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError, Media, UploadOptions,
+    ResumableUploadOptions, DownloadOptions, PartialDownloadOptions,
+    ByteRange;
+
+const core.String USER_AGENT = 'dart-api-client fusiontables/v1';
 
 /** API for working with Fusion Tables data. */
 class FusiontablesApi {
@@ -22,7 +27,7 @@
   static const FusiontablesReadonlyScope = "https://www.googleapis.com/auth/fusiontables.readonly";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   ColumnResourceApi get column => new ColumnResourceApi(_requester);
   QueryResourceApi get query => new QueryResourceApi(_requester);
@@ -32,15 +37,14 @@
   TemplateResourceApi get template => new TemplateResourceApi(_requester);
 
   FusiontablesApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "fusiontables/v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class ColumnResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ColumnResourceApi(common_internal.ApiRequester client) : 
+  ColumnResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -52,7 +56,7 @@
    *
    * [columnId] - Name or identifier for the column being deleted.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -63,7 +67,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -75,7 +79,7 @@
 
     _downloadOptions = null;
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/columns/' + common_internal.Escaper.ecapeVariable('$columnId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/columns/' + commons.Escaper.ecapeVariable('$columnId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -98,7 +102,7 @@
    *
    * Completes with a [Column].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -109,7 +113,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -120,7 +124,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/columns/' + common_internal.Escaper.ecapeVariable('$columnId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/columns/' + commons.Escaper.ecapeVariable('$columnId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -143,7 +147,7 @@
    *
    * Completes with a [Column].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -154,7 +158,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -165,7 +169,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/columns';
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/columns';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -191,7 +195,7 @@
    *
    * Completes with a [ColumnList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -202,7 +206,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -216,7 +220,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/columns';
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/columns';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -242,7 +246,7 @@
    *
    * Completes with a [Column].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -253,7 +257,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -267,7 +271,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/columns/' + common_internal.Escaper.ecapeVariable('$columnId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/columns/' + commons.Escaper.ecapeVariable('$columnId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -292,7 +296,7 @@
    *
    * Completes with a [Column].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -303,7 +307,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -317,7 +321,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/columns/' + common_internal.Escaper.ecapeVariable('$columnId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/columns/' + commons.Escaper.ecapeVariable('$columnId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -332,11 +336,10 @@
 }
 
 
-/** Not documented yet. */
 class QueryResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  QueryResourceApi(common_internal.ApiRequester client) : 
+  QueryResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -361,20 +364,20 @@
    *
    * - [Sqlresponse] for Metadata downloads (see [downloadOptions]).
    *
-   * - [common.Media] for Media downloads (see [downloadOptions]).
+   * - [commons.Media] for Media downloads (see [downloadOptions]).
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future sql(core.String sql_1, {core.bool hdrs, core.bool typed, common.DownloadOptions downloadOptions: common.DownloadOptions.Metadata}) {
+  async.Future sql(core.String sql_1, {core.bool hdrs, core.bool typed, commons.DownloadOptions downloadOptions: commons.DownloadOptions.Metadata}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (sql_1 == null) {
@@ -400,7 +403,7 @@
                                        uploadMedia: _uploadMedia,
                                        downloadOptions: _downloadOptions);
     if (_downloadOptions == null ||
-        _downloadOptions == common.DownloadOptions.Metadata) {
+        _downloadOptions == commons.DownloadOptions.Metadata) {
       return _response.then((data) => new Sqlresponse.fromJson(data));
     } else {
       return _response;
@@ -428,20 +431,20 @@
    *
    * - [Sqlresponse] for Metadata downloads (see [downloadOptions]).
    *
-   * - [common.Media] for Media downloads (see [downloadOptions]).
+   * - [commons.Media] for Media downloads (see [downloadOptions]).
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future sqlGet(core.String sql_1, {core.bool hdrs, core.bool typed, common.DownloadOptions downloadOptions: common.DownloadOptions.Metadata}) {
+  async.Future sqlGet(core.String sql_1, {core.bool hdrs, core.bool typed, commons.DownloadOptions downloadOptions: commons.DownloadOptions.Metadata}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (sql_1 == null) {
@@ -467,7 +470,7 @@
                                        uploadMedia: _uploadMedia,
                                        downloadOptions: _downloadOptions);
     if (_downloadOptions == null ||
-        _downloadOptions == common.DownloadOptions.Metadata) {
+        _downloadOptions == commons.DownloadOptions.Metadata) {
       return _response.then((data) => new Sqlresponse.fromJson(data));
     } else {
       return _response;
@@ -477,11 +480,10 @@
 }
 
 
-/** Not documented yet. */
 class StyleResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  StyleResourceApi(common_internal.ApiRequester client) : 
+  StyleResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -493,7 +495,7 @@
    *
    * [styleId] - Identifier (within a table) for the style being deleted
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -504,7 +506,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -516,7 +518,7 @@
 
     _downloadOptions = null;
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/styles/' + common_internal.Escaper.ecapeVariable('$styleId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/styles/' + commons.Escaper.ecapeVariable('$styleId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -539,7 +541,7 @@
    *
    * Completes with a [StyleSetting].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -550,7 +552,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -561,7 +563,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/styles/' + common_internal.Escaper.ecapeVariable('$styleId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/styles/' + commons.Escaper.ecapeVariable('$styleId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -584,7 +586,7 @@
    *
    * Completes with a [StyleSetting].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -595,7 +597,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -606,7 +608,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/styles';
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/styles';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -632,7 +634,7 @@
    *
    * Completes with a [StyleSettingList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -643,7 +645,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -657,7 +659,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/styles';
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/styles';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -682,7 +684,7 @@
    *
    * Completes with a [StyleSetting].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -693,7 +695,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -707,7 +709,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/styles/' + common_internal.Escaper.ecapeVariable('$styleId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/styles/' + commons.Escaper.ecapeVariable('$styleId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -732,7 +734,7 @@
    *
    * Completes with a [StyleSetting].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -743,7 +745,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -757,7 +759,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/styles/' + common_internal.Escaper.ecapeVariable('$styleId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/styles/' + commons.Escaper.ecapeVariable('$styleId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -772,11 +774,10 @@
 }
 
 
-/** Not documented yet. */
 class TableResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  TableResourceApi(common_internal.ApiRequester client) : 
+  TableResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -791,7 +792,7 @@
    *
    * Completes with a [Table].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -802,7 +803,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -813,7 +814,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/copy';
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/copy';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -832,7 +833,7 @@
    *
    * [tableId] - ID of the table that is being deleted.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -843,7 +844,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -852,7 +853,7 @@
 
     _downloadOptions = null;
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -873,7 +874,7 @@
    *
    * Completes with a [Table].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -884,7 +885,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -892,7 +893,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -940,18 +941,18 @@
    *
    * Completes with a [Import].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<Import> importRows(core.String tableId, {core.String delimiter, core.String encoding, core.int endLine, core.bool isStrict, core.int startLine, common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<Import> importRows(core.String tableId, {core.String delimiter, core.String encoding, core.int endLine, core.bool isStrict, core.int startLine, commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -977,11 +978,11 @@
     _uploadOptions =  uploadOptions;
 
     if (_uploadMedia == null) {
-      _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/import';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/fusiontables/v1/tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/import';
+      _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/import';
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/fusiontables/v1/tables/' + commons.Escaper.ecapeVariable('$tableId') + '/import';
     } else {
-      _url = '/upload/fusiontables/v1/tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/import';
+      _url = '/upload/fusiontables/v1/tables/' + commons.Escaper.ecapeVariable('$tableId') + '/import';
     }
 
 
@@ -1015,18 +1016,18 @@
    *
    * Completes with a [Table].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<Table> importTable(core.String name, {core.String delimiter, core.String encoding, common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<Table> importTable(core.String name, {core.String delimiter, core.String encoding, commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (name == null) {
@@ -1045,7 +1046,7 @@
 
     if (_uploadMedia == null) {
       _url = 'tables/import';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
       _url = '/resumable/upload/fusiontables/v1/tables/import';
     } else {
       _url = '/upload/fusiontables/v1/tables/import';
@@ -1071,7 +1072,7 @@
    *
    * Completes with a [Table].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1082,7 +1083,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1114,7 +1115,7 @@
    *
    * Completes with a [TableList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1125,7 +1126,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (maxResults != null) {
@@ -1165,7 +1166,7 @@
    *
    * Completes with a [Table].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1176,7 +1177,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1190,7 +1191,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1218,7 +1219,7 @@
    *
    * Completes with a [Table].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1229,7 +1230,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1243,7 +1244,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1258,11 +1259,10 @@
 }
 
 
-/** Not documented yet. */
 class TaskResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  TaskResourceApi(common_internal.ApiRequester client) : 
+  TaskResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1274,7 +1274,7 @@
    *
    * [taskId] - null
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1285,7 +1285,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -1297,7 +1297,7 @@
 
     _downloadOptions = null;
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/tasks/' + common_internal.Escaper.ecapeVariable('$taskId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/tasks/' + commons.Escaper.ecapeVariable('$taskId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1320,7 +1320,7 @@
    *
    * Completes with a [Task].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1331,7 +1331,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -1342,7 +1342,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/tasks/' + common_internal.Escaper.ecapeVariable('$taskId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/tasks/' + commons.Escaper.ecapeVariable('$taskId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1369,7 +1369,7 @@
    *
    * Completes with a [TaskList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1380,7 +1380,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -1397,7 +1397,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/tasks';
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/tasks';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1412,11 +1412,10 @@
 }
 
 
-/** Not documented yet. */
 class TemplateResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  TemplateResourceApi(common_internal.ApiRequester client) : 
+  TemplateResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1428,7 +1427,7 @@
    *
    * [templateId] - Identifier for the template which is being deleted
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1439,7 +1438,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -1451,7 +1450,7 @@
 
     _downloadOptions = null;
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/templates/' + common_internal.Escaper.ecapeVariable('$templateId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/templates/' + commons.Escaper.ecapeVariable('$templateId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1474,7 +1473,7 @@
    *
    * Completes with a [Template].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1485,7 +1484,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -1496,7 +1495,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/templates/' + common_internal.Escaper.ecapeVariable('$templateId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/templates/' + commons.Escaper.ecapeVariable('$templateId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1519,7 +1518,7 @@
    *
    * Completes with a [Template].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1530,7 +1529,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1541,7 +1540,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/templates';
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/templates';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1568,7 +1567,7 @@
    *
    * Completes with a [TemplateList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1579,7 +1578,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -1593,7 +1592,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/templates';
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/templates';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1618,7 +1617,7 @@
    *
    * Completes with a [Template].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1629,7 +1628,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1643,7 +1642,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/templates/' + common_internal.Escaper.ecapeVariable('$templateId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/templates/' + commons.Escaper.ecapeVariable('$templateId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1668,7 +1667,7 @@
    *
    * Completes with a [Template].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1679,7 +1678,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1693,7 +1692,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/templates/' + common_internal.Escaper.ecapeVariable('$templateId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/templates/' + commons.Escaper.ecapeVariable('$templateId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1922,7 +1921,7 @@
 
   /**
    * Token used to access the next page of this result. No token is displayed if
-   * there are no more tokens left.
+   * there are no more pages left.
    */
   core.String nextPageToken;
 
@@ -1977,7 +1976,7 @@
   core.List<core.Object> geometries;
 
   /**
-   * Not documented yet.
+   *
    *
    * The values for Object must be JSON objects. It can consist of `num`,
    * `String`, `bool` and `null` as well as `Map` and `List` values.
@@ -2399,7 +2398,6 @@
 }
 
 
-/** Not documented yet. */
 class StyleFunctionGradientColors {
   /** Color in #RRGGBB format. */
   core.String color;
@@ -2643,7 +2641,7 @@
 
   /**
    * Token used to access the next page of this result. No token is displayed if
-   * there are no more styles left.
+   * there are no more pages left.
    */
   core.String nextPageToken;
 
@@ -2807,7 +2805,7 @@
 
   /**
    * Token used to access the next page of this result. No token is displayed if
-   * there are no more tokens left.
+   * there are no more pages left.
    */
   core.String nextPageToken;
 
@@ -2842,21 +2840,30 @@
 }
 
 
-/** Specifies the id, name and type of a task in a table. */
+/** Specifies the identifier, name, and type of a task in a table. */
 class Task {
-  /** Type name: a template for an individual task. */
+  /** Type of the resource. This is always "fusiontables#task". */
   core.String kind;
 
   /** An indication of task progress. */
   core.String progress;
 
-  /** False while the table is busy with some other task. */
+  /**
+   * false while the table is busy with some other task. true if this background
+   * task is currently running.
+   */
   core.bool started;
 
   /** Identifier for the task. */
   core.String taskId;
 
-  /** Not documented yet. */
+  /**
+   * Type of background task. One of  DELETE_ROWS Deletes one or more rows from
+   * the table. ADD_ROWS "Adds one or more rows to a table. Includes importing
+   * data into a new table and importing more rows into an existing table.
+   * ADD_COLUMN Adds a new column to the table. CHANGE_TYPE Changes the type of
+   * a column.
+   */
   core.String type;
 
 
@@ -2902,17 +2909,17 @@
 }
 
 
-/** Represents a list of tasks in a table. */
+/** Represents a list of tasks for a table. */
 class TaskList {
   /** List of all requested tasks. */
   core.List<Task> items;
 
-  /** Type name: a list of all tasks. */
+  /** Type of the resource. This is always "fusiontables#taskList". */
   core.String kind;
 
   /**
    * Token used to access the next page of this result. No token is displayed if
-   * there are no more tokens left.
+   * there are no more pages left.
    */
   core.String nextPageToken;
 
@@ -3049,7 +3056,7 @@
 
   /**
    * Token used to access the next page of this result. No token is displayed if
-   * there are no more tokens left.
+   * there are no more pages left.
    */
   core.String nextPageToken;
 
@@ -3091,5 +3098,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/fusiontables/v2.dart b/generated/googleapis/lib/fusiontables/v2.dart
index 9668fc5..c9ded62 100644
--- a/generated/googleapis/lib/fusiontables/v2.dart
+++ b/generated/googleapis/lib/fusiontables/v2.dart
@@ -1,17 +1,22 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.fusiontables.v2;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError, Media, UploadOptions,
+    ResumableUploadOptions, DownloadOptions, PartialDownloadOptions,
+    ByteRange;
+
+const core.String USER_AGENT = 'dart-api-client fusiontables/v2';
 
 /** API for working with Fusion Tables data. */
 class FusiontablesApi {
@@ -22,7 +27,7 @@
   static const FusiontablesReadonlyScope = "https://www.googleapis.com/auth/fusiontables.readonly";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   ColumnResourceApi get column => new ColumnResourceApi(_requester);
   QueryResourceApi get query => new QueryResourceApi(_requester);
@@ -32,19 +37,18 @@
   TemplateResourceApi get template => new TemplateResourceApi(_requester);
 
   FusiontablesApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "fusiontables/v2/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class ColumnResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ColumnResourceApi(common_internal.ApiRequester client) : 
+  ColumnResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
-   * Deletes the column.
+   * Deletes the specified column.
    *
    * Request parameters:
    *
@@ -52,7 +56,7 @@
    *
    * [columnId] - Name or identifier for the column being deleted.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -63,7 +67,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -75,7 +79,7 @@
 
     _downloadOptions = null;
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/columns/' + common_internal.Escaper.ecapeVariable('$columnId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/columns/' + commons.Escaper.ecapeVariable('$columnId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -88,7 +92,7 @@
   }
 
   /**
-   * Retrieves a specific column by its id.
+   * Retrieves a specific column by its ID.
    *
    * Request parameters:
    *
@@ -98,7 +102,7 @@
    *
    * Completes with a [Column].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -109,7 +113,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -120,7 +124,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/columns/' + common_internal.Escaper.ecapeVariable('$columnId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/columns/' + commons.Escaper.ecapeVariable('$columnId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -143,7 +147,7 @@
    *
    * Completes with a [Column].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -154,7 +158,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -165,7 +169,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/columns';
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/columns';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -190,7 +194,7 @@
    *
    * Completes with a [ColumnList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -201,7 +205,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -215,7 +219,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/columns';
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/columns';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -241,7 +245,7 @@
    *
    * Completes with a [Column].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -252,7 +256,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -266,7 +270,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/columns/' + common_internal.Escaper.ecapeVariable('$columnId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/columns/' + commons.Escaper.ecapeVariable('$columnId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -291,7 +295,7 @@
    *
    * Completes with a [Column].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -302,7 +306,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -316,7 +320,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/columns/' + common_internal.Escaper.ecapeVariable('$columnId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/columns/' + commons.Escaper.ecapeVariable('$columnId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -331,26 +335,38 @@
 }
 
 
-/** Not documented yet. */
 class QueryResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  QueryResourceApi(common_internal.ApiRequester client) : 
+  QueryResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
-   * Executes an SQL SELECT/INSERT/UPDATE/DELETE/SHOW/DESCRIBE/CREATE statement.
+   * Executes a Fusion Tables SQL statement, which can be any of
+   * - SELECT
+   * - INSERT
+   * - UPDATE
+   * - DELETE
+   * - SHOW
+   * - DESCRIBE
+   * - CREATE statement.
    *
    * Request parameters:
    *
-   * [sql_1] - An SQL SELECT/SHOW/DESCRIBE/INSERT/UPDATE/DELETE/CREATE
-   * statement.
+   * [sql_1] - A Fusion Tables SQL statement, which can be any of
+   * - SELECT
+   * - INSERT
+   * - UPDATE
+   * - DELETE
+   * - SHOW
+   * - DESCRIBE
+   * - CREATE
    *
-   * [hdrs] - Should column names be included (in the first row)?. Default is
+   * [hdrs] - Whether column names are included in the first row. Default is
    * true.
    *
-   * [typed] - Should typed values be returned in the (JSON) response -- numbers
-   * for numeric values and parsed geometries for KML values? Default is true.
+   * [typed] - Whether typed values are returned in the (JSON) response: numbers
+   * for numeric values and parsed geometries for KML values. Default is true.
    *
    * [downloadOptions] - Options for downloading. A download can be either a
    * Metadata (default) or Media download. Partial Media downloads are possible
@@ -360,20 +376,20 @@
    *
    * - [Sqlresponse] for Metadata downloads (see [downloadOptions]).
    *
-   * - [common.Media] for Media downloads (see [downloadOptions]).
+   * - [commons.Media] for Media downloads (see [downloadOptions]).
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future sql(core.String sql_1, {core.bool hdrs, core.bool typed, common.DownloadOptions downloadOptions: common.DownloadOptions.Metadata}) {
+  async.Future sql(core.String sql_1, {core.bool hdrs, core.bool typed, commons.DownloadOptions downloadOptions: commons.DownloadOptions.Metadata}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (sql_1 == null) {
@@ -399,7 +415,7 @@
                                        uploadMedia: _uploadMedia,
                                        downloadOptions: _downloadOptions);
     if (_downloadOptions == null ||
-        _downloadOptions == common.DownloadOptions.Metadata) {
+        _downloadOptions == commons.DownloadOptions.Metadata) {
       return _response.then((data) => new Sqlresponse.fromJson(data));
     } else {
       return _response;
@@ -407,17 +423,23 @@
   }
 
   /**
-   * Executes an SQL SELECT/SHOW/DESCRIBE statement.
+   * Executes a SQL statement which can be any of
+   * - SELECT
+   * - SHOW
+   * - DESCRIBE
    *
    * Request parameters:
    *
-   * [sql_1] - An SQL SELECT/SHOW/DESCRIBE statement.
+   * [sql_1] - A SQL statement which can be any of
+   * - SELECT
+   * - SHOW
+   * - DESCRIBE
    *
-   * [hdrs] - Should column names be included (in the first row)?. Default is
+   * [hdrs] - Whether column names are included (in the first row). Default is
    * true.
    *
-   * [typed] - Should typed values be returned in the (JSON) response -- numbers
-   * for numeric values and parsed geometries for KML values? Default is true.
+   * [typed] - Whether typed values are returned in the (JSON) response: numbers
+   * for numeric values and parsed geometries for KML values. Default is true.
    *
    * [downloadOptions] - Options for downloading. A download can be either a
    * Metadata (default) or Media download. Partial Media downloads are possible
@@ -427,20 +449,20 @@
    *
    * - [Sqlresponse] for Metadata downloads (see [downloadOptions]).
    *
-   * - [common.Media] for Media downloads (see [downloadOptions]).
+   * - [commons.Media] for Media downloads (see [downloadOptions]).
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future sqlGet(core.String sql_1, {core.bool hdrs, core.bool typed, common.DownloadOptions downloadOptions: common.DownloadOptions.Metadata}) {
+  async.Future sqlGet(core.String sql_1, {core.bool hdrs, core.bool typed, commons.DownloadOptions downloadOptions: commons.DownloadOptions.Metadata}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (sql_1 == null) {
@@ -466,7 +488,7 @@
                                        uploadMedia: _uploadMedia,
                                        downloadOptions: _downloadOptions);
     if (_downloadOptions == null ||
-        _downloadOptions == common.DownloadOptions.Metadata) {
+        _downloadOptions == commons.DownloadOptions.Metadata) {
       return _response.then((data) => new Sqlresponse.fromJson(data));
     } else {
       return _response;
@@ -476,11 +498,10 @@
 }
 
 
-/** Not documented yet. */
 class StyleResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  StyleResourceApi(common_internal.ApiRequester client) : 
+  StyleResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -492,7 +513,7 @@
    *
    * [styleId] - Identifier (within a table) for the style being deleted
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -503,7 +524,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -515,7 +536,7 @@
 
     _downloadOptions = null;
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/styles/' + common_internal.Escaper.ecapeVariable('$styleId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/styles/' + commons.Escaper.ecapeVariable('$styleId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -538,7 +559,7 @@
    *
    * Completes with a [StyleSetting].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -549,7 +570,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -560,7 +581,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/styles/' + common_internal.Escaper.ecapeVariable('$styleId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/styles/' + commons.Escaper.ecapeVariable('$styleId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -583,7 +604,7 @@
    *
    * Completes with a [StyleSetting].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -594,7 +615,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -605,7 +626,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/styles';
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/styles';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -631,7 +652,7 @@
    *
    * Completes with a [StyleSettingList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -642,7 +663,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -656,7 +677,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/styles';
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/styles';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -681,7 +702,7 @@
    *
    * Completes with a [StyleSetting].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -692,7 +713,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -706,7 +727,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/styles/' + common_internal.Escaper.ecapeVariable('$styleId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/styles/' + commons.Escaper.ecapeVariable('$styleId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -731,7 +752,7 @@
    *
    * Completes with a [StyleSetting].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -742,7 +763,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -756,7 +777,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/styles/' + common_internal.Escaper.ecapeVariable('$styleId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/styles/' + commons.Escaper.ecapeVariable('$styleId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -771,11 +792,10 @@
 }
 
 
-/** Not documented yet. */
 class TableResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  TableResourceApi(common_internal.ApiRequester client) : 
+  TableResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -790,7 +810,7 @@
    *
    * Completes with a [Table].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -801,7 +821,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -812,7 +832,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/copy';
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/copy';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -829,9 +849,9 @@
    *
    * Request parameters:
    *
-   * [tableId] - ID of the table that is being deleted.
+   * [tableId] - ID of the table to be deleted.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -842,7 +862,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -851,7 +871,7 @@
 
     _downloadOptions = null;
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -864,15 +884,15 @@
   }
 
   /**
-   * Retrieves a specific table by its id.
+   * Retrieves a specific table by its ID.
    *
    * Request parameters:
    *
-   * [tableId] - Identifier(ID) for the table being requested.
+   * [tableId] - Identifier for the table being requested.
    *
    * Completes with a [Table].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -883,7 +903,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -891,7 +911,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -904,30 +924,26 @@
   }
 
   /**
-   * Import more rows into a table.
+   * Imports more rows into a table.
    *
    * Request parameters:
    *
    * [tableId] - The table into which new rows are being imported.
    *
    * [delimiter] - The delimiter used to separate cell values. This can only
-   * consist of a single character. Default is ','.
+   * consist of a single character. Default is ,.
    *
-   * [encoding] - The encoding of the content. Default is UTF-8. Use
-   * 'auto-detect' if you are unsure of the encoding.
+   * [encoding] - The encoding of the content. Default is UTF-8. Use auto-detect
+   * if you are unsure of the encoding.
    *
-   * [endLine] - The index of the last line from which to start importing,
-   * exclusive. Thus, the number of imported lines is endLine - startLine. If
-   * this parameter is not provided, the file will be imported until the last
-   * line of the file. If endLine is negative, then the imported content will
-   * exclude the last endLine lines. That is, if endline is negative, no line
-   * will be imported whose index is greater than N + endLine where N is the
-   * number of lines in the file, and the number of imported lines will be N +
-   * endLine - startLine.
+   * [endLine] - The index of the line up to which data will be imported.
+   * Default is to import the entire file. If endLine is negative, it is an
+   * offset from the end of the file; the imported content will exclude the last
+   * endLine lines.
    *
-   * [isStrict] - Whether the CSV must have the same number of values for each
-   * row. If false, rows with fewer values will be padded with empty values.
-   * Default is true.
+   * [isStrict] - Whether the imported CSV must have the same number of values
+   * for each row. If false, rows with fewer values will be padded with empty
+   * values. Default is true.
    *
    * [startLine] - The index of the first line from which to start importing,
    * inclusive. Default is 0.
@@ -939,18 +955,18 @@
    *
    * Completes with a [Import].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<Import> importRows(core.String tableId, {core.String delimiter, core.String encoding, core.int endLine, core.bool isStrict, core.int startLine, common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<Import> importRows(core.String tableId, {core.String delimiter, core.String encoding, core.int endLine, core.bool isStrict, core.int startLine, commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -976,11 +992,11 @@
     _uploadOptions =  uploadOptions;
 
     if (_uploadMedia == null) {
-      _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/import';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/fusiontables/v2/tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/import';
+      _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/import';
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/fusiontables/v2/tables/' + commons.Escaper.ecapeVariable('$tableId') + '/import';
     } else {
-      _url = '/upload/fusiontables/v2/tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/import';
+      _url = '/upload/fusiontables/v2/tables/' + commons.Escaper.ecapeVariable('$tableId') + '/import';
     }
 
 
@@ -995,17 +1011,17 @@
   }
 
   /**
-   * Import a new table.
+   * Imports a new table.
    *
    * Request parameters:
    *
    * [name] - The name to be assigned to the new table.
    *
    * [delimiter] - The delimiter used to separate cell values. This can only
-   * consist of a single character. Default is ','.
+   * consist of a single character. Default is ,.
    *
-   * [encoding] - The encoding of the content. Default is UTF-8. Use
-   * 'auto-detect' if you are unsure of the encoding.
+   * [encoding] - The encoding of the content. Default is UTF-8. Use auto-detect
+   * if you are unsure of the encoding.
    *
    * [uploadMedia] - The media to upload.
    *
@@ -1014,18 +1030,18 @@
    *
    * Completes with a [Table].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<Table> importTable(core.String name, {core.String delimiter, core.String encoding, common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<Table> importTable(core.String name, {core.String delimiter, core.String encoding, commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (name == null) {
@@ -1044,7 +1060,7 @@
 
     if (_uploadMedia == null) {
       _url = 'tables/import';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
       _url = '/resumable/upload/fusiontables/v2/tables/import';
     } else {
       _url = '/upload/fusiontables/v2/tables/import';
@@ -1070,7 +1086,7 @@
    *
    * Completes with a [Table].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1081,7 +1097,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1106,14 +1122,13 @@
    *
    * Request parameters:
    *
-   * [maxResults] - Maximum number of styles to return. Optional. Default is 5.
+   * [maxResults] - Maximum number of tables to return. Default is 5.
    *
    * [pageToken] - Continuation token specifying which result page to return.
-   * Optional.
    *
    * Completes with a [TableList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1124,7 +1139,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (maxResults != null) {
@@ -1158,13 +1173,13 @@
    *
    * [tableId] - ID of the table that is being updated.
    *
-   * [replaceViewDefinition] - Should the view definition also be updated? The
+   * [replaceViewDefinition] - Whether the view definition is also updated. The
    * specified view definition replaces the existing one. Only a view can be
    * updated with a new definition.
    *
    * Completes with a [Table].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1175,7 +1190,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1189,7 +1204,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1210,19 +1225,19 @@
    * [tableId] - Table whose rows will be replaced.
    *
    * [delimiter] - The delimiter used to separate cell values. This can only
-   * consist of a single character. Default is ','.
+   * consist of a single character. Default is ,.
    *
    * [encoding] - The encoding of the content. Default is UTF-8. Use
    * 'auto-detect' if you are unsure of the encoding.
    *
-   * [endLine] - The index of the last line to import, exclusive. 'endLine -
-   * startLine' rows will be imported. Default is to import through the end of
-   * the file. If endLine is negative, it is an offset from the end of the file;
-   * the imported content will exclude the last endLine lines.
+   * [endLine] - The index of the line up to which data will be imported.
+   * Default is to import the entire file. If endLine is negative, it is an
+   * offset from the end of the file; the imported content will exclude the last
+   * endLine lines.
    *
-   * [isStrict] - Whether the CSV must have the same number of column values for
-   * each row. If true, throws an exception if the CSV does not not have the
-   * same number of columns. If false, rows with fewer column values will be
+   * [isStrict] - Whether the imported CSV must have the same number of column
+   * values for each row. If true, throws an exception if the CSV does not have
+   * the same number of columns. If false, rows with fewer column values will be
    * padded with empty values. Default is true.
    *
    * [startLine] - The index of the first line from which to start importing,
@@ -1235,18 +1250,18 @@
    *
    * Completes with a [Task].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<Task> replaceRows(core.String tableId, {core.String delimiter, core.String encoding, core.int endLine, core.bool isStrict, core.int startLine, common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<Task> replaceRows(core.String tableId, {core.String delimiter, core.String encoding, core.int endLine, core.bool isStrict, core.int startLine, commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -1272,11 +1287,11 @@
     _uploadOptions =  uploadOptions;
 
     if (_uploadMedia == null) {
-      _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/replace';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/fusiontables/v2/tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/replace';
+      _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/replace';
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/fusiontables/v2/tables/' + commons.Escaper.ecapeVariable('$tableId') + '/replace';
     } else {
-      _url = '/upload/fusiontables/v2/tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/replace';
+      _url = '/upload/fusiontables/v2/tables/' + commons.Escaper.ecapeVariable('$tableId') + '/replace';
     }
 
 
@@ -1300,13 +1315,13 @@
    *
    * [tableId] - ID of the table that is being updated.
    *
-   * [replaceViewDefinition] - Should the view definition also be updated? The
+   * [replaceViewDefinition] - Whether the view definition is also updated. The
    * specified view definition replaces the existing one. Only a view can be
    * updated with a new definition.
    *
    * Completes with a [Table].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1317,7 +1332,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1331,7 +1346,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1346,23 +1361,23 @@
 }
 
 
-/** Not documented yet. */
 class TaskResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  TaskResourceApi(common_internal.ApiRequester client) : 
+  TaskResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
-   * Deletes the task, unless already started.
+   * Deletes a specific task by its ID, unless that task has already started
+   * running.
    *
    * Request parameters:
    *
    * [tableId] - Table from which the task is being deleted.
    *
-   * [taskId] - null
+   * [taskId] - The identifier of the task to delete.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1373,7 +1388,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -1385,7 +1400,7 @@
 
     _downloadOptions = null;
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/tasks/' + common_internal.Escaper.ecapeVariable('$taskId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/tasks/' + commons.Escaper.ecapeVariable('$taskId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1398,17 +1413,17 @@
   }
 
   /**
-   * Retrieves a specific task by its id.
+   * Retrieves a specific task by its ID.
    *
    * Request parameters:
    *
    * [tableId] - Table to which the task belongs.
    *
-   * [taskId] - null
+   * [taskId] - The identifier of the task to get.
    *
    * Completes with a [Task].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1419,7 +1434,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -1430,7 +1445,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/tasks/' + common_internal.Escaper.ecapeVariable('$taskId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/tasks/' + commons.Escaper.ecapeVariable('$taskId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1457,7 +1472,7 @@
    *
    * Completes with a [TaskList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1468,7 +1483,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -1485,7 +1500,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/tasks';
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/tasks';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1500,11 +1515,10 @@
 }
 
 
-/** Not documented yet. */
 class TemplateResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  TemplateResourceApi(common_internal.ApiRequester client) : 
+  TemplateResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1516,7 +1530,7 @@
    *
    * [templateId] - Identifier for the template which is being deleted
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1527,7 +1541,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -1539,7 +1553,7 @@
 
     _downloadOptions = null;
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/templates/' + common_internal.Escaper.ecapeVariable('$templateId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/templates/' + commons.Escaper.ecapeVariable('$templateId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1562,7 +1576,7 @@
    *
    * Completes with a [Template].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1573,7 +1587,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -1584,7 +1598,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/templates/' + common_internal.Escaper.ecapeVariable('$templateId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/templates/' + commons.Escaper.ecapeVariable('$templateId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1607,7 +1621,7 @@
    *
    * Completes with a [Template].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1618,7 +1632,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1629,7 +1643,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/templates';
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/templates';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1656,7 +1670,7 @@
    *
    * Completes with a [TemplateList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1667,7 +1681,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -1681,7 +1695,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/templates';
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/templates';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1706,7 +1720,7 @@
    *
    * Completes with a [Template].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1717,7 +1731,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1731,7 +1745,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/templates/' + common_internal.Escaper.ecapeVariable('$templateId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/templates/' + commons.Escaper.ecapeVariable('$templateId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1756,7 +1770,7 @@
    *
    * Completes with a [Template].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1767,7 +1781,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1781,7 +1795,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/templates/' + common_internal.Escaper.ecapeVariable('$templateId');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/templates/' + commons.Escaper.ecapeVariable('$templateId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1935,17 +1949,43 @@
   /** Column description. */
   core.String description;
 
-  /** Format pattern. */
+  /**
+   * Format pattern.
+   * Acceptable values are DT_DATE_MEDIUMe.g Dec 24, 2008 DT_DATE_SHORTfor
+   * example 12/24/08 DT_DATE_TIME_MEDIUMfor example Dec 24, 2008 8:30:45 PM
+   * DT_DATE_TIME_SHORTfor example 12/24/08 8:30 PM DT_DAY_MONTH_2_DIGIT_YEARfor
+   * example 24/12/08 DT_DAY_MONTH_2_DIGIT_YEAR_TIMEfor example 24/12/08 20:30
+   * DT_DAY_MONTH_2_DIGIT_YEAR_TIME_MERIDIANfor example 24/12/08 8:30 PM
+   * DT_DAY_MONTH_4_DIGIT_YEARfor example 24/12/2008
+   * DT_DAY_MONTH_4_DIGIT_YEAR_TIMEfor example 24/12/2008 20:30
+   * DT_DAY_MONTH_4_DIGIT_YEAR_TIME_MERIDIANfor example 24/12/2008 8:30 PM
+   * DT_ISO_YEAR_MONTH_DAYfor example 2008-12-24 DT_ISO_YEAR_MONTH_DAY_TIMEfor
+   * example 2008-12-24 20:30:45 DT_MONTH_DAY_4_DIGIT_YEARfor example 12/24/2008
+   * DT_TIME_LONGfor example 8:30:45 PM UTC-6 DT_TIME_MEDIUMfor example 8:30:45
+   * PM DT_TIME_SHORTfor example 8:30 PM DT_YEAR_ONLYfor example 2008
+   * HIGHLIGHT_UNTYPED_CELLSHighlight cell data that does not match the data
+   * type NONENo formatting (default) NUMBER_CURRENCYfor example $1234.56
+   * NUMBER_DEFAULTfor example 1,234.56 NUMBER_INTEGERfor example 1235
+   * NUMBER_NO_SEPARATORfor example 1234.56 NUMBER_PERCENTfor example 123,456%
+   * NUMBER_SCIENTIFICfor example 1E3 STRING_EIGHT_LINE_IMAGEDisplays thumbnail
+   * images as tall as eight lines of text STRING_FOUR_LINE_IMAGEDisplays
+   * thumbnail images as tall as four lines of text STRING_JSON_TEXTAllows JSON
+   * editing of text in UI STRING_LINKTreats cell as a link (must start with
+   * http:// or https://) STRING_ONE_LINE_IMAGEDisplays thumbnail images as tall
+   * as one line of text STRING_VIDEO_OR_MAPDisplay a video or map thumbnail
+   */
   core.String formatPattern;
 
   /**
    * Column graph predicate.
    * Used to map table to graph data model (subject,predicate,object)
-   * See http://www.w3.org/TR/2014/REC-rdf11-concepts-20140225/#data-model
+   * See W3C Graph-based Data Model.
    */
   core.String graphPredicate;
 
-  /** Type name: a template for an individual column. */
+  /**
+   * The kind of item this is. For a column, this is always fusiontables#column.
+   */
   core.String kind;
 
   /** Name of the column. */
@@ -2053,12 +2093,15 @@
   /** List of all requested columns. */
   core.List<Column> items;
 
-  /** Type name: a list of all columns. */
+  /**
+   * The kind of item this is. For a column list, this is always
+   * fusiontables#columnList.
+   */
   core.String kind;
 
   /**
    * Token used to access the next page of this result. No token is displayed if
-   * there are no more tokens left.
+   * there are no more pages left.
    */
   core.String nextPageToken;
 
@@ -2113,7 +2156,7 @@
   core.List<core.Object> geometries;
 
   /**
-   * Not documented yet.
+   *
    *
    * The values for Object must be JSON objects. It can consist of `num`,
    * `String`, `bool` and `null` as well as `Map` and `List` values.
@@ -2156,7 +2199,10 @@
 
 /** Represents an import request. */
 class Import {
-  /** Type name: a template for an import request. */
+  /**
+   * The kind of item this is. For an import, this is always
+   * fusiontables#import.
+   */
   core.String kind;
 
   /** The number of rows received from the import request. */
@@ -2486,12 +2532,15 @@
 }
 
 
-/** Represents a response to an sql statement. */
+/** Represents a response to a SQL statement. */
 class Sqlresponse {
   /** Columns in the table. */
   core.List<core.String> columns;
 
-  /** Type name: a template for an individual table. */
+  /**
+   * The kind of item this is. For responses to SQL queries, this is always
+   * fusiontables#sqlresponse.
+   */
   core.String kind;
 
   /**
@@ -2535,7 +2584,6 @@
 }
 
 
-/** Not documented yet. */
 class StyleFunctionGradientColors {
   /** Color in #RRGGBB format. */
   core.String color;
@@ -2636,13 +2684,12 @@
   StyleFunctionGradient gradient;
 
   /**
-   * Stylers can be one of three kinds: "fusiontables#fromColumn" if the column
+   * Stylers can be one of three kinds: "fusiontables#fromColumn if the column
    * value is to be used as is, i.e., the column values can have colors in
    * #RRGGBBAA format or integer line widths or icon names;
-   * "fusiontables#gradient" if the styling of the row is to be based on
-   * applying the gradient function on the column value; or
-   * "fusiontables#buckets" if the styling is to based on the bucket into which
-   * the the column value falls.
+   * fusiontables#gradient if the styling of the row is to be based on applying
+   * the gradient function on the column value; or fusiontables#buckets if the
+   * styling is to based on the bucket into which the the column value falls.
    */
   core.String kind;
 
@@ -2689,10 +2736,10 @@
  */
 class StyleSetting {
   /**
-   * Type name: an individual style setting. A StyleSetting contains the style
-   * defintions for points, lines, and polygons in a table. Since a table can
-   * have any one or all of them, a style definition can have point, line and
-   * polygon style definitions.
+   * The kind of item this is. A StyleSetting contains the style definitions for
+   * points, lines, and polygons in a table. Since a table can have any one or
+   * all of them, a style definition can have point, line and polygon style
+   * definitions.
    */
   core.String kind;
 
@@ -2774,7 +2821,10 @@
   /** All requested style settings. */
   core.List<StyleSetting> items;
 
-  /** Type name: in this case, a list of style settings. */
+  /**
+   * The kind of item this is. For a style list, this is always
+   * fusiontables#styleSettingList .
+   */
   core.String kind;
 
   /**
@@ -2846,7 +2896,9 @@
   /** Variable for whether table is exportable. */
   core.bool isExportable;
 
-  /** Type name: a template for an individual table. */
+  /**
+   * The kind of item this is. For a table, this is always fusiontables#table.
+   */
   core.String kind;
 
   /** Name assigned to a table. */
@@ -2960,12 +3012,15 @@
   /** List of all requested tables. */
   core.List<Table> items;
 
-  /** Type name: a list of all tables. */
+  /**
+   * The kind of item this is. For table list, this is always
+   * fusiontables#tableList.
+   */
   core.String kind;
 
   /**
    * Token used to access the next page of this result. No token is displayed if
-   * there are no more tokens left.
+   * there are no more pages left.
    */
   core.String nextPageToken;
 
@@ -3001,26 +3056,26 @@
 
 
 /**
- * A background task on a table, initiated for time and or resource consuming
- * operations such as a column type change or delete all rows operation.
+ * A background task on a table, initiated for time- or resource-consuming
+ * operations such as changing column types or deleting all rows.
  */
 class Task {
-  /** Type name: a template for an individual task. */
+  /** Type of the resource. This is always "fusiontables#task". */
   core.String kind;
 
   /** Task percentage completion. */
   core.String progress;
 
   /**
-   * True if the task is in progress, its progress indicator will indicated
-   * where it is, and it can't be deleted.
+   * false while the table is busy with some other task. true if this background
+   * task is currently running.
    */
   core.bool started;
 
   /** Identifier for the task. */
   core.String taskId;
 
-  /** The type of task being executed in the background. */
+  /** Type of background task. */
   core.String type;
 
 
@@ -3066,17 +3121,17 @@
 }
 
 
-/** Represents a list of tasks in a table. */
+/** Represents a list of tasks for a table. */
 class TaskList {
   /** List of all requested tasks. */
   core.List<Task> items;
 
-  /** Type name: a list of all tasks. */
+  /** Type of the resource. This is always "fusiontables#taskList". */
   core.String kind;
 
   /**
    * Token used to access the next page of this result. No token is displayed if
-   * there are no more tokens left.
+   * there are no more pages left.
    */
   core.String nextPageToken;
 
@@ -3136,9 +3191,8 @@
   core.String body;
 
   /**
-   * Type name: a template for the info window contents. The template can either
-   * include an HTML body or a list of columns from which the template is
-   * computed automatically.
+   * The kind of item this is. For a template, this is always
+   * fusiontables#template.
    */
   core.String kind;
 
@@ -3208,12 +3262,15 @@
   /** List of all requested templates. */
   core.List<Template> items;
 
-  /** Type name: a list of all templates. */
+  /**
+   * The kind of item this is. For a template list, this is always
+   * fusiontables#templateList .
+   */
   core.String kind;
 
   /**
    * Token used to access the next page of this result. No token is displayed if
-   * there are no more tokens left.
+   * there are no more pages left.
    */
   core.String nextPageToken;
 
@@ -3255,5 +3312,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/games/v1.dart b/generated/googleapis/lib/games/v1.dart
index 64729a9..0fade6e 100644
--- a/generated/googleapis/lib/games/v1.dart
+++ b/generated/googleapis/lib/games/v1.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.games.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection_1;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection_1;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client games/v1';
 
 /** The API for Google Play Game Services. */
 class GamesApi {
@@ -28,7 +31,7 @@
   static const PlusLoginScope = "https://www.googleapis.com/auth/plus.login";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AchievementDefinitionsResourceApi get achievementDefinitions => new AchievementDefinitionsResourceApi(_requester);
   AchievementsResourceApi get achievements => new AchievementsResourceApi(_requester);
@@ -47,15 +50,14 @@
   TurnBasedMatchesResourceApi get turnBasedMatches => new TurnBasedMatchesResourceApi(_requester);
 
   GamesApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "games/v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class AchievementDefinitionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AchievementDefinitionsResourceApi(common_internal.ApiRequester client) : 
+  AchievementDefinitionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -75,7 +77,7 @@
    *
    * Completes with a [AchievementDefinitionsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -86,7 +88,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (language != null) {
@@ -115,11 +117,10 @@
 }
 
 
-/** Not documented yet. */
 class AchievementsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AchievementsResourceApi(common_internal.ApiRequester client) : 
+  AchievementsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -138,7 +139,7 @@
    *
    * Completes with a [AchievementIncrementResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -149,7 +150,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (achievementId == null) {
@@ -164,7 +165,7 @@
     }
 
 
-    _url = 'achievements/' + common_internal.Escaper.ecapeVariable('$achievementId') + '/increment';
+    _url = 'achievements/' + commons.Escaper.ecapeVariable('$achievementId') + '/increment';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -205,7 +206,7 @@
    *
    * Completes with a [PlayerAchievementListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -216,7 +217,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (playerId == null) {
@@ -236,7 +237,7 @@
     }
 
 
-    _url = 'players/' + common_internal.Escaper.ecapeVariable('$playerId') + '/achievements';
+    _url = 'players/' + commons.Escaper.ecapeVariable('$playerId') + '/achievements';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -258,7 +259,7 @@
    *
    * Completes with a [AchievementRevealResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -269,7 +270,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (achievementId == null) {
@@ -277,7 +278,7 @@
     }
 
 
-    _url = 'achievements/' + common_internal.Escaper.ecapeVariable('$achievementId') + '/reveal';
+    _url = 'achievements/' + commons.Escaper.ecapeVariable('$achievementId') + '/reveal';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -303,7 +304,7 @@
    *
    * Completes with a [AchievementSetStepsAtLeastResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -314,7 +315,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (achievementId == null) {
@@ -326,7 +327,7 @@
     _queryParams["steps"] = ["${steps}"];
 
 
-    _url = 'achievements/' + common_internal.Escaper.ecapeVariable('$achievementId') + '/setStepsAtLeast';
+    _url = 'achievements/' + commons.Escaper.ecapeVariable('$achievementId') + '/setStepsAtLeast';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -347,7 +348,7 @@
    *
    * Completes with a [AchievementUnlockResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -358,7 +359,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (achievementId == null) {
@@ -366,7 +367,7 @@
     }
 
 
-    _url = 'achievements/' + common_internal.Escaper.ecapeVariable('$achievementId') + '/unlock';
+    _url = 'achievements/' + commons.Escaper.ecapeVariable('$achievementId') + '/unlock';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -387,7 +388,7 @@
    *
    * Completes with a [AchievementUpdateMultipleResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -398,7 +399,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -421,11 +422,10 @@
 }
 
 
-/** Not documented yet. */
 class ApplicationsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ApplicationsResourceApi(common_internal.ApiRequester client) : 
+  ApplicationsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -450,7 +450,7 @@
    *
    * Completes with a [Application].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -461,7 +461,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (applicationId == null) {
@@ -475,7 +475,7 @@
     }
 
 
-    _url = 'applications/' + common_internal.Escaper.ecapeVariable('$applicationId');
+    _url = 'applications/' + commons.Escaper.ecapeVariable('$applicationId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -493,7 +493,7 @@
    *
    * Request parameters:
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -504,7 +504,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -525,11 +525,10 @@
 }
 
 
-/** Not documented yet. */
 class EventsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  EventsResourceApi(common_internal.ApiRequester client) : 
+  EventsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -550,7 +549,7 @@
    *
    * Completes with a [PlayerEventListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -561,7 +560,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (language != null) {
@@ -604,7 +603,7 @@
    *
    * Completes with a [EventDefinitionListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -615,7 +614,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (language != null) {
@@ -654,7 +653,7 @@
    *
    * Completes with a [EventUpdateResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -665,7 +664,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -691,11 +690,10 @@
 }
 
 
-/** Not documented yet. */
 class LeaderboardsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  LeaderboardsResourceApi(common_internal.ApiRequester client) : 
+  LeaderboardsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -710,7 +708,7 @@
    *
    * Completes with a [Leaderboard].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -721,7 +719,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (leaderboardId == null) {
@@ -732,7 +730,7 @@
     }
 
 
-    _url = 'leaderboards/' + common_internal.Escaper.ecapeVariable('$leaderboardId');
+    _url = 'leaderboards/' + commons.Escaper.ecapeVariable('$leaderboardId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -761,7 +759,7 @@
    *
    * Completes with a [LeaderboardListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -772,7 +770,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (language != null) {
@@ -801,11 +799,10 @@
 }
 
 
-/** Not documented yet. */
 class MetagameResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  MetagameResourceApi(common_internal.ApiRequester client) : 
+  MetagameResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -815,7 +812,7 @@
    *
    * Completes with a [MetagameConfig].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -826,7 +823,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -869,7 +866,7 @@
    *
    * Completes with a [CategoryListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -880,7 +877,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (playerId == null) {
@@ -900,7 +897,7 @@
     }
 
 
-    _url = 'players/' + common_internal.Escaper.ecapeVariable('$playerId') + '/categories/' + common_internal.Escaper.ecapeVariable('$collection');
+    _url = 'players/' + commons.Escaper.ecapeVariable('$playerId') + '/categories/' + commons.Escaper.ecapeVariable('$collection');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -915,11 +912,10 @@
 }
 
 
-/** Not documented yet. */
 class PlayersResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PlayersResourceApi(common_internal.ApiRequester client) : 
+  PlayersResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -936,7 +932,7 @@
    *
    * Completes with a [Player].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -947,7 +943,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (playerId == null) {
@@ -958,7 +954,7 @@
     }
 
 
-    _url = 'players/' + common_internal.Escaper.ecapeVariable('$playerId');
+    _url = 'players/' + commons.Escaper.ecapeVariable('$playerId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -995,7 +991,7 @@
    *
    * Completes with a [PlayerListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1006,7 +1002,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (collection == null) {
@@ -1023,7 +1019,7 @@
     }
 
 
-    _url = 'players/me/players/' + common_internal.Escaper.ecapeVariable('$collection');
+    _url = 'players/me/players/' + commons.Escaper.ecapeVariable('$collection');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1038,11 +1034,10 @@
 }
 
 
-/** Not documented yet. */
 class PushtokensResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PushtokensResourceApi(common_internal.ApiRequester client) : 
+  PushtokensResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1053,7 +1048,7 @@
    *
    * Request parameters:
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1064,7 +1059,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1092,7 +1087,7 @@
    *
    * Request parameters:
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1103,7 +1098,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1127,11 +1122,10 @@
 }
 
 
-/** Not documented yet. */
 class QuestMilestonesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  QuestMilestonesResourceApi(common_internal.ApiRequester client) : 
+  QuestMilestonesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1148,7 +1142,7 @@
    * [requestId] - A numeric ID to ensure that the request is handled correctly
    * across retries. Your client application must generate this ID randomly.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1159,7 +1153,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (questId == null) {
@@ -1175,7 +1169,7 @@
 
     _downloadOptions = null;
 
-    _url = 'quests/' + common_internal.Escaper.ecapeVariable('$questId') + '/milestones/' + common_internal.Escaper.ecapeVariable('$milestoneId') + '/claim';
+    _url = 'quests/' + commons.Escaper.ecapeVariable('$questId') + '/milestones/' + commons.Escaper.ecapeVariable('$milestoneId') + '/claim';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1190,11 +1184,10 @@
 }
 
 
-/** Not documented yet. */
 class QuestsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  QuestsResourceApi(common_internal.ApiRequester client) : 
+  QuestsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1209,7 +1202,7 @@
    *
    * Completes with a [Quest].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1220,7 +1213,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (questId == null) {
@@ -1231,7 +1224,7 @@
     }
 
 
-    _url = 'quests/' + common_internal.Escaper.ecapeVariable('$questId') + '/accept';
+    _url = 'quests/' + commons.Escaper.ecapeVariable('$questId') + '/accept';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1265,7 +1258,7 @@
    *
    * Completes with a [QuestListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1276,7 +1269,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (playerId == null) {
@@ -1293,7 +1286,7 @@
     }
 
 
-    _url = 'players/' + common_internal.Escaper.ecapeVariable('$playerId') + '/quests';
+    _url = 'players/' + commons.Escaper.ecapeVariable('$playerId') + '/quests';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1308,11 +1301,10 @@
 }
 
 
-/** Not documented yet. */
 class RevisionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  RevisionsResourceApi(common_internal.ApiRequester client) : 
+  RevisionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1330,7 +1322,7 @@
    *
    * Completes with a [RevisionCheckResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1341,7 +1333,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (clientRevision == null) {
@@ -1365,11 +1357,10 @@
 }
 
 
-/** Not documented yet. */
 class RoomsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  RoomsResourceApi(common_internal.ApiRequester client) : 
+  RoomsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1385,7 +1376,7 @@
    *
    * Completes with a [Room].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1396,7 +1387,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1432,7 +1423,7 @@
    *
    * Completes with a [Room].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1443,7 +1434,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (roomId == null) {
@@ -1454,7 +1445,7 @@
     }
 
 
-    _url = 'rooms/' + common_internal.Escaper.ecapeVariable('$roomId') + '/decline';
+    _url = 'rooms/' + commons.Escaper.ecapeVariable('$roomId') + '/decline';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1474,7 +1465,7 @@
    *
    * [roomId] - The ID of the room.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1485,7 +1476,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (roomId == null) {
@@ -1494,7 +1485,7 @@
 
     _downloadOptions = null;
 
-    _url = 'rooms/' + common_internal.Escaper.ecapeVariable('$roomId') + '/dismiss';
+    _url = 'rooms/' + commons.Escaper.ecapeVariable('$roomId') + '/dismiss';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1518,7 +1509,7 @@
    *
    * Completes with a [Room].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1529,7 +1520,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (roomId == null) {
@@ -1540,7 +1531,7 @@
     }
 
 
-    _url = 'rooms/' + common_internal.Escaper.ecapeVariable('$roomId');
+    _url = 'rooms/' + commons.Escaper.ecapeVariable('$roomId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1567,7 +1558,7 @@
    *
    * Completes with a [Room].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1578,7 +1569,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1592,7 +1583,7 @@
     }
 
 
-    _url = 'rooms/' + common_internal.Escaper.ecapeVariable('$roomId') + '/join';
+    _url = 'rooms/' + commons.Escaper.ecapeVariable('$roomId') + '/join';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1619,7 +1610,7 @@
    *
    * Completes with a [Room].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1630,7 +1621,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1644,7 +1635,7 @@
     }
 
 
-    _url = 'rooms/' + common_internal.Escaper.ecapeVariable('$roomId') + '/leave';
+    _url = 'rooms/' + commons.Escaper.ecapeVariable('$roomId') + '/leave';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1673,7 +1664,7 @@
    *
    * Completes with a [RoomList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1684,7 +1675,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (language != null) {
@@ -1726,7 +1717,7 @@
    *
    * Completes with a [RoomStatus].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1737,7 +1728,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1751,7 +1742,7 @@
     }
 
 
-    _url = 'rooms/' + common_internal.Escaper.ecapeVariable('$roomId') + '/reportstatus';
+    _url = 'rooms/' + commons.Escaper.ecapeVariable('$roomId') + '/reportstatus';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1766,11 +1757,10 @@
 }
 
 
-/** Not documented yet. */
 class ScoresResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ScoresResourceApi(common_internal.ApiRequester client) : 
+  ScoresResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1816,7 +1806,7 @@
    *
    * Completes with a [PlayerLeaderboardScoreListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1827,7 +1817,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (playerId == null) {
@@ -1853,7 +1843,7 @@
     }
 
 
-    _url = 'players/' + common_internal.Escaper.ecapeVariable('$playerId') + '/leaderboards/' + common_internal.Escaper.ecapeVariable('$leaderboardId') + '/scores/' + common_internal.Escaper.ecapeVariable('$timeSpan');
+    _url = 'players/' + commons.Escaper.ecapeVariable('$playerId') + '/leaderboards/' + commons.Escaper.ecapeVariable('$leaderboardId') + '/scores/' + commons.Escaper.ecapeVariable('$timeSpan');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1895,7 +1885,7 @@
    *
    * Completes with a [LeaderboardScores].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1906,7 +1896,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (leaderboardId == null) {
@@ -1930,7 +1920,7 @@
     }
 
 
-    _url = 'leaderboards/' + common_internal.Escaper.ecapeVariable('$leaderboardId') + '/scores/' + common_internal.Escaper.ecapeVariable('$collection');
+    _url = 'leaderboards/' + commons.Escaper.ecapeVariable('$leaderboardId') + '/scores/' + commons.Escaper.ecapeVariable('$collection');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1980,7 +1970,7 @@
    *
    * Completes with a [LeaderboardScores].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1991,7 +1981,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (leaderboardId == null) {
@@ -2021,7 +2011,7 @@
     }
 
 
-    _url = 'leaderboards/' + common_internal.Escaper.ecapeVariable('$leaderboardId') + '/window/' + common_internal.Escaper.ecapeVariable('$collection');
+    _url = 'leaderboards/' + commons.Escaper.ecapeVariable('$leaderboardId') + '/window/' + commons.Escaper.ecapeVariable('$collection');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2057,7 +2047,7 @@
    *
    * Completes with a [PlayerScoreResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2068,7 +2058,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (leaderboardId == null) {
@@ -2086,7 +2076,7 @@
     }
 
 
-    _url = 'leaderboards/' + common_internal.Escaper.ecapeVariable('$leaderboardId') + '/scores';
+    _url = 'leaderboards/' + commons.Escaper.ecapeVariable('$leaderboardId') + '/scores';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2110,7 +2100,7 @@
    *
    * Completes with a [PlayerScoreListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2121,7 +2111,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2147,11 +2137,10 @@
 }
 
 
-/** Not documented yet. */
 class SnapshotsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  SnapshotsResourceApi(common_internal.ApiRequester client) : 
+  SnapshotsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2166,7 +2155,7 @@
    *
    * Completes with a [Snapshot].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2177,7 +2166,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (snapshotId == null) {
@@ -2188,7 +2177,7 @@
     }
 
 
-    _url = 'snapshots/' + common_internal.Escaper.ecapeVariable('$snapshotId');
+    _url = 'snapshots/' + commons.Escaper.ecapeVariable('$snapshotId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2221,7 +2210,7 @@
    *
    * Completes with a [SnapshotListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2232,7 +2221,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (playerId == null) {
@@ -2249,7 +2238,7 @@
     }
 
 
-    _url = 'players/' + common_internal.Escaper.ecapeVariable('$playerId') + '/snapshots';
+    _url = 'players/' + commons.Escaper.ecapeVariable('$playerId') + '/snapshots';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2264,11 +2253,10 @@
 }
 
 
-/** Not documented yet. */
 class TurnBasedMatchesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  TurnBasedMatchesResourceApi(common_internal.ApiRequester client) : 
+  TurnBasedMatchesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2278,7 +2266,7 @@
    *
    * [matchId] - The ID of the match.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2289,7 +2277,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (matchId == null) {
@@ -2298,7 +2286,7 @@
 
     _downloadOptions = null;
 
-    _url = 'turnbasedmatches/' + common_internal.Escaper.ecapeVariable('$matchId') + '/cancel';
+    _url = 'turnbasedmatches/' + commons.Escaper.ecapeVariable('$matchId') + '/cancel';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -2322,7 +2310,7 @@
    *
    * Completes with a [TurnBasedMatch].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2333,7 +2321,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2368,7 +2356,7 @@
    *
    * Completes with a [TurnBasedMatch].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2379,7 +2367,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (matchId == null) {
@@ -2390,7 +2378,7 @@
     }
 
 
-    _url = 'turnbasedmatches/' + common_internal.Escaper.ecapeVariable('$matchId') + '/decline';
+    _url = 'turnbasedmatches/' + commons.Escaper.ecapeVariable('$matchId') + '/decline';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -2410,7 +2398,7 @@
    *
    * [matchId] - The ID of the match.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2421,7 +2409,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (matchId == null) {
@@ -2430,7 +2418,7 @@
 
     _downloadOptions = null;
 
-    _url = 'turnbasedmatches/' + common_internal.Escaper.ecapeVariable('$matchId') + '/dismiss';
+    _url = 'turnbasedmatches/' + commons.Escaper.ecapeVariable('$matchId') + '/dismiss';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -2458,7 +2446,7 @@
    *
    * Completes with a [TurnBasedMatch].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2469,7 +2457,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2483,7 +2471,7 @@
     }
 
 
-    _url = 'turnbasedmatches/' + common_internal.Escaper.ecapeVariable('$matchId') + '/finish';
+    _url = 'turnbasedmatches/' + commons.Escaper.ecapeVariable('$matchId') + '/finish';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -2509,7 +2497,7 @@
    *
    * Completes with a [TurnBasedMatch].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2520,7 +2508,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (matchId == null) {
@@ -2534,7 +2522,7 @@
     }
 
 
-    _url = 'turnbasedmatches/' + common_internal.Escaper.ecapeVariable('$matchId');
+    _url = 'turnbasedmatches/' + commons.Escaper.ecapeVariable('$matchId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2558,7 +2546,7 @@
    *
    * Completes with a [TurnBasedMatch].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2569,7 +2557,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (matchId == null) {
@@ -2580,7 +2568,7 @@
     }
 
 
-    _url = 'turnbasedmatches/' + common_internal.Escaper.ecapeVariable('$matchId') + '/join';
+    _url = 'turnbasedmatches/' + commons.Escaper.ecapeVariable('$matchId') + '/join';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -2605,7 +2593,7 @@
    *
    * Completes with a [TurnBasedMatch].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2616,7 +2604,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (matchId == null) {
@@ -2627,7 +2615,7 @@
     }
 
 
-    _url = 'turnbasedmatches/' + common_internal.Escaper.ecapeVariable('$matchId') + '/leave';
+    _url = 'turnbasedmatches/' + commons.Escaper.ecapeVariable('$matchId') + '/leave';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -2659,7 +2647,7 @@
    *
    * Completes with a [TurnBasedMatch].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2670,7 +2658,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (matchId == null) {
@@ -2688,7 +2676,7 @@
     }
 
 
-    _url = 'turnbasedmatches/' + common_internal.Escaper.ecapeVariable('$matchId') + '/leaveTurn';
+    _url = 'turnbasedmatches/' + commons.Escaper.ecapeVariable('$matchId') + '/leaveTurn';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -2728,7 +2716,7 @@
    *
    * Completes with a [TurnBasedMatchList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2739,7 +2727,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (includeMatchData != null) {
@@ -2790,7 +2778,7 @@
    *
    * Completes with a [TurnBasedMatchRematch].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2801,7 +2789,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (matchId == null) {
@@ -2815,7 +2803,7 @@
     }
 
 
-    _url = 'turnbasedmatches/' + common_internal.Escaper.ecapeVariable('$matchId') + '/rematch';
+    _url = 'turnbasedmatches/' + commons.Escaper.ecapeVariable('$matchId') + '/rematch';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2858,7 +2846,7 @@
    *
    * Completes with a [TurnBasedMatchSync].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2869,7 +2857,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (includeMatchData != null) {
@@ -2915,7 +2903,7 @@
    *
    * Completes with a [TurnBasedMatch].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2926,7 +2914,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2940,7 +2928,7 @@
     }
 
 
-    _url = 'turnbasedmatches/' + common_internal.Escaper.ecapeVariable('$matchId') + '/turn';
+    _url = 'turnbasedmatches/' + commons.Escaper.ecapeVariable('$matchId') + '/turn';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -9676,5 +9664,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/gamesconfiguration/v1configuration.dart b/generated/googleapis/lib/gamesconfiguration/v1configuration.dart
index 136c89b..1824110 100644
--- a/generated/googleapis/lib/gamesconfiguration/v1configuration.dart
+++ b/generated/googleapis/lib/gamesconfiguration/v1configuration.dart
@@ -1,17 +1,22 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.gamesConfiguration.v1configuration;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError, Media, UploadOptions,
+    ResumableUploadOptions, DownloadOptions, PartialDownloadOptions,
+    ByteRange;
+
+const core.String USER_AGENT = 'dart-api-client gamesConfiguration/v1configuration';
 
 /** The Publishing API for Google Play Game Services. */
 class GamesConfigurationApi {
@@ -19,22 +24,21 @@
   static const AndroidpublisherScope = "https://www.googleapis.com/auth/androidpublisher";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AchievementConfigurationsResourceApi get achievementConfigurations => new AchievementConfigurationsResourceApi(_requester);
   ImageConfigurationsResourceApi get imageConfigurations => new ImageConfigurationsResourceApi(_requester);
   LeaderboardConfigurationsResourceApi get leaderboardConfigurations => new LeaderboardConfigurationsResourceApi(_requester);
 
   GamesConfigurationApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "games/v1configuration/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class AchievementConfigurationsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AchievementConfigurationsResourceApi(common_internal.ApiRequester client) : 
+  AchievementConfigurationsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -44,7 +48,7 @@
    *
    * [achievementId] - The ID of the achievement used by this method.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -55,7 +59,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (achievementId == null) {
@@ -64,7 +68,7 @@
 
     _downloadOptions = null;
 
-    _url = 'achievements/' + common_internal.Escaper.ecapeVariable('$achievementId');
+    _url = 'achievements/' + commons.Escaper.ecapeVariable('$achievementId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -85,7 +89,7 @@
    *
    * Completes with a [AchievementConfiguration].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -96,7 +100,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (achievementId == null) {
@@ -104,7 +108,7 @@
     }
 
 
-    _url = 'achievements/' + common_internal.Escaper.ecapeVariable('$achievementId');
+    _url = 'achievements/' + commons.Escaper.ecapeVariable('$achievementId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -128,7 +132,7 @@
    *
    * Completes with a [AchievementConfiguration].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -139,7 +143,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -150,7 +154,7 @@
     }
 
 
-    _url = 'applications/' + common_internal.Escaper.ecapeVariable('$applicationId') + '/achievements';
+    _url = 'applications/' + commons.Escaper.ecapeVariable('$applicationId') + '/achievements';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -179,7 +183,7 @@
    *
    * Completes with a [AchievementConfigurationListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -190,7 +194,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (applicationId == null) {
@@ -204,7 +208,7 @@
     }
 
 
-    _url = 'applications/' + common_internal.Escaper.ecapeVariable('$applicationId') + '/achievements';
+    _url = 'applications/' + commons.Escaper.ecapeVariable('$applicationId') + '/achievements';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -228,7 +232,7 @@
    *
    * Completes with a [AchievementConfiguration].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -239,7 +243,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -250,7 +254,7 @@
     }
 
 
-    _url = 'achievements/' + common_internal.Escaper.ecapeVariable('$achievementId');
+    _url = 'achievements/' + commons.Escaper.ecapeVariable('$achievementId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -273,7 +277,7 @@
    *
    * Completes with a [AchievementConfiguration].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -284,7 +288,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -295,7 +299,7 @@
     }
 
 
-    _url = 'achievements/' + common_internal.Escaper.ecapeVariable('$achievementId');
+    _url = 'achievements/' + commons.Escaper.ecapeVariable('$achievementId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -310,11 +314,10 @@
 }
 
 
-/** Not documented yet. */
 class ImageConfigurationsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ImageConfigurationsResourceApi(common_internal.ApiRequester client) : 
+  ImageConfigurationsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -336,18 +339,18 @@
    *
    * Completes with a [ImageConfiguration].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<ImageConfiguration> upload(core.String resourceId, core.String imageType, {common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<ImageConfiguration> upload(core.String resourceId, core.String imageType, {commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (resourceId == null) {
@@ -361,11 +364,11 @@
     _uploadOptions =  uploadOptions;
 
     if (_uploadMedia == null) {
-      _url = 'images/' + common_internal.Escaper.ecapeVariable('$resourceId') + '/imageType/' + common_internal.Escaper.ecapeVariable('$imageType');
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/games/v1configuration/images/' + common_internal.Escaper.ecapeVariable('$resourceId') + '/imageType/' + common_internal.Escaper.ecapeVariable('$imageType');
+      _url = 'images/' + commons.Escaper.ecapeVariable('$resourceId') + '/imageType/' + commons.Escaper.ecapeVariable('$imageType');
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/games/v1configuration/images/' + commons.Escaper.ecapeVariable('$resourceId') + '/imageType/' + commons.Escaper.ecapeVariable('$imageType');
     } else {
-      _url = '/upload/games/v1configuration/images/' + common_internal.Escaper.ecapeVariable('$resourceId') + '/imageType/' + common_internal.Escaper.ecapeVariable('$imageType');
+      _url = '/upload/games/v1configuration/images/' + commons.Escaper.ecapeVariable('$resourceId') + '/imageType/' + commons.Escaper.ecapeVariable('$imageType');
     }
 
 
@@ -382,11 +385,10 @@
 }
 
 
-/** Not documented yet. */
 class LeaderboardConfigurationsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  LeaderboardConfigurationsResourceApi(common_internal.ApiRequester client) : 
+  LeaderboardConfigurationsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -396,7 +398,7 @@
    *
    * [leaderboardId] - The ID of the leaderboard.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -407,7 +409,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (leaderboardId == null) {
@@ -416,7 +418,7 @@
 
     _downloadOptions = null;
 
-    _url = 'leaderboards/' + common_internal.Escaper.ecapeVariable('$leaderboardId');
+    _url = 'leaderboards/' + commons.Escaper.ecapeVariable('$leaderboardId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -437,7 +439,7 @@
    *
    * Completes with a [LeaderboardConfiguration].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -448,7 +450,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (leaderboardId == null) {
@@ -456,7 +458,7 @@
     }
 
 
-    _url = 'leaderboards/' + common_internal.Escaper.ecapeVariable('$leaderboardId');
+    _url = 'leaderboards/' + commons.Escaper.ecapeVariable('$leaderboardId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -480,7 +482,7 @@
    *
    * Completes with a [LeaderboardConfiguration].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -491,7 +493,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -502,7 +504,7 @@
     }
 
 
-    _url = 'applications/' + common_internal.Escaper.ecapeVariable('$applicationId') + '/leaderboards';
+    _url = 'applications/' + commons.Escaper.ecapeVariable('$applicationId') + '/leaderboards';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -531,7 +533,7 @@
    *
    * Completes with a [LeaderboardConfigurationListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -542,7 +544,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (applicationId == null) {
@@ -556,7 +558,7 @@
     }
 
 
-    _url = 'applications/' + common_internal.Escaper.ecapeVariable('$applicationId') + '/leaderboards';
+    _url = 'applications/' + commons.Escaper.ecapeVariable('$applicationId') + '/leaderboards';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -580,7 +582,7 @@
    *
    * Completes with a [LeaderboardConfiguration].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -591,7 +593,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -602,7 +604,7 @@
     }
 
 
-    _url = 'leaderboards/' + common_internal.Escaper.ecapeVariable('$leaderboardId');
+    _url = 'leaderboards/' + commons.Escaper.ecapeVariable('$leaderboardId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -625,7 +627,7 @@
    *
    * Completes with a [LeaderboardConfiguration].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -636,7 +638,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -647,7 +649,7 @@
     }
 
 
-    _url = 'leaderboards/' + common_internal.Escaper.ecapeVariable('$leaderboardId');
+    _url = 'leaderboards/' + commons.Escaper.ecapeVariable('$leaderboardId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1370,5 +1372,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/gamesmanagement/v1management.dart b/generated/googleapis/lib/gamesmanagement/v1management.dart
index 401434f..e1c4c20 100644
--- a/generated/googleapis/lib/gamesmanagement/v1management.dart
+++ b/generated/googleapis/lib/gamesmanagement/v1management.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.gamesManagement.v1management;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client gamesManagement/v1management';
 
 /** The Management API for Google Play Game Services. */
 class GamesManagementApi {
@@ -25,7 +28,7 @@
   static const PlusLoginScope = "https://www.googleapis.com/auth/plus.login";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AchievementsResourceApi get achievements => new AchievementsResourceApi(_requester);
   ApplicationsResourceApi get applications => new ApplicationsResourceApi(_requester);
@@ -37,15 +40,14 @@
   TurnBasedMatchesResourceApi get turnBasedMatches => new TurnBasedMatchesResourceApi(_requester);
 
   GamesManagementApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "games/v1management/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class AchievementsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AchievementsResourceApi(common_internal.ApiRequester client) : 
+  AchievementsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -59,7 +61,7 @@
    *
    * Completes with a [AchievementResetResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -70,7 +72,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (achievementId == null) {
@@ -78,7 +80,7 @@
     }
 
 
-    _url = 'achievements/' + common_internal.Escaper.ecapeVariable('$achievementId') + '/reset';
+    _url = 'achievements/' + commons.Escaper.ecapeVariable('$achievementId') + '/reset';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -99,7 +101,7 @@
    *
    * Completes with a [AchievementResetAllResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -110,7 +112,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -133,7 +135,7 @@
    *
    * Request parameters:
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -144,7 +146,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -171,7 +173,7 @@
    *
    * [achievementId] - The ID of the achievement used by this method.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -182,7 +184,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (achievementId == null) {
@@ -191,7 +193,7 @@
 
     _downloadOptions = null;
 
-    _url = 'achievements/' + common_internal.Escaper.ecapeVariable('$achievementId') + '/resetForAllPlayers';
+    _url = 'achievements/' + commons.Escaper.ecapeVariable('$achievementId') + '/resetForAllPlayers';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -212,7 +214,7 @@
    *
    * Request parameters:
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -223,7 +225,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -247,11 +249,10 @@
 }
 
 
-/** Not documented yet. */
 class ApplicationsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ApplicationsResourceApi(common_internal.ApiRequester client) : 
+  ApplicationsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -272,7 +273,7 @@
    *
    * Completes with a [HiddenPlayerList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -283,7 +284,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (applicationId == null) {
@@ -297,7 +298,7 @@
     }
 
 
-    _url = 'applications/' + common_internal.Escaper.ecapeVariable('$applicationId') + '/players/hidden';
+    _url = 'applications/' + commons.Escaper.ecapeVariable('$applicationId') + '/players/hidden';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -312,11 +313,10 @@
 }
 
 
-/** Not documented yet. */
 class EventsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  EventsResourceApi(common_internal.ApiRequester client) : 
+  EventsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -329,7 +329,7 @@
    *
    * [eventId] - The ID of the event.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -340,7 +340,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (eventId == null) {
@@ -349,7 +349,7 @@
 
     _downloadOptions = null;
 
-    _url = 'events/' + common_internal.Escaper.ecapeVariable('$eventId') + '/reset';
+    _url = 'events/' + commons.Escaper.ecapeVariable('$eventId') + '/reset';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -368,7 +368,7 @@
    *
    * Request parameters:
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -379,7 +379,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -404,7 +404,7 @@
    *
    * Request parameters:
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -415,7 +415,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -442,7 +442,7 @@
    *
    * [eventId] - The ID of the event.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -453,7 +453,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (eventId == null) {
@@ -462,7 +462,7 @@
 
     _downloadOptions = null;
 
-    _url = 'events/' + common_internal.Escaper.ecapeVariable('$eventId') + '/resetForAllPlayers';
+    _url = 'events/' + commons.Escaper.ecapeVariable('$eventId') + '/resetForAllPlayers';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -483,7 +483,7 @@
    *
    * Request parameters:
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -494,7 +494,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -518,11 +518,10 @@
 }
 
 
-/** Not documented yet. */
 class PlayersResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PlayersResourceApi(common_internal.ApiRequester client) : 
+  PlayersResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -537,7 +536,7 @@
    * [playerId] - A player ID. A value of me may be used in place of the
    * authenticated player's ID.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -548,7 +547,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (applicationId == null) {
@@ -560,7 +559,7 @@
 
     _downloadOptions = null;
 
-    _url = 'applications/' + common_internal.Escaper.ecapeVariable('$applicationId') + '/players/hidden/' + common_internal.Escaper.ecapeVariable('$playerId');
+    _url = 'applications/' + commons.Escaper.ecapeVariable('$applicationId') + '/players/hidden/' + commons.Escaper.ecapeVariable('$playerId');
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -584,7 +583,7 @@
    * [playerId] - A player ID. A value of me may be used in place of the
    * authenticated player's ID.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -595,7 +594,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (applicationId == null) {
@@ -607,7 +606,7 @@
 
     _downloadOptions = null;
 
-    _url = 'applications/' + common_internal.Escaper.ecapeVariable('$applicationId') + '/players/hidden/' + common_internal.Escaper.ecapeVariable('$playerId');
+    _url = 'applications/' + commons.Escaper.ecapeVariable('$applicationId') + '/players/hidden/' + commons.Escaper.ecapeVariable('$playerId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -622,11 +621,10 @@
 }
 
 
-/** Not documented yet. */
 class QuestsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  QuestsResourceApi(common_internal.ApiRequester client) : 
+  QuestsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -638,7 +636,7 @@
    *
    * [questId] - The ID of the quest.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -649,7 +647,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (questId == null) {
@@ -658,7 +656,7 @@
 
     _downloadOptions = null;
 
-    _url = 'quests/' + common_internal.Escaper.ecapeVariable('$questId') + '/reset';
+    _url = 'quests/' + commons.Escaper.ecapeVariable('$questId') + '/reset';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -677,7 +675,7 @@
    *
    * Request parameters:
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -688,7 +686,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -712,7 +710,7 @@
    *
    * Request parameters:
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -723,7 +721,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -750,7 +748,7 @@
    *
    * [questId] - The ID of the quest.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -761,7 +759,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (questId == null) {
@@ -770,7 +768,7 @@
 
     _downloadOptions = null;
 
-    _url = 'quests/' + common_internal.Escaper.ecapeVariable('$questId') + '/resetForAllPlayers';
+    _url = 'quests/' + commons.Escaper.ecapeVariable('$questId') + '/resetForAllPlayers';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -791,7 +789,7 @@
    *
    * Request parameters:
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -802,7 +800,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -826,11 +824,10 @@
 }
 
 
-/** Not documented yet. */
 class RoomsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  RoomsResourceApi(common_internal.ApiRequester client) : 
+  RoomsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -840,7 +837,7 @@
    *
    * Request parameters:
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -851,7 +848,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -876,7 +873,7 @@
    *
    * Request parameters:
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -887,7 +884,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -908,11 +905,10 @@
 }
 
 
-/** Not documented yet. */
 class ScoresResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ScoresResourceApi(common_internal.ApiRequester client) : 
+  ScoresResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -926,7 +922,7 @@
    *
    * Completes with a [PlayerScoreResetResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -937,7 +933,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (leaderboardId == null) {
@@ -945,7 +941,7 @@
     }
 
 
-    _url = 'leaderboards/' + common_internal.Escaper.ecapeVariable('$leaderboardId') + '/scores/reset';
+    _url = 'leaderboards/' + commons.Escaper.ecapeVariable('$leaderboardId') + '/scores/reset';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -966,7 +962,7 @@
    *
    * Completes with a [PlayerScoreResetAllResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -977,7 +973,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -1000,7 +996,7 @@
    *
    * Request parameters:
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1011,7 +1007,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -1038,7 +1034,7 @@
    *
    * [leaderboardId] - The ID of the leaderboard.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1049,7 +1045,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (leaderboardId == null) {
@@ -1058,7 +1054,7 @@
 
     _downloadOptions = null;
 
-    _url = 'leaderboards/' + common_internal.Escaper.ecapeVariable('$leaderboardId') + '/scores/resetForAllPlayers';
+    _url = 'leaderboards/' + commons.Escaper.ecapeVariable('$leaderboardId') + '/scores/resetForAllPlayers';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1079,7 +1075,7 @@
    *
    * Request parameters:
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1090,7 +1086,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1114,11 +1110,10 @@
 }
 
 
-/** Not documented yet. */
 class TurnBasedMatchesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  TurnBasedMatchesResourceApi(common_internal.ApiRequester client) : 
+  TurnBasedMatchesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1127,7 +1122,7 @@
    *
    * Request parameters:
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1138,7 +1133,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -1163,7 +1158,7 @@
    *
    * Request parameters:
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1174,7 +1169,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -1895,5 +1890,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/gmail/v1.dart b/generated/googleapis/lib/gmail/v1.dart
index efb0831..33f7fb3 100644
--- a/generated/googleapis/lib/gmail/v1.dart
+++ b/generated/googleapis/lib/gmail/v1.dart
@@ -1,17 +1,22 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.gmail.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError, Media, UploadOptions,
+    ResumableUploadOptions, DownloadOptions, PartialDownloadOptions,
+    ByteRange;
+
+const core.String USER_AGENT = 'dart-api-client gmail/v1';
 
 /** The Gmail REST API. */
 class GmailApi {
@@ -21,6 +26,12 @@
   /** Manage drafts and send emails */
   static const GmailComposeScope = "https://www.googleapis.com/auth/gmail.compose";
 
+  /** Insert mail into your mailbox */
+  static const GmailInsertScope = "https://www.googleapis.com/auth/gmail.insert";
+
+  /** Manage mailbox labels */
+  static const GmailLabelsScope = "https://www.googleapis.com/auth/gmail.labels";
+
   /** View and modify but not delete your email */
   static const GmailModifyScope = "https://www.googleapis.com/auth/gmail.modify";
 
@@ -28,18 +39,17 @@
   static const GmailReadonlyScope = "https://www.googleapis.com/auth/gmail.readonly";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   UsersResourceApi get users => new UsersResourceApi(_requester);
 
   GmailApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "gmail/v1/users/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class UsersResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   UsersDraftsResourceApi get drafts => new UsersDraftsResourceApi(_requester);
   UsersHistoryResourceApi get history => new UsersHistoryResourceApi(_requester);
@@ -47,7 +57,7 @@
   UsersMessagesResourceApi get messages => new UsersMessagesResourceApi(_requester);
   UsersThreadsResourceApi get threads => new UsersThreadsResourceApi(_requester);
 
-  UsersResourceApi(common_internal.ApiRequester client) : 
+  UsersResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -60,7 +70,7 @@
    *
    * Completes with a [Profile].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -71,7 +81,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -79,7 +89,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/profile';
+    _url = commons.Escaper.ecapeVariable('$userId') + '/profile';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -94,11 +104,10 @@
 }
 
 
-/** Not documented yet. */
 class UsersDraftsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  UsersDraftsResourceApi(common_internal.ApiRequester client) : 
+  UsersDraftsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -118,18 +127,18 @@
    *
    * Completes with a [Draft].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<Draft> create(Draft request, core.String userId, {common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<Draft> create(Draft request, core.String userId, {commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -143,11 +152,11 @@
     _uploadOptions =  uploadOptions;
 
     if (_uploadMedia == null) {
-      _url = common_internal.Escaper.ecapeVariable('$userId') + '/drafts';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/gmail/v1/users/' + common_internal.Escaper.ecapeVariable('$userId') + '/drafts';
+      _url = commons.Escaper.ecapeVariable('$userId') + '/drafts';
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/gmail/v1/users/' + commons.Escaper.ecapeVariable('$userId') + '/drafts';
     } else {
-      _url = '/upload/gmail/v1/users/' + common_internal.Escaper.ecapeVariable('$userId') + '/drafts';
+      _url = '/upload/gmail/v1/users/' + commons.Escaper.ecapeVariable('$userId') + '/drafts';
     }
 
 
@@ -172,7 +181,7 @@
    *
    * [id] - The ID of the draft to delete.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -183,7 +192,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -195,7 +204,7 @@
 
     _downloadOptions = null;
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/drafts/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = commons.Escaper.ecapeVariable('$userId') + '/drafts/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -226,7 +235,7 @@
    *
    * Completes with a [Draft].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -237,7 +246,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -251,7 +260,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/drafts/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = commons.Escaper.ecapeVariable('$userId') + '/drafts/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -278,7 +287,7 @@
    *
    * Completes with a [ListDraftsResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -289,7 +298,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -303,7 +312,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/drafts';
+    _url = commons.Escaper.ecapeVariable('$userId') + '/drafts';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -333,18 +342,18 @@
    *
    * Completes with a [Message].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<Message> send(Draft request, core.String userId, {common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<Message> send(Draft request, core.String userId, {commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -358,11 +367,11 @@
     _uploadOptions =  uploadOptions;
 
     if (_uploadMedia == null) {
-      _url = common_internal.Escaper.ecapeVariable('$userId') + '/drafts/send';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/gmail/v1/users/' + common_internal.Escaper.ecapeVariable('$userId') + '/drafts/send';
+      _url = commons.Escaper.ecapeVariable('$userId') + '/drafts/send';
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/gmail/v1/users/' + commons.Escaper.ecapeVariable('$userId') + '/drafts/send';
     } else {
-      _url = '/upload/gmail/v1/users/' + common_internal.Escaper.ecapeVariable('$userId') + '/drafts/send';
+      _url = '/upload/gmail/v1/users/' + commons.Escaper.ecapeVariable('$userId') + '/drafts/send';
     }
 
 
@@ -395,18 +404,18 @@
    *
    * Completes with a [Draft].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<Draft> update(Draft request, core.String userId, core.String id, {common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<Draft> update(Draft request, core.String userId, core.String id, {commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -423,11 +432,11 @@
     _uploadOptions =  uploadOptions;
 
     if (_uploadMedia == null) {
-      _url = common_internal.Escaper.ecapeVariable('$userId') + '/drafts/' + common_internal.Escaper.ecapeVariable('$id');
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/gmail/v1/users/' + common_internal.Escaper.ecapeVariable('$userId') + '/drafts/' + common_internal.Escaper.ecapeVariable('$id');
+      _url = commons.Escaper.ecapeVariable('$userId') + '/drafts/' + commons.Escaper.ecapeVariable('$id');
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/gmail/v1/users/' + commons.Escaper.ecapeVariable('$userId') + '/drafts/' + commons.Escaper.ecapeVariable('$id');
     } else {
-      _url = '/upload/gmail/v1/users/' + common_internal.Escaper.ecapeVariable('$userId') + '/drafts/' + common_internal.Escaper.ecapeVariable('$id');
+      _url = '/upload/gmail/v1/users/' + commons.Escaper.ecapeVariable('$userId') + '/drafts/' + commons.Escaper.ecapeVariable('$id');
     }
 
 
@@ -444,11 +453,10 @@
 }
 
 
-/** Not documented yet. */
 class UsersHistoryResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  UsersHistoryResourceApi(common_internal.ApiRequester client) : 
+  UsersHistoryResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -480,7 +488,7 @@
    *
    * Completes with a [ListHistoryResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -491,7 +499,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -511,7 +519,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/history';
+    _url = commons.Escaper.ecapeVariable('$userId') + '/history';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -526,11 +534,10 @@
 }
 
 
-/** Not documented yet. */
 class UsersLabelsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  UsersLabelsResourceApi(common_internal.ApiRequester client) : 
+  UsersLabelsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -545,7 +552,7 @@
    *
    * Completes with a [Label].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -556,7 +563,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -567,7 +574,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/labels';
+    _url = commons.Escaper.ecapeVariable('$userId') + '/labels';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -590,7 +597,7 @@
    *
    * [id] - The ID of the label to delete.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -601,7 +608,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -613,7 +620,7 @@
 
     _downloadOptions = null;
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/labels/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = commons.Escaper.ecapeVariable('$userId') + '/labels/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -637,7 +644,7 @@
    *
    * Completes with a [Label].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -648,7 +655,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -659,7 +666,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/labels/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = commons.Escaper.ecapeVariable('$userId') + '/labels/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -681,7 +688,7 @@
    *
    * Completes with a [ListLabelsResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -692,7 +699,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -700,7 +707,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/labels';
+    _url = commons.Escaper.ecapeVariable('$userId') + '/labels';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -726,7 +733,7 @@
    *
    * Completes with a [Label].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -737,7 +744,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -751,7 +758,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/labels/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = commons.Escaper.ecapeVariable('$userId') + '/labels/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -777,7 +784,7 @@
    *
    * Completes with a [Label].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -788,7 +795,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -802,7 +809,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/labels/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = commons.Escaper.ecapeVariable('$userId') + '/labels/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -817,13 +824,12 @@
 }
 
 
-/** Not documented yet. */
 class UsersMessagesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   UsersMessagesAttachmentsResourceApi get attachments => new UsersMessagesAttachmentsResourceApi(_requester);
 
-  UsersMessagesResourceApi(common_internal.ApiRequester client) : 
+  UsersMessagesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -837,7 +843,7 @@
    *
    * [id] - The ID of the message to delete.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -848,7 +854,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -860,7 +866,7 @@
 
     _downloadOptions = null;
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/messages/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = commons.Escaper.ecapeVariable('$userId') + '/messages/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -894,7 +900,7 @@
    *
    * Completes with a [Message].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -905,7 +911,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -922,7 +928,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/messages/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = commons.Escaper.ecapeVariable('$userId') + '/messages/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -968,18 +974,18 @@
    *
    * Completes with a [Message].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<Message> import(Message request, core.String userId, {core.bool deleted, core.String internalDateSource, core.bool neverMarkSpam, core.bool processForCalendar, common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<Message> import(Message request, core.String userId, {core.bool deleted, core.String internalDateSource, core.bool neverMarkSpam, core.bool processForCalendar, commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1005,11 +1011,11 @@
     _uploadOptions =  uploadOptions;
 
     if (_uploadMedia == null) {
-      _url = common_internal.Escaper.ecapeVariable('$userId') + '/messages/import';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/gmail/v1/users/' + common_internal.Escaper.ecapeVariable('$userId') + '/messages/import';
+      _url = commons.Escaper.ecapeVariable('$userId') + '/messages/import';
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/gmail/v1/users/' + commons.Escaper.ecapeVariable('$userId') + '/messages/import';
     } else {
-      _url = '/upload/gmail/v1/users/' + common_internal.Escaper.ecapeVariable('$userId') + '/messages/import';
+      _url = '/upload/gmail/v1/users/' + commons.Escaper.ecapeVariable('$userId') + '/messages/import';
     }
 
 
@@ -1035,6 +1041,10 @@
    * [userId] - The user's email address. The special value me can be used to
    * indicate the authenticated user.
    *
+   * [deleted] - Mark the email as permanently deleted (not TRASH) and only
+   * visible in Google Apps Vault to a Vault administrator. Only used for Google
+   * Apps for Work accounts.
+   *
    * [internalDateSource] - Source for Gmail's internal date of the message.
    * Possible string values are:
    * - "dateHeader"
@@ -1047,18 +1057,18 @@
    *
    * Completes with a [Message].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<Message> insert(Message request, core.String userId, {core.String internalDateSource, common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<Message> insert(Message request, core.String userId, {core.bool deleted, core.String internalDateSource, commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1067,6 +1077,9 @@
     if (userId == null) {
       throw new core.ArgumentError("Parameter userId is required.");
     }
+    if (deleted != null) {
+      _queryParams["deleted"] = ["${deleted}"];
+    }
     if (internalDateSource != null) {
       _queryParams["internalDateSource"] = [internalDateSource];
     }
@@ -1075,11 +1088,11 @@
     _uploadOptions =  uploadOptions;
 
     if (_uploadMedia == null) {
-      _url = common_internal.Escaper.ecapeVariable('$userId') + '/messages';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/gmail/v1/users/' + common_internal.Escaper.ecapeVariable('$userId') + '/messages';
+      _url = commons.Escaper.ecapeVariable('$userId') + '/messages';
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/gmail/v1/users/' + commons.Escaper.ecapeVariable('$userId') + '/messages';
     } else {
-      _url = '/upload/gmail/v1/users/' + common_internal.Escaper.ecapeVariable('$userId') + '/messages';
+      _url = '/upload/gmail/v1/users/' + commons.Escaper.ecapeVariable('$userId') + '/messages';
     }
 
 
@@ -1117,7 +1130,7 @@
    *
    * Completes with a [ListMessagesResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1128,7 +1141,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -1151,7 +1164,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/messages';
+    _url = commons.Escaper.ecapeVariable('$userId') + '/messages';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1177,7 +1190,7 @@
    *
    * Completes with a [Message].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1188,7 +1201,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1202,7 +1215,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/messages/' + common_internal.Escaper.ecapeVariable('$id') + '/modify';
+    _url = commons.Escaper.ecapeVariable('$userId') + '/messages/' + commons.Escaper.ecapeVariable('$id') + '/modify';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1232,18 +1245,18 @@
    *
    * Completes with a [Message].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<Message> send(Message request, core.String userId, {common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<Message> send(Message request, core.String userId, {commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1257,11 +1270,11 @@
     _uploadOptions =  uploadOptions;
 
     if (_uploadMedia == null) {
-      _url = common_internal.Escaper.ecapeVariable('$userId') + '/messages/send';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/gmail/v1/users/' + common_internal.Escaper.ecapeVariable('$userId') + '/messages/send';
+      _url = commons.Escaper.ecapeVariable('$userId') + '/messages/send';
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/gmail/v1/users/' + commons.Escaper.ecapeVariable('$userId') + '/messages/send';
     } else {
-      _url = '/upload/gmail/v1/users/' + common_internal.Escaper.ecapeVariable('$userId') + '/messages/send';
+      _url = '/upload/gmail/v1/users/' + commons.Escaper.ecapeVariable('$userId') + '/messages/send';
     }
 
 
@@ -1287,7 +1300,7 @@
    *
    * Completes with a [Message].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1298,7 +1311,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -1309,7 +1322,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/messages/' + common_internal.Escaper.ecapeVariable('$id') + '/trash';
+    _url = commons.Escaper.ecapeVariable('$userId') + '/messages/' + commons.Escaper.ecapeVariable('$id') + '/trash';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1333,7 +1346,7 @@
    *
    * Completes with a [Message].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1344,7 +1357,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -1355,7 +1368,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/messages/' + common_internal.Escaper.ecapeVariable('$id') + '/untrash';
+    _url = commons.Escaper.ecapeVariable('$userId') + '/messages/' + commons.Escaper.ecapeVariable('$id') + '/untrash';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1370,11 +1383,10 @@
 }
 
 
-/** Not documented yet. */
 class UsersMessagesAttachmentsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  UsersMessagesAttachmentsResourceApi(common_internal.ApiRequester client) : 
+  UsersMessagesAttachmentsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1391,7 +1403,7 @@
    *
    * Completes with a [MessagePartBody].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1402,7 +1414,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -1416,7 +1428,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/messages/' + common_internal.Escaper.ecapeVariable('$messageId') + '/attachments/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = commons.Escaper.ecapeVariable('$userId') + '/messages/' + commons.Escaper.ecapeVariable('$messageId') + '/attachments/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1431,11 +1443,10 @@
 }
 
 
-/** Not documented yet. */
 class UsersThreadsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  UsersThreadsResourceApi(common_internal.ApiRequester client) : 
+  UsersThreadsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1449,7 +1460,7 @@
    *
    * [id] - ID of the Thread to delete.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1460,7 +1471,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -1472,7 +1483,7 @@
 
     _downloadOptions = null;
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/threads/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = commons.Escaper.ecapeVariable('$userId') + '/threads/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1505,7 +1516,7 @@
    *
    * Completes with a [Thread].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1516,7 +1527,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -1533,7 +1544,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/threads/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = commons.Escaper.ecapeVariable('$userId') + '/threads/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1569,7 +1580,7 @@
    *
    * Completes with a [ListThreadsResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1580,7 +1591,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -1603,7 +1614,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/threads';
+    _url = commons.Escaper.ecapeVariable('$userId') + '/threads';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1630,7 +1641,7 @@
    *
    * Completes with a [Thread].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1641,7 +1652,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1655,7 +1666,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/threads/' + common_internal.Escaper.ecapeVariable('$id') + '/modify';
+    _url = commons.Escaper.ecapeVariable('$userId') + '/threads/' + commons.Escaper.ecapeVariable('$id') + '/modify';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1679,7 +1690,7 @@
    *
    * Completes with a [Thread].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1690,7 +1701,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -1701,7 +1712,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/threads/' + common_internal.Escaper.ecapeVariable('$id') + '/trash';
+    _url = commons.Escaper.ecapeVariable('$userId') + '/threads/' + commons.Escaper.ecapeVariable('$id') + '/trash';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1725,7 +1736,7 @@
    *
    * Completes with a [Thread].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1736,7 +1747,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -1747,7 +1758,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$userId') + '/threads/' + common_internal.Escaper.ecapeVariable('$id') + '/untrash';
+    _url = commons.Escaper.ecapeVariable('$userId') + '/threads/' + commons.Escaper.ecapeVariable('$id') + '/untrash';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1874,12 +1885,10 @@
 }
 
 
-/** Not documented yet. */
 class HistoryLabelAdded {
   /** Label IDs added to the message. */
   core.List<core.String> labelIds;
 
-  /** Not documented yet. */
   Message message;
 
 
@@ -1907,12 +1916,10 @@
 }
 
 
-/** Not documented yet. */
 class HistoryLabelRemoved {
   /** Label IDs removed from the message. */
   core.List<core.String> labelIds;
 
-  /** Not documented yet. */
   Message message;
 
 
@@ -1940,9 +1947,7 @@
 }
 
 
-/** Not documented yet. */
 class HistoryMessageAdded {
-  /** Not documented yet. */
   Message message;
 
 
@@ -1964,9 +1969,7 @@
 }
 
 
-/** Not documented yet. */
 class HistoryMessageDeleted {
-  /** Not documented yet. */
   Message message;
 
 
@@ -2109,7 +2112,6 @@
 }
 
 
-/** Not documented yet. */
 class ListDraftsResponse {
   /** List of drafts. */
   core.List<Draft> drafts;
@@ -2151,7 +2153,6 @@
 }
 
 
-/** Not documented yet. */
 class ListHistoryResponse {
   /**
    * List of history records. Any messages contained in the response will
@@ -2196,7 +2197,6 @@
 }
 
 
-/** Not documented yet. */
 class ListLabelsResponse {
   /** List of labels. */
   core.List<Label> labels;
@@ -2220,7 +2220,6 @@
 }
 
 
-/** Not documented yet. */
 class ListMessagesResponse {
   /** List of messages. */
   core.List<Message> messages;
@@ -2262,7 +2261,6 @@
 }
 
 
-/** Not documented yet. */
 class ListThreadsResponse {
   /** Page token to retrieve the next page of results in the list. */
   core.String nextPageToken;
@@ -2554,7 +2552,6 @@
 }
 
 
-/** Not documented yet. */
 class MessagePartHeader {
   /** The name of the header before the : separator. For example, To. */
   core.String name;
@@ -2590,7 +2587,6 @@
 }
 
 
-/** Not documented yet. */
 class ModifyMessageRequest {
   /** A list of IDs of labels to add to this message. */
   core.List<core.String> addLabelIds;
@@ -2623,7 +2619,6 @@
 }
 
 
-/** Not documented yet. */
 class ModifyThreadRequest {
   /** A list of IDs of labels to add to this thread. */
   core.List<core.String> addLabelIds;
@@ -2756,5 +2751,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/groupsmigration/v1.dart b/generated/googleapis/lib/groupsmigration/v1.dart
index 22e0584..07c9ddc 100644
--- a/generated/googleapis/lib/groupsmigration/v1.dart
+++ b/generated/googleapis/lib/groupsmigration/v1.dart
@@ -1,35 +1,42 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.groupsmigration.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError, Media, UploadOptions,
+    ResumableUploadOptions, DownloadOptions, PartialDownloadOptions,
+    ByteRange;
+
+const core.String USER_AGENT = 'dart-api-client groupsmigration/v1';
 
 /** Groups Migration Api. */
 class GroupsmigrationApi {
+  /** Manage messages in groups on your domain */
+  static const AppsGroupsMigrationScope = "https://www.googleapis.com/auth/apps.groups.migration";
 
-  final common_internal.ApiRequester _requester;
+
+  final commons.ApiRequester _requester;
 
   ArchiveResourceApi get archive => new ArchiveResourceApi(_requester);
 
   GroupsmigrationApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "groups/v1/groups/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class ArchiveResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ArchiveResourceApi(common_internal.ApiRequester client) : 
+  ArchiveResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -46,18 +53,18 @@
    *
    * Completes with a [Groups].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<Groups> insert(core.String groupId, {common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<Groups> insert(core.String groupId, {commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (groupId == null) {
@@ -68,11 +75,11 @@
     _uploadOptions =  uploadOptions;
 
     if (_uploadMedia == null) {
-      _url = common_internal.Escaper.ecapeVariable('$groupId') + '/archive';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/groups/v1/groups/' + common_internal.Escaper.ecapeVariable('$groupId') + '/archive';
+      _url = commons.Escaper.ecapeVariable('$groupId') + '/archive';
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/groups/v1/groups/' + commons.Escaper.ecapeVariable('$groupId') + '/archive';
     } else {
-      _url = '/upload/groups/v1/groups/' + common_internal.Escaper.ecapeVariable('$groupId') + '/archive';
+      _url = '/upload/groups/v1/groups/' + commons.Escaper.ecapeVariable('$groupId') + '/archive';
     }
 
 
@@ -121,5 +128,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/groupssettings/v1.dart b/generated/googleapis/lib/groupssettings/v1.dart
index c3418ed..ddcc3e8 100644
--- a/generated/googleapis/lib/groupssettings/v1.dart
+++ b/generated/googleapis/lib/groupssettings/v1.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.groupssettings.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client groupssettings/v1';
 
 /** Lets you manage permission levels and related settings of a group. */
 class GroupssettingsApi {
@@ -19,20 +22,19 @@
   static const AppsGroupsSettingsScope = "https://www.googleapis.com/auth/apps.groups.settings";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   GroupsResourceApi get groups => new GroupsResourceApi(_requester);
 
   GroupssettingsApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "groups/v1/groups/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class GroupsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  GroupsResourceApi(common_internal.ApiRequester client) : 
+  GroupsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -44,7 +46,7 @@
    *
    * Completes with a [Groups].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -55,7 +57,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (groupUniqueId == null) {
@@ -63,7 +65,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$groupUniqueId');
+    _url = commons.Escaper.ecapeVariable('$groupUniqueId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -86,7 +88,7 @@
    *
    * Completes with a [Groups].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -97,7 +99,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -108,7 +110,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$groupUniqueId');
+    _url = commons.Escaper.ecapeVariable('$groupUniqueId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -131,7 +133,7 @@
    *
    * Completes with a [Groups].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -142,7 +144,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -153,7 +155,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$groupUniqueId');
+    _url = commons.Escaper.ecapeVariable('$groupUniqueId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -470,5 +472,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/identitytoolkit/v3.dart b/generated/googleapis/lib/identitytoolkit/v3.dart
index 4dd1262..9412668 100644
--- a/generated/googleapis/lib/identitytoolkit/v3.dart
+++ b/generated/googleapis/lib/identitytoolkit/v3.dart
@@ -1,35 +1,37 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.identitytoolkit.v3;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client identitytoolkit/v3';
 
 /** Help the third party sites to implement federated login. */
 class IdentitytoolkitApi {
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   RelyingpartyResourceApi get relyingparty => new RelyingpartyResourceApi(_requester);
 
   IdentitytoolkitApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "identitytoolkit/v3/relyingparty/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class RelyingpartyResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  RelyingpartyResourceApi(common_internal.ApiRequester client) : 
+  RelyingpartyResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -41,7 +43,7 @@
    *
    * Completes with a [CreateAuthUriResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -52,7 +54,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -81,7 +83,7 @@
    *
    * Completes with a [DeleteAccountResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -92,7 +94,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -121,7 +123,7 @@
    *
    * Completes with a [DownloadAccountResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -132,7 +134,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -161,7 +163,7 @@
    *
    * Completes with a [GetAccountInfoResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -172,7 +174,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -201,7 +203,7 @@
    *
    * Completes with a [GetOobConfirmationCodeResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -212,7 +214,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -239,7 +241,7 @@
    *
    * Completes with a [IdentitytoolkitRelyingpartyGetPublicKeysResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -250,7 +252,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -276,7 +278,7 @@
    *
    * Completes with a [ResetPasswordResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -287,7 +289,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -316,7 +318,7 @@
    *
    * Completes with a [SetAccountInfoResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -327,7 +329,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -356,7 +358,7 @@
    *
    * Completes with a [UploadAccountResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -367,7 +369,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -396,7 +398,7 @@
    *
    * Completes with a [VerifyAssertionResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -407,7 +409,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -436,7 +438,7 @@
    *
    * Completes with a [VerifyPasswordResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -447,7 +449,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1404,7 +1406,6 @@
 }
 
 
-/** Not documented yet. */
 class SetAccountInfoResponseProviderUserInfo {
   /** The user's display name at the IDP. */
   core.String displayName;
@@ -1510,7 +1511,6 @@
 }
 
 
-/** Not documented yet. */
 class UploadAccountResponseError {
   /** The index of the malformed account, starting from 0. */
   core.int index;
@@ -1576,7 +1576,6 @@
 }
 
 
-/** Not documented yet. */
 class UserInfoProviderUserInfo {
   /** The user's display name at the IDP. */
   core.String displayName;
@@ -2122,5 +2121,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/licensing/v1.dart b/generated/googleapis/lib/licensing/v1.dart
index 824e866..d0b4011 100644
--- a/generated/googleapis/lib/licensing/v1.dart
+++ b/generated/googleapis/lib/licensing/v1.dart
@@ -1,35 +1,40 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.licensing.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client licensing/v1';
 
 /** Licensing API to view and manage license for your domain. */
 class LicensingApi {
+  /** View and manage Google Apps licenses for your domain */
+  static const AppsLicensingScope = "https://www.googleapis.com/auth/apps.licensing";
 
-  final common_internal.ApiRequester _requester;
+
+  final commons.ApiRequester _requester;
 
   LicenseAssignmentsResourceApi get licenseAssignments => new LicenseAssignmentsResourceApi(_requester);
 
   LicensingApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "apps/licensing/v1/product/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class LicenseAssignmentsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  LicenseAssignmentsResourceApi(common_internal.ApiRequester client) : 
+  LicenseAssignmentsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -43,7 +48,7 @@
    *
    * [userId] - email id or unique Id of the user
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -54,7 +59,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (productId == null) {
@@ -69,7 +74,7 @@
 
     _downloadOptions = null;
 
-    _url = common_internal.Escaper.ecapeVariable('$productId') + '/sku/' + common_internal.Escaper.ecapeVariable('$skuId') + '/user/' + common_internal.Escaper.ecapeVariable('$userId');
+    _url = commons.Escaper.ecapeVariable('$productId') + '/sku/' + commons.Escaper.ecapeVariable('$skuId') + '/user/' + commons.Escaper.ecapeVariable('$userId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -94,7 +99,7 @@
    *
    * Completes with a [LicenseAssignment].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -105,7 +110,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (productId == null) {
@@ -119,7 +124,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$productId') + '/sku/' + common_internal.Escaper.ecapeVariable('$skuId') + '/user/' + common_internal.Escaper.ecapeVariable('$userId');
+    _url = commons.Escaper.ecapeVariable('$productId') + '/sku/' + commons.Escaper.ecapeVariable('$skuId') + '/user/' + commons.Escaper.ecapeVariable('$userId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -144,7 +149,7 @@
    *
    * Completes with a [LicenseAssignment].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -155,7 +160,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -169,7 +174,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$productId') + '/sku/' + common_internal.Escaper.ecapeVariable('$skuId') + '/user';
+    _url = commons.Escaper.ecapeVariable('$productId') + '/sku/' + commons.Escaper.ecapeVariable('$skuId') + '/user';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -200,7 +205,7 @@
    *
    * Completes with a [LicenseAssignmentList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -211,7 +216,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (productId == null) {
@@ -229,7 +234,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$productId') + '/users';
+    _url = commons.Escaper.ecapeVariable('$productId') + '/users';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -262,7 +267,7 @@
    *
    * Completes with a [LicenseAssignmentList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -273,7 +278,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (productId == null) {
@@ -294,7 +299,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$productId') + '/sku/' + common_internal.Escaper.ecapeVariable('$skuId') + '/users';
+    _url = commons.Escaper.ecapeVariable('$productId') + '/sku/' + commons.Escaper.ecapeVariable('$skuId') + '/users';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -321,7 +326,7 @@
    *
    * Completes with a [LicenseAssignment].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -332,7 +337,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -349,7 +354,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$productId') + '/sku/' + common_internal.Escaper.ecapeVariable('$skuId') + '/user/' + common_internal.Escaper.ecapeVariable('$userId');
+    _url = commons.Escaper.ecapeVariable('$productId') + '/sku/' + commons.Escaper.ecapeVariable('$skuId') + '/user/' + commons.Escaper.ecapeVariable('$userId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -376,7 +381,7 @@
    *
    * Completes with a [LicenseAssignment].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -387,7 +392,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -404,7 +409,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$productId') + '/sku/' + common_internal.Escaper.ecapeVariable('$skuId') + '/user/' + common_internal.Escaper.ecapeVariable('$userId');
+    _url = commons.Escaper.ecapeVariable('$productId') + '/sku/' + commons.Escaper.ecapeVariable('$skuId') + '/user/' + commons.Escaper.ecapeVariable('$userId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -565,5 +570,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/mapsengine/v1.dart b/generated/googleapis/lib/mapsengine/v1.dart
index 2971be4..6b3d08f 100644
--- a/generated/googleapis/lib/mapsengine/v1.dart
+++ b/generated/googleapis/lib/mapsengine/v1.dart
@@ -1,17 +1,22 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.mapsengine.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError, Media, UploadOptions,
+    ResumableUploadOptions, DownloadOptions, PartialDownloadOptions,
+    ByteRange;
+
+const core.String USER_AGENT = 'dart-api-client mapsengine/v1';
 
 /**
  * The Google Maps Engine API allows developers to store and query geospatial
@@ -25,7 +30,7 @@
   static const MapsengineReadonlyScope = "https://www.googleapis.com/auth/mapsengine.readonly";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AssetsResourceApi get assets => new AssetsResourceApi(_requester);
   LayersResourceApi get layers => new LayersResourceApi(_requester);
@@ -36,18 +41,17 @@
   TablesResourceApi get tables => new TablesResourceApi(_requester);
 
   MapsengineApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "mapsengine/v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class AssetsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AssetsParentsResourceApi get parents => new AssetsParentsResourceApi(_requester);
   AssetsPermissionsResourceApi get permissions => new AssetsPermissionsResourceApi(_requester);
 
-  AssetsResourceApi(common_internal.ApiRequester client) : 
+  AssetsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -59,7 +63,7 @@
    *
    * Completes with a [Asset].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -70,7 +74,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -78,7 +82,7 @@
     }
 
 
-    _url = 'assets/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'assets/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -148,7 +152,7 @@
    *
    * Completes with a [AssetsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -159,7 +163,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (bbox != null) {
@@ -218,11 +222,10 @@
 }
 
 
-/** Not documented yet. */
 class AssetsParentsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AssetsParentsResourceApi(common_internal.ApiRequester client) : 
+  AssetsParentsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -241,7 +244,7 @@
    *
    * Completes with a [ParentsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -252,7 +255,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -266,7 +269,7 @@
     }
 
 
-    _url = 'assets/' + common_internal.Escaper.ecapeVariable('$id') + '/parents';
+    _url = 'assets/' + commons.Escaper.ecapeVariable('$id') + '/parents';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -281,11 +284,10 @@
 }
 
 
-/** Not documented yet. */
 class AssetsPermissionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AssetsPermissionsResourceApi(common_internal.ApiRequester client) : 
+  AssetsPermissionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -297,7 +299,7 @@
    *
    * Completes with a [PermissionsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -308,7 +310,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -316,7 +318,7 @@
     }
 
 
-    _url = 'assets/' + common_internal.Escaper.ecapeVariable('$id') + '/permissions';
+    _url = 'assets/' + commons.Escaper.ecapeVariable('$id') + '/permissions';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -331,14 +333,13 @@
 }
 
 
-/** Not documented yet. */
 class LayersResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   LayersParentsResourceApi get parents => new LayersParentsResourceApi(_requester);
   LayersPermissionsResourceApi get permissions => new LayersPermissionsResourceApi(_requester);
 
-  LayersResourceApi(common_internal.ApiRequester client) : 
+  LayersResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -350,7 +351,7 @@
    *
    * Completes with a [ProcessResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -361,7 +362,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -369,7 +370,7 @@
     }
 
 
-    _url = 'layers/' + common_internal.Escaper.ecapeVariable('$id') + '/cancelProcessing';
+    _url = 'layers/' + commons.Escaper.ecapeVariable('$id') + '/cancelProcessing';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -392,7 +393,7 @@
    *
    * Completes with a [Layer].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -403,7 +404,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -436,7 +437,7 @@
    * request will fail. Unpublish the layer, and remove it from all maps prior
    * to deleting.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -447,7 +448,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -456,7 +457,7 @@
 
     _downloadOptions = null;
 
-    _url = 'layers/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'layers/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -485,7 +486,7 @@
    *
    * Completes with a [Layer].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -496,7 +497,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -507,7 +508,7 @@
     }
 
 
-    _url = 'layers/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'layers/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -528,7 +529,7 @@
    *
    * Completes with a [PublishedLayer].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -539,7 +540,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -547,7 +548,7 @@
     }
 
 
-    _url = 'layers/' + common_internal.Escaper.ecapeVariable('$id') + '/published';
+    _url = 'layers/' + commons.Escaper.ecapeVariable('$id') + '/published';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -621,7 +622,7 @@
    *
    * Completes with a [LayersListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -632,7 +633,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (bbox != null) {
@@ -707,7 +708,7 @@
    *
    * Completes with a [PublishedLayersListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -718,7 +719,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (maxResults != null) {
@@ -753,7 +754,7 @@
    *
    * [id] - The ID of the layer.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -764,7 +765,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -776,7 +777,7 @@
 
     _downloadOptions = null;
 
-    _url = 'layers/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'layers/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -797,7 +798,7 @@
    *
    * Completes with a [ProcessResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -808,7 +809,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -816,7 +817,7 @@
     }
 
 
-    _url = 'layers/' + common_internal.Escaper.ecapeVariable('$id') + '/process';
+    _url = 'layers/' + commons.Escaper.ecapeVariable('$id') + '/process';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -841,7 +842,7 @@
    *
    * Completes with a [PublishResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -852,7 +853,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -863,7 +864,7 @@
     }
 
 
-    _url = 'layers/' + common_internal.Escaper.ecapeVariable('$id') + '/publish';
+    _url = 'layers/' + commons.Escaper.ecapeVariable('$id') + '/publish';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -884,7 +885,7 @@
    *
    * Completes with a [PublishResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -895,7 +896,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -903,7 +904,7 @@
     }
 
 
-    _url = 'layers/' + common_internal.Escaper.ecapeVariable('$id') + '/unpublish';
+    _url = 'layers/' + commons.Escaper.ecapeVariable('$id') + '/unpublish';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -918,11 +919,10 @@
 }
 
 
-/** Not documented yet. */
 class LayersParentsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  LayersParentsResourceApi(common_internal.ApiRequester client) : 
+  LayersParentsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -941,7 +941,7 @@
    *
    * Completes with a [ParentsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -952,7 +952,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -966,7 +966,7 @@
     }
 
 
-    _url = 'layers/' + common_internal.Escaper.ecapeVariable('$id') + '/parents';
+    _url = 'layers/' + commons.Escaper.ecapeVariable('$id') + '/parents';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -981,11 +981,10 @@
 }
 
 
-/** Not documented yet. */
 class LayersPermissionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  LayersPermissionsResourceApi(common_internal.ApiRequester client) : 
+  LayersPermissionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -999,7 +998,7 @@
    *
    * Completes with a [PermissionsBatchDeleteResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1010,7 +1009,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1021,7 +1020,7 @@
     }
 
 
-    _url = 'layers/' + common_internal.Escaper.ecapeVariable('$id') + '/permissions/batchDelete';
+    _url = 'layers/' + commons.Escaper.ecapeVariable('$id') + '/permissions/batchDelete';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1047,7 +1046,7 @@
    *
    * Completes with a [PermissionsBatchUpdateResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1058,7 +1057,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1069,7 +1068,7 @@
     }
 
 
-    _url = 'layers/' + common_internal.Escaper.ecapeVariable('$id') + '/permissions/batchUpdate';
+    _url = 'layers/' + commons.Escaper.ecapeVariable('$id') + '/permissions/batchUpdate';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1090,7 +1089,7 @@
    *
    * Completes with a [PermissionsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1101,7 +1100,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -1109,7 +1108,7 @@
     }
 
 
-    _url = 'layers/' + common_internal.Escaper.ecapeVariable('$id') + '/permissions';
+    _url = 'layers/' + commons.Escaper.ecapeVariable('$id') + '/permissions';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1124,13 +1123,12 @@
 }
 
 
-/** Not documented yet. */
 class MapsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   MapsPermissionsResourceApi get permissions => new MapsPermissionsResourceApi(_requester);
 
-  MapsResourceApi(common_internal.ApiRequester client) : 
+  MapsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1142,7 +1140,7 @@
    *
    * Completes with a [Map].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1153,7 +1151,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1182,7 +1180,7 @@
    * permitted to delete. If the map is published the request will fail.
    * Unpublish the map prior to deleting.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1193,7 +1191,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -1202,7 +1200,7 @@
 
     _downloadOptions = null;
 
-    _url = 'maps/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'maps/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1231,7 +1229,7 @@
    *
    * Completes with a [Map].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1242,7 +1240,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -1253,7 +1251,7 @@
     }
 
 
-    _url = 'maps/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'maps/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1274,7 +1272,7 @@
    *
    * Completes with a [PublishedMap].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1285,7 +1283,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -1293,7 +1291,7 @@
     }
 
 
-    _url = 'maps/' + common_internal.Escaper.ecapeVariable('$id') + '/published';
+    _url = 'maps/' + commons.Escaper.ecapeVariable('$id') + '/published';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1366,7 +1364,7 @@
    *
    * Completes with a [MapsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1377,7 +1375,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (bbox != null) {
@@ -1452,7 +1450,7 @@
    *
    * Completes with a [PublishedMapsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1463,7 +1461,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (maxResults != null) {
@@ -1498,7 +1496,7 @@
    *
    * [id] - The ID of the map.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1509,7 +1507,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1521,7 +1519,7 @@
 
     _downloadOptions = null;
 
-    _url = 'maps/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'maps/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1546,7 +1544,7 @@
    *
    * Completes with a [PublishResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1557,7 +1555,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -1568,7 +1566,7 @@
     }
 
 
-    _url = 'maps/' + common_internal.Escaper.ecapeVariable('$id') + '/publish';
+    _url = 'maps/' + commons.Escaper.ecapeVariable('$id') + '/publish';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1589,7 +1587,7 @@
    *
    * Completes with a [PublishResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1600,7 +1598,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -1608,7 +1606,7 @@
     }
 
 
-    _url = 'maps/' + common_internal.Escaper.ecapeVariable('$id') + '/unpublish';
+    _url = 'maps/' + commons.Escaper.ecapeVariable('$id') + '/unpublish';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1623,11 +1621,10 @@
 }
 
 
-/** Not documented yet. */
 class MapsPermissionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  MapsPermissionsResourceApi(common_internal.ApiRequester client) : 
+  MapsPermissionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1641,7 +1638,7 @@
    *
    * Completes with a [PermissionsBatchDeleteResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1652,7 +1649,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1663,7 +1660,7 @@
     }
 
 
-    _url = 'maps/' + common_internal.Escaper.ecapeVariable('$id') + '/permissions/batchDelete';
+    _url = 'maps/' + commons.Escaper.ecapeVariable('$id') + '/permissions/batchDelete';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1689,7 +1686,7 @@
    *
    * Completes with a [PermissionsBatchUpdateResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1700,7 +1697,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1711,7 +1708,7 @@
     }
 
 
-    _url = 'maps/' + common_internal.Escaper.ecapeVariable('$id') + '/permissions/batchUpdate';
+    _url = 'maps/' + commons.Escaper.ecapeVariable('$id') + '/permissions/batchUpdate';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1732,7 +1729,7 @@
    *
    * Completes with a [PermissionsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1743,7 +1740,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -1751,7 +1748,7 @@
     }
 
 
-    _url = 'maps/' + common_internal.Escaper.ecapeVariable('$id') + '/permissions';
+    _url = 'maps/' + commons.Escaper.ecapeVariable('$id') + '/permissions';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1766,13 +1763,12 @@
 }
 
 
-/** Not documented yet. */
 class ProjectsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   ProjectsIconsResourceApi get icons => new ProjectsIconsResourceApi(_requester);
 
-  ProjectsResourceApi(common_internal.ApiRequester client) : 
+  ProjectsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1782,7 +1778,7 @@
    *
    * Completes with a [ProjectsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1793,7 +1789,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -1813,11 +1809,10 @@
 }
 
 
-/** Not documented yet. */
 class ProjectsIconsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ProjectsIconsResourceApi(common_internal.ApiRequester client) : 
+  ProjectsIconsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1836,18 +1831,18 @@
    *
    * Completes with a [Icon].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<Icon> create(Icon request, core.String projectId, {common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<Icon> create(Icon request, core.String projectId, {commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1861,11 +1856,11 @@
     _uploadOptions =  uploadOptions;
 
     if (_uploadMedia == null) {
-      _url = 'projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/icons';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/mapsengine/v1/projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/icons';
+      _url = 'projects/' + commons.Escaper.ecapeVariable('$projectId') + '/icons';
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/mapsengine/v1/projects/' + commons.Escaper.ecapeVariable('$projectId') + '/icons';
     } else {
-      _url = '/upload/mapsengine/v1/projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/icons';
+      _url = '/upload/mapsengine/v1/projects/' + commons.Escaper.ecapeVariable('$projectId') + '/icons';
     }
 
 
@@ -1896,20 +1891,20 @@
    *
    * - [Icon] for Metadata downloads (see [downloadOptions]).
    *
-   * - [common.Media] for Media downloads (see [downloadOptions]).
+   * - [commons.Media] for Media downloads (see [downloadOptions]).
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future get(core.String projectId, core.String id, {common.DownloadOptions downloadOptions: common.DownloadOptions.Metadata}) {
+  async.Future get(core.String projectId, core.String id, {commons.DownloadOptions downloadOptions: commons.DownloadOptions.Metadata}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (projectId == null) {
@@ -1921,7 +1916,7 @@
 
     _downloadOptions = downloadOptions;
 
-    _url = 'projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/icons/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'projects/' + commons.Escaper.ecapeVariable('$projectId') + '/icons/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1931,7 +1926,7 @@
                                        uploadMedia: _uploadMedia,
                                        downloadOptions: _downloadOptions);
     if (_downloadOptions == null ||
-        _downloadOptions == common.DownloadOptions.Metadata) {
+        _downloadOptions == commons.DownloadOptions.Metadata) {
       return _response.then((data) => new Icon.fromJson(data));
     } else {
       return _response;
@@ -1954,7 +1949,7 @@
    *
    * Completes with a [IconsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1965,7 +1960,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (projectId == null) {
@@ -1979,7 +1974,7 @@
     }
 
 
-    _url = 'projects/' + common_internal.Escaper.ecapeVariable('$projectId') + '/icons';
+    _url = 'projects/' + commons.Escaper.ecapeVariable('$projectId') + '/icons';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1994,15 +1989,14 @@
 }
 
 
-/** Not documented yet. */
 class RasterCollectionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   RasterCollectionsParentsResourceApi get parents => new RasterCollectionsParentsResourceApi(_requester);
   RasterCollectionsPermissionsResourceApi get permissions => new RasterCollectionsPermissionsResourceApi(_requester);
   RasterCollectionsRastersResourceApi get rasters => new RasterCollectionsRastersResourceApi(_requester);
 
-  RasterCollectionsResourceApi(common_internal.ApiRequester client) : 
+  RasterCollectionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2014,7 +2008,7 @@
    *
    * Completes with a [ProcessResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2025,7 +2019,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -2033,7 +2027,7 @@
     }
 
 
-    _url = 'rasterCollections/' + common_internal.Escaper.ecapeVariable('$id') + '/cancelProcessing';
+    _url = 'rasterCollections/' + commons.Escaper.ecapeVariable('$id') + '/cancelProcessing';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2054,7 +2048,7 @@
    *
    * Completes with a [RasterCollection].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2065,7 +2059,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2095,7 +2089,7 @@
    * included in a layer, the request will fail. Remove the raster collection
    * from all layers prior to deleting.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2106,7 +2100,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -2115,7 +2109,7 @@
 
     _downloadOptions = null;
 
-    _url = 'rasterCollections/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'rasterCollections/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -2136,7 +2130,7 @@
    *
    * Completes with a [RasterCollection].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2147,7 +2141,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -2155,7 +2149,7 @@
     }
 
 
-    _url = 'rasterCollections/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'rasterCollections/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2229,7 +2223,7 @@
    *
    * Completes with a [RasterCollectionsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2240,7 +2234,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (bbox != null) {
@@ -2305,7 +2299,7 @@
    *
    * [id] - The ID of the raster collection.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2316,7 +2310,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2328,7 +2322,7 @@
 
     _downloadOptions = null;
 
-    _url = 'rasterCollections/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'rasterCollections/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -2349,7 +2343,7 @@
    *
    * Completes with a [ProcessResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2360,7 +2354,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -2368,7 +2362,7 @@
     }
 
 
-    _url = 'rasterCollections/' + common_internal.Escaper.ecapeVariable('$id') + '/process';
+    _url = 'rasterCollections/' + commons.Escaper.ecapeVariable('$id') + '/process';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2383,11 +2377,10 @@
 }
 
 
-/** Not documented yet. */
 class RasterCollectionsParentsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  RasterCollectionsParentsResourceApi(common_internal.ApiRequester client) : 
+  RasterCollectionsParentsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2406,7 +2399,7 @@
    *
    * Completes with a [ParentsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2417,7 +2410,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -2431,7 +2424,7 @@
     }
 
 
-    _url = 'rasterCollections/' + common_internal.Escaper.ecapeVariable('$id') + '/parents';
+    _url = 'rasterCollections/' + commons.Escaper.ecapeVariable('$id') + '/parents';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2446,11 +2439,10 @@
 }
 
 
-/** Not documented yet. */
 class RasterCollectionsPermissionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  RasterCollectionsPermissionsResourceApi(common_internal.ApiRequester client) : 
+  RasterCollectionsPermissionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2464,7 +2456,7 @@
    *
    * Completes with a [PermissionsBatchDeleteResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2475,7 +2467,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2486,7 +2478,7 @@
     }
 
 
-    _url = 'rasterCollections/' + common_internal.Escaper.ecapeVariable('$id') + '/permissions/batchDelete';
+    _url = 'rasterCollections/' + commons.Escaper.ecapeVariable('$id') + '/permissions/batchDelete';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2512,7 +2504,7 @@
    *
    * Completes with a [PermissionsBatchUpdateResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2523,7 +2515,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2534,7 +2526,7 @@
     }
 
 
-    _url = 'rasterCollections/' + common_internal.Escaper.ecapeVariable('$id') + '/permissions/batchUpdate';
+    _url = 'rasterCollections/' + commons.Escaper.ecapeVariable('$id') + '/permissions/batchUpdate';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2555,7 +2547,7 @@
    *
    * Completes with a [PermissionsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2566,7 +2558,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -2574,7 +2566,7 @@
     }
 
 
-    _url = 'rasterCollections/' + common_internal.Escaper.ecapeVariable('$id') + '/permissions';
+    _url = 'rasterCollections/' + commons.Escaper.ecapeVariable('$id') + '/permissions';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2589,11 +2581,10 @@
 }
 
 
-/** Not documented yet. */
 class RasterCollectionsRastersResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  RasterCollectionsRastersResourceApi(common_internal.ApiRequester client) : 
+  RasterCollectionsRastersResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2610,7 +2601,7 @@
    *
    * Completes with a [RasterCollectionsRastersBatchDeleteResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2621,7 +2612,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2632,7 +2623,7 @@
     }
 
 
-    _url = 'rasterCollections/' + common_internal.Escaper.ecapeVariable('$id') + '/rasters/batchDelete';
+    _url = 'rasterCollections/' + commons.Escaper.ecapeVariable('$id') + '/rasters/batchDelete';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2659,7 +2650,7 @@
    *
    * Completes with a [RasterCollectionsRastersBatchInsertResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2670,7 +2661,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2681,7 +2672,7 @@
     }
 
 
-    _url = 'rasterCollections/' + common_internal.Escaper.ecapeVariable('$id') + '/rasters/batchInsert';
+    _url = 'rasterCollections/' + commons.Escaper.ecapeVariable('$id') + '/rasters/batchInsert';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2744,7 +2735,7 @@
    *
    * Completes with a [RasterCollectionsRastersListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2755,7 +2746,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -2796,7 +2787,7 @@
     }
 
 
-    _url = 'rasterCollections/' + common_internal.Escaper.ecapeVariable('$id') + '/rasters';
+    _url = 'rasterCollections/' + commons.Escaper.ecapeVariable('$id') + '/rasters';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2811,15 +2802,14 @@
 }
 
 
-/** Not documented yet. */
 class RastersResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   RastersFilesResourceApi get files => new RastersFilesResourceApi(_requester);
   RastersParentsResourceApi get parents => new RastersParentsResourceApi(_requester);
   RastersPermissionsResourceApi get permissions => new RastersPermissionsResourceApi(_requester);
 
-  RastersResourceApi(common_internal.ApiRequester client) : 
+  RastersResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2831,7 +2821,7 @@
    * permitted to delete. If the raster is included in a layer or mosaic, the
    * request will fail. Remove it from all parents prior to deleting.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2842,7 +2832,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -2851,7 +2841,7 @@
 
     _downloadOptions = null;
 
-    _url = 'rasters/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'rasters/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -2872,7 +2862,7 @@
    *
    * Completes with a [Raster].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2883,7 +2873,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -2891,7 +2881,7 @@
     }
 
 
-    _url = 'rasters/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'rasters/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2965,7 +2955,7 @@
    *
    * Completes with a [RastersListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2976,7 +2966,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (projectId == null) {
@@ -3042,7 +3032,7 @@
    *
    * [id] - The ID of the raster.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3053,7 +3043,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3065,7 +3055,7 @@
 
     _downloadOptions = null;
 
-    _url = 'rasters/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'rasters/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -3086,7 +3076,7 @@
    *
    * Completes with a [ProcessResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3097,7 +3087,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -3105,7 +3095,7 @@
     }
 
 
-    _url = 'rasters/' + common_internal.Escaper.ecapeVariable('$id') + '/process';
+    _url = 'rasters/' + commons.Escaper.ecapeVariable('$id') + '/process';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -3126,7 +3116,7 @@
    *
    * Completes with a [Raster].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3137,7 +3127,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3160,11 +3150,10 @@
 }
 
 
-/** Not documented yet. */
 class RastersFilesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  RastersFilesResourceApi(common_internal.ApiRequester client) : 
+  RastersFilesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3181,18 +3170,18 @@
    * [uploadOptions] - Options for the media upload. Streaming Media without the
    * length being known ahead of time is only supported via resumable uploads.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future insert(core.String id, core.String filename, {common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future insert(core.String id, core.String filename, {commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -3208,11 +3197,11 @@
     _downloadOptions = null;
 
     if (_uploadMedia == null) {
-      _url = 'rasters/' + common_internal.Escaper.ecapeVariable('$id') + '/files';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/mapsengine/v1/rasters/' + common_internal.Escaper.ecapeVariable('$id') + '/files';
+      _url = 'rasters/' + commons.Escaper.ecapeVariable('$id') + '/files';
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/mapsengine/v1/rasters/' + commons.Escaper.ecapeVariable('$id') + '/files';
     } else {
-      _url = '/upload/mapsengine/v1/rasters/' + common_internal.Escaper.ecapeVariable('$id') + '/files';
+      _url = '/upload/mapsengine/v1/rasters/' + commons.Escaper.ecapeVariable('$id') + '/files';
     }
 
 
@@ -3229,11 +3218,10 @@
 }
 
 
-/** Not documented yet. */
 class RastersParentsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  RastersParentsResourceApi(common_internal.ApiRequester client) : 
+  RastersParentsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3252,7 +3240,7 @@
    *
    * Completes with a [ParentsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3263,7 +3251,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -3277,7 +3265,7 @@
     }
 
 
-    _url = 'rasters/' + common_internal.Escaper.ecapeVariable('$id') + '/parents';
+    _url = 'rasters/' + commons.Escaper.ecapeVariable('$id') + '/parents';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3292,11 +3280,10 @@
 }
 
 
-/** Not documented yet. */
 class RastersPermissionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  RastersPermissionsResourceApi(common_internal.ApiRequester client) : 
+  RastersPermissionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3310,7 +3297,7 @@
    *
    * Completes with a [PermissionsBatchDeleteResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3321,7 +3308,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3332,7 +3319,7 @@
     }
 
 
-    _url = 'rasters/' + common_internal.Escaper.ecapeVariable('$id') + '/permissions/batchDelete';
+    _url = 'rasters/' + commons.Escaper.ecapeVariable('$id') + '/permissions/batchDelete';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -3358,7 +3345,7 @@
    *
    * Completes with a [PermissionsBatchUpdateResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3369,7 +3356,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3380,7 +3367,7 @@
     }
 
 
-    _url = 'rasters/' + common_internal.Escaper.ecapeVariable('$id') + '/permissions/batchUpdate';
+    _url = 'rasters/' + commons.Escaper.ecapeVariable('$id') + '/permissions/batchUpdate';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -3401,7 +3388,7 @@
    *
    * Completes with a [PermissionsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3412,7 +3399,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -3420,7 +3407,7 @@
     }
 
 
-    _url = 'rasters/' + common_internal.Escaper.ecapeVariable('$id') + '/permissions';
+    _url = 'rasters/' + commons.Escaper.ecapeVariable('$id') + '/permissions';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3435,16 +3422,15 @@
 }
 
 
-/** Not documented yet. */
 class TablesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   TablesFeaturesResourceApi get features => new TablesFeaturesResourceApi(_requester);
   TablesFilesResourceApi get files => new TablesFilesResourceApi(_requester);
   TablesParentsResourceApi get parents => new TablesParentsResourceApi(_requester);
   TablesPermissionsResourceApi get permissions => new TablesPermissionsResourceApi(_requester);
 
-  TablesResourceApi(common_internal.ApiRequester client) : 
+  TablesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3456,7 +3442,7 @@
    *
    * Completes with a [Table].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3467,7 +3453,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3496,7 +3482,7 @@
    * permitted to delete. If the table is included in a layer, the request will
    * fail. Remove it from all layers prior to deleting.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3507,7 +3493,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -3516,7 +3502,7 @@
 
     _downloadOptions = null;
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -3542,7 +3528,7 @@
    *
    * Completes with a [Table].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3553,7 +3539,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -3564,7 +3550,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -3638,7 +3624,7 @@
    *
    * Completes with a [TablesListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3649,7 +3635,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (bbox != null) {
@@ -3714,7 +3700,7 @@
    *
    * [id] - The ID of the table.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3725,7 +3711,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3737,7 +3723,7 @@
 
     _downloadOptions = null;
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -3758,7 +3744,7 @@
    *
    * Completes with a [ProcessResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3769,7 +3755,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -3777,7 +3763,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$id') + '/process';
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$id') + '/process';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -3803,7 +3789,7 @@
    *
    * Completes with a [Table].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3814,7 +3800,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3837,11 +3823,10 @@
 }
 
 
-/** Not documented yet. */
 class TablesFeaturesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  TablesFeaturesResourceApi(common_internal.ApiRequester client) : 
+  TablesFeaturesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3853,7 +3838,7 @@
    *
    * [id] - The ID of the table that contains the features to be deleted.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3864,7 +3849,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3876,7 +3861,7 @@
 
     _downloadOptions = null;
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$id') + '/features/batchDelete';
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$id') + '/features/batchDelete';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -3908,7 +3893,7 @@
    *
    * [id] - The ID of the table to append the features to.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3919,7 +3904,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3931,7 +3916,7 @@
 
     _downloadOptions = null;
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$id') + '/features/batchInsert';
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$id') + '/features/batchInsert';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -3971,7 +3956,7 @@
    *
    * [id] - The ID of the table containing the features to be patched.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3982,7 +3967,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3994,7 +3979,7 @@
 
     _downloadOptions = null;
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$id') + '/features/batchPatch';
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$id') + '/features/batchPatch';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -4026,7 +4011,7 @@
    *
    * Completes with a [Feature].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4037,7 +4022,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tableId == null) {
@@ -4054,7 +4039,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$tableId') + '/features/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$tableId') + '/features/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -4105,7 +4090,7 @@
    *
    * Completes with a [FeaturesListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4116,7 +4101,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -4151,7 +4136,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$id') + '/features';
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$id') + '/features';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -4166,11 +4151,10 @@
 }
 
 
-/** Not documented yet. */
 class TablesFilesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  TablesFilesResourceApi(common_internal.ApiRequester client) : 
+  TablesFilesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -4190,18 +4174,18 @@
    * [uploadOptions] - Options for the media upload. Streaming Media without the
    * length being known ahead of time is only supported via resumable uploads.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future insert(core.String id, core.String filename, {common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future insert(core.String id, core.String filename, {commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -4217,11 +4201,11 @@
     _downloadOptions = null;
 
     if (_uploadMedia == null) {
-      _url = 'tables/' + common_internal.Escaper.ecapeVariable('$id') + '/files';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/mapsengine/v1/tables/' + common_internal.Escaper.ecapeVariable('$id') + '/files';
+      _url = 'tables/' + commons.Escaper.ecapeVariable('$id') + '/files';
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/mapsengine/v1/tables/' + commons.Escaper.ecapeVariable('$id') + '/files';
     } else {
-      _url = '/upload/mapsengine/v1/tables/' + common_internal.Escaper.ecapeVariable('$id') + '/files';
+      _url = '/upload/mapsengine/v1/tables/' + commons.Escaper.ecapeVariable('$id') + '/files';
     }
 
 
@@ -4238,11 +4222,10 @@
 }
 
 
-/** Not documented yet. */
 class TablesParentsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  TablesParentsResourceApi(common_internal.ApiRequester client) : 
+  TablesParentsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -4261,7 +4244,7 @@
    *
    * Completes with a [ParentsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4272,7 +4255,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -4286,7 +4269,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$id') + '/parents';
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$id') + '/parents';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -4301,11 +4284,10 @@
 }
 
 
-/** Not documented yet. */
 class TablesPermissionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  TablesPermissionsResourceApi(common_internal.ApiRequester client) : 
+  TablesPermissionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -4319,7 +4301,7 @@
    *
    * Completes with a [PermissionsBatchDeleteResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4330,7 +4312,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -4341,7 +4323,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$id') + '/permissions/batchDelete';
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$id') + '/permissions/batchDelete';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -4367,7 +4349,7 @@
    *
    * Completes with a [PermissionsBatchUpdateResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4378,7 +4360,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -4389,7 +4371,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$id') + '/permissions/batchUpdate';
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$id') + '/permissions/batchUpdate';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -4410,7 +4392,7 @@
    *
    * Completes with a [PermissionsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4421,7 +4403,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -4429,7 +4411,7 @@
     }
 
 
-    _url = 'tables/' + common_internal.Escaper.ecapeVariable('$id') + '/permissions';
+    _url = 'tables/' + commons.Escaper.ecapeVariable('$id') + '/permissions';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -4797,7 +4779,6 @@
 }
 
 
-/** Not documented yet. */
 class Datasource {
   /** The ID of a datasource. */
   core.String id;
@@ -4821,7 +4802,6 @@
 }
 
 
-/** Not documented yet. */
 class Datasources
     extends collection.ListBase<Datasource> {
   final core.List<Datasource> _inner;
@@ -4995,10 +4975,8 @@
 
 /** The request sent to features.BatchDelete. */
 class FeaturesBatchDeleteRequest {
-  /** Not documented yet. */
   core.List<core.String> gxIds;
 
-  /** Not documented yet. */
   core.List<core.String> primaryKeys;
 
 
@@ -5028,7 +5006,6 @@
 
 /** The request sent to features.Insert. */
 class FeaturesBatchInsertRequest {
-  /** Not documented yet. */
   core.List<Feature> features;
 
   /**
@@ -5067,7 +5044,6 @@
 
 /** The request sent to features.BatchPatch. */
 class FeaturesBatchPatchRequest {
-  /** Not documented yet. */
   core.List<Feature> features;
 
   /**
@@ -5121,7 +5097,6 @@
   /** The feature schema. */
   Schema schema;
 
-  /** Not documented yet. */
   core.String type;
 
 
@@ -5275,7 +5250,6 @@
 }
 
 
-/** Not documented yet. */
 abstract class GeoJsonGeometry {
   GeoJsonGeometry();
   factory GeoJsonGeometry.fromJson(core.Map json) {
@@ -5346,7 +5320,6 @@
 }
 
 
-/** Not documented yet. */
 class GeoJsonLineString  extends GeoJsonGeometry {
   /** An array of two or more positions, representing a line. */
   core.List<GeoJsonPosition> coordinates;
@@ -5414,7 +5387,6 @@
 }
 
 
-/** Not documented yet. */
 class GeoJsonMultiPoint  extends GeoJsonGeometry {
   /** An array of at least two GeoJsonPoint coordinate arrays. */
   core.List<GeoJsonPosition> coordinates;
@@ -5448,7 +5420,6 @@
 }
 
 
-/** Not documented yet. */
 class GeoJsonMultiPolygon  extends GeoJsonGeometry {
   /** An array of at least two GeoJsonPolygon coordinate arrays. */
   core.List<core.List<core.List<GeoJsonPosition>>> coordinates;
@@ -5482,7 +5453,6 @@
 }
 
 
-/** Not documented yet. */
 class GeoJsonPoint  extends GeoJsonGeometry {
   /** A single GeoJsonPosition, specifying the location of the point. */
   GeoJsonPosition coordinates;
@@ -5516,7 +5486,6 @@
 }
 
 
-/** Not documented yet. */
 class GeoJsonPolygon  extends GeoJsonGeometry {
   /**
    * An array of LinearRings. A LinearRing is a GeoJsonLineString which is
@@ -6550,7 +6519,6 @@
 }
 
 
-/** Not documented yet. */
 class MapContents
     extends collection.ListBase<MapItem> {
   final core.List<MapItem> _inner;
@@ -6578,9 +6546,7 @@
 }
 
 
-/** Not documented yet. */
 class MapFolder  extends MapItem {
-  /** Not documented yet. */
   core.List<MapItem> contents;
 
   /**
@@ -6667,7 +6633,6 @@
 }
 
 
-/** Not documented yet. */
 abstract class MapItem {
   MapItem();
   factory MapItem.fromJson(core.Map json) {
@@ -6689,7 +6654,6 @@
 }
 
 
-/** Not documented yet. */
 class MapKmlLink  extends MapItem {
   /**
    * An array of four numbers (west, south, east, north) which defines the
@@ -6757,7 +6721,6 @@
 }
 
 
-/** Not documented yet. */
 class MapLayer  extends MapItem {
   /**
    * An array of four numbers (west, south, east, north) which defines the
@@ -7092,7 +7055,6 @@
 }
 
 
-/** Not documented yet. */
 class PermissionsListResponse {
   /** The set of permissions associated with this asset. */
   core.List<Permission> permissions;
@@ -8680,7 +8642,6 @@
 }
 
 
-/** Not documented yet. */
 class TableColumn {
   /** The column name. */
   core.String name;
@@ -8770,7 +8731,6 @@
 }
 
 
-/** Not documented yet. */
 class Tags
     extends collection.ListBase<core.String> {
   final core.List<core.String> _inner;
@@ -8836,7 +8796,6 @@
 
 /** A vector style contains styling information for vector layer. */
 class VectorStyle {
-  /** Not documented yet. */
   core.List<DisplayRule> displayRules;
 
   /**
@@ -8916,5 +8875,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/mirror/v1.dart b/generated/googleapis/lib/mirror/v1.dart
index 0f8789c..8aa438f 100644
--- a/generated/googleapis/lib/mirror/v1.dart
+++ b/generated/googleapis/lib/mirror/v1.dart
@@ -1,17 +1,22 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.mirror.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection_1;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection_1;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError, Media, UploadOptions,
+    ResumableUploadOptions, DownloadOptions, PartialDownloadOptions,
+    ByteRange;
+
+const core.String USER_AGENT = 'dart-api-client mirror/v1';
 
 /** API for interacting with Glass users via the timeline. */
 class MirrorApi {
@@ -22,7 +27,7 @@
   static const GlassTimelineScope = "https://www.googleapis.com/auth/glass.timeline";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AccountsResourceApi get accounts => new AccountsResourceApi(_requester);
   ContactsResourceApi get contacts => new ContactsResourceApi(_requester);
@@ -32,15 +37,14 @@
   TimelineResourceApi get timeline => new TimelineResourceApi(_requester);
 
   MirrorApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "mirror/v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class AccountsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsResourceApi(common_internal.ApiRequester client) : 
+  AccountsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -59,7 +63,7 @@
    *
    * Completes with a [Account].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -70,7 +74,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -87,7 +91,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$userToken') + '/' + common_internal.Escaper.ecapeVariable('$accountType') + '/' + common_internal.Escaper.ecapeVariable('$accountName');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$userToken') + '/' + commons.Escaper.ecapeVariable('$accountType') + '/' + commons.Escaper.ecapeVariable('$accountName');
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -102,11 +106,10 @@
 }
 
 
-/** Not documented yet. */
 class ContactsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ContactsResourceApi(common_internal.ApiRequester client) : 
+  ContactsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -116,7 +119,7 @@
    *
    * [id] - The ID of the contact.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -127,7 +130,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -136,7 +139,7 @@
 
     _downloadOptions = null;
 
-    _url = 'contacts/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'contacts/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -157,7 +160,7 @@
    *
    * Completes with a [Contact].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -168,7 +171,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -176,7 +179,7 @@
     }
 
 
-    _url = 'contacts/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'contacts/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -197,7 +200,7 @@
    *
    * Completes with a [Contact].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -208,7 +211,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -235,7 +238,7 @@
    *
    * Completes with a [ContactsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -246,7 +249,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -274,7 +277,7 @@
    *
    * Completes with a [Contact].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -285,7 +288,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -296,7 +299,7 @@
     }
 
 
-    _url = 'contacts/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'contacts/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -319,7 +322,7 @@
    *
    * Completes with a [Contact].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -330,7 +333,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -341,7 +344,7 @@
     }
 
 
-    _url = 'contacts/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'contacts/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -356,11 +359,10 @@
 }
 
 
-/** Not documented yet. */
 class LocationsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  LocationsResourceApi(common_internal.ApiRequester client) : 
+  LocationsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -372,7 +374,7 @@
    *
    * Completes with a [Location].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -383,7 +385,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -391,7 +393,7 @@
     }
 
 
-    _url = 'locations/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'locations/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -410,7 +412,7 @@
    *
    * Completes with a [LocationsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -421,7 +423,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -441,11 +443,10 @@
 }
 
 
-/** Not documented yet. */
 class SettingsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  SettingsResourceApi(common_internal.ApiRequester client) : 
+  SettingsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -461,7 +462,7 @@
    *
    * Completes with a [Setting].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -472,7 +473,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -480,7 +481,7 @@
     }
 
 
-    _url = 'settings/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'settings/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -495,11 +496,10 @@
 }
 
 
-/** Not documented yet. */
 class SubscriptionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  SubscriptionsResourceApi(common_internal.ApiRequester client) : 
+  SubscriptionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -509,7 +509,7 @@
    *
    * [id] - The ID of the subscription.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -520,7 +520,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -529,7 +529,7 @@
 
     _downloadOptions = null;
 
-    _url = 'subscriptions/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'subscriptions/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -550,7 +550,7 @@
    *
    * Completes with a [Subscription].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -561,7 +561,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -588,7 +588,7 @@
    *
    * Completes with a [SubscriptionsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -599,7 +599,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -627,7 +627,7 @@
    *
    * Completes with a [Subscription].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -638,7 +638,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -649,7 +649,7 @@
     }
 
 
-    _url = 'subscriptions/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'subscriptions/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -664,13 +664,12 @@
 }
 
 
-/** Not documented yet. */
 class TimelineResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   TimelineAttachmentsResourceApi get attachments => new TimelineAttachmentsResourceApi(_requester);
 
-  TimelineResourceApi(common_internal.ApiRequester client) : 
+  TimelineResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -680,7 +679,7 @@
    *
    * [id] - The ID of the timeline item.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -691,7 +690,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -700,7 +699,7 @@
 
     _downloadOptions = null;
 
-    _url = 'timeline/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'timeline/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -721,7 +720,7 @@
    *
    * Completes with a [TimelineItem].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -732,7 +731,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -740,7 +739,7 @@
     }
 
 
-    _url = 'timeline/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'timeline/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -766,18 +765,18 @@
    *
    * Completes with a [TimelineItem].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<TimelineItem> insert(TimelineItem request, {common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<TimelineItem> insert(TimelineItem request, {commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -789,7 +788,7 @@
 
     if (_uploadMedia == null) {
       _url = 'timeline';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
       _url = '/resumable/upload/mirror/v1/timeline';
     } else {
       _url = '/upload/mirror/v1/timeline';
@@ -836,7 +835,7 @@
    *
    * Completes with a [TimelineListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -847,7 +846,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (bundleId != null) {
@@ -896,7 +895,7 @@
    *
    * Completes with a [TimelineItem].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -907,7 +906,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -918,7 +917,7 @@
     }
 
 
-    _url = 'timeline/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'timeline/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -946,18 +945,18 @@
    *
    * Completes with a [TimelineItem].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<TimelineItem> update(TimelineItem request, core.String id, {common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<TimelineItem> update(TimelineItem request, core.String id, {commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -971,11 +970,11 @@
     _uploadOptions =  uploadOptions;
 
     if (_uploadMedia == null) {
-      _url = 'timeline/' + common_internal.Escaper.ecapeVariable('$id');
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/mirror/v1/timeline/' + common_internal.Escaper.ecapeVariable('$id');
+      _url = 'timeline/' + commons.Escaper.ecapeVariable('$id');
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/mirror/v1/timeline/' + commons.Escaper.ecapeVariable('$id');
     } else {
-      _url = '/upload/mirror/v1/timeline/' + common_internal.Escaper.ecapeVariable('$id');
+      _url = '/upload/mirror/v1/timeline/' + commons.Escaper.ecapeVariable('$id');
     }
 
 
@@ -992,11 +991,10 @@
 }
 
 
-/** Not documented yet. */
 class TimelineAttachmentsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  TimelineAttachmentsResourceApi(common_internal.ApiRequester client) : 
+  TimelineAttachmentsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1008,7 +1006,7 @@
    *
    * [attachmentId] - The ID of the attachment.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1019,7 +1017,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (itemId == null) {
@@ -1031,7 +1029,7 @@
 
     _downloadOptions = null;
 
-    _url = 'timeline/' + common_internal.Escaper.ecapeVariable('$itemId') + '/attachments/' + common_internal.Escaper.ecapeVariable('$attachmentId');
+    _url = 'timeline/' + commons.Escaper.ecapeVariable('$itemId') + '/attachments/' + commons.Escaper.ecapeVariable('$attachmentId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1060,20 +1058,20 @@
    *
    * - [Attachment] for Metadata downloads (see [downloadOptions]).
    *
-   * - [common.Media] for Media downloads (see [downloadOptions]).
+   * - [commons.Media] for Media downloads (see [downloadOptions]).
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future get(core.String itemId, core.String attachmentId, {common.DownloadOptions downloadOptions: common.DownloadOptions.Metadata}) {
+  async.Future get(core.String itemId, core.String attachmentId, {commons.DownloadOptions downloadOptions: commons.DownloadOptions.Metadata}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (itemId == null) {
@@ -1085,7 +1083,7 @@
 
     _downloadOptions = downloadOptions;
 
-    _url = 'timeline/' + common_internal.Escaper.ecapeVariable('$itemId') + '/attachments/' + common_internal.Escaper.ecapeVariable('$attachmentId');
+    _url = 'timeline/' + commons.Escaper.ecapeVariable('$itemId') + '/attachments/' + commons.Escaper.ecapeVariable('$attachmentId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1095,7 +1093,7 @@
                                        uploadMedia: _uploadMedia,
                                        downloadOptions: _downloadOptions);
     if (_downloadOptions == null ||
-        _downloadOptions == common.DownloadOptions.Metadata) {
+        _downloadOptions == commons.DownloadOptions.Metadata) {
       return _response.then((data) => new Attachment.fromJson(data));
     } else {
       return _response;
@@ -1116,18 +1114,18 @@
    *
    * Completes with a [Attachment].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<Attachment> insert(core.String itemId, {common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<Attachment> insert(core.String itemId, {commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (itemId == null) {
@@ -1138,11 +1136,11 @@
     _uploadOptions =  uploadOptions;
 
     if (_uploadMedia == null) {
-      _url = 'timeline/' + common_internal.Escaper.ecapeVariable('$itemId') + '/attachments';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/mirror/v1/timeline/' + common_internal.Escaper.ecapeVariable('$itemId') + '/attachments';
+      _url = 'timeline/' + commons.Escaper.ecapeVariable('$itemId') + '/attachments';
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/mirror/v1/timeline/' + commons.Escaper.ecapeVariable('$itemId') + '/attachments';
     } else {
-      _url = '/upload/mirror/v1/timeline/' + common_internal.Escaper.ecapeVariable('$itemId') + '/attachments';
+      _url = '/upload/mirror/v1/timeline/' + commons.Escaper.ecapeVariable('$itemId') + '/attachments';
     }
 
 
@@ -1165,7 +1163,7 @@
    *
    * Completes with a [AttachmentsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1176,7 +1174,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (itemId == null) {
@@ -1184,7 +1182,7 @@
     }
 
 
-    _url = 'timeline/' + common_internal.Escaper.ecapeVariable('$itemId') + '/attachments';
+    _url = 'timeline/' + commons.Escaper.ecapeVariable('$itemId') + '/attachments';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1202,16 +1200,12 @@
 
 /** Represents an account passed into the Account Manager on Glass. */
 class Account {
-  /** Not documented yet. */
   core.List<AuthToken> authTokens;
 
-  /** Not documented yet. */
   core.List<core.String> features;
 
-  /** Not documented yet. */
   core.String password;
 
-  /** Not documented yet. */
   core.List<UserData> userData;
 
 
@@ -1345,12 +1339,9 @@
 }
 
 
-/** Not documented yet. */
 class AuthToken {
-  /** Not documented yet. */
   core.String authToken;
 
-  /** Not documented yet. */
   core.String type;
 
 
@@ -2696,12 +2687,9 @@
 }
 
 
-/** Not documented yet. */
 class UserData {
-  /** Not documented yet. */
   core.String key;
 
-  /** Not documented yet. */
   core.String value;
 
 
@@ -2727,5 +2715,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/oauth2/v2.dart b/generated/googleapis/lib/oauth2/v2.dart
index eae587a..1acabb2 100644
--- a/generated/googleapis/lib/oauth2/v2.dart
+++ b/generated/googleapis/lib/oauth2/v2.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.oauth2.v2;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client oauth2/v2';
 
 /** Lets you access OAuth2 protocol related APIs. */
 class Oauth2Api {
@@ -28,21 +31,19 @@
   static const UserinfoProfileScope = "https://www.googleapis.com/auth/userinfo.profile";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   UserinfoResourceApi get userinfo => new UserinfoResourceApi(_requester);
 
   Oauth2Api(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: ""}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 
   /**
-   * Not documented yet.
-   *
    * Request parameters:
    *
    * Completes with a [Jwk].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -53,7 +54,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -71,28 +72,28 @@
   }
 
   /**
-   * Not documented yet.
-   *
    * Request parameters:
    *
    * [accessToken] - null
    *
    * [idToken] - null
    *
+   * [tokenHandle] - null
+   *
    * Completes with a [Tokeninfo].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<Tokeninfo> tokeninfo({core.String accessToken, core.String idToken}) {
+  async.Future<Tokeninfo> tokeninfo({core.String accessToken, core.String idToken, core.String tokenHandle}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accessToken != null) {
@@ -101,6 +102,9 @@
     if (idToken != null) {
       _queryParams["id_token"] = [idToken];
     }
+    if (tokenHandle != null) {
+      _queryParams["token_handle"] = [tokenHandle];
+    }
 
 
     _url = 'oauth2/v2/tokeninfo';
@@ -118,23 +122,20 @@
 }
 
 
-/** Not documented yet. */
 class UserinfoResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   UserinfoV2ResourceApi get v2 => new UserinfoV2ResourceApi(_requester);
 
-  UserinfoResourceApi(common_internal.ApiRequester client) : 
+  UserinfoResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
-   * Not documented yet.
-   *
    * Request parameters:
    *
    * Completes with a [Userinfoplus].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -145,7 +146,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -165,32 +166,28 @@
 }
 
 
-/** Not documented yet. */
 class UserinfoV2ResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   UserinfoV2MeResourceApi get me => new UserinfoV2MeResourceApi(_requester);
 
-  UserinfoV2ResourceApi(common_internal.ApiRequester client) : 
+  UserinfoV2ResourceApi(commons.ApiRequester client) : 
       _requester = client;
 }
 
 
-/** Not documented yet. */
 class UserinfoV2MeResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  UserinfoV2MeResourceApi(common_internal.ApiRequester client) : 
+  UserinfoV2MeResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
-   * Not documented yet.
-   *
    * Request parameters:
    *
    * Completes with a [Userinfoplus].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -201,7 +198,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -222,24 +219,17 @@
 
 
 
-/** Not documented yet. */
 class JwkKeys {
-  /** Not documented yet. */
   core.String alg;
 
-  /** Not documented yet. */
   core.String e;
 
-  /** Not documented yet. */
   core.String kid;
 
-  /** Not documented yet. */
   core.String kty;
 
-  /** Not documented yet. */
   core.String n;
 
-  /** Not documented yet. */
   core.String use;
 
 
@@ -291,9 +281,7 @@
 }
 
 
-/** Not documented yet. */
 class Jwk {
-  /** Not documented yet. */
   core.List<JwkKeys> keys;
 
 
@@ -315,7 +303,6 @@
 }
 
 
-/** Not documented yet. */
 class Tokeninfo {
   /** The access type granted with this token. It can be offline or online. */
   core.String accessType;
@@ -341,7 +328,10 @@
   /** The space separated list of scopes granted to this token. */
   core.String scope;
 
-  /** The Gaia obfuscated user id. */
+  /** The token handle associated with this token. */
+  core.String tokenHandle;
+
+  /** The obfuscated user id. */
   core.String userId;
 
   /**
@@ -372,6 +362,9 @@
     if (_json.containsKey("scope")) {
       scope = _json["scope"];
     }
+    if (_json.containsKey("token_handle")) {
+      tokenHandle = _json["token_handle"];
+    }
     if (_json.containsKey("user_id")) {
       userId = _json["user_id"];
     }
@@ -400,6 +393,9 @@
     if (scope != null) {
       _json["scope"] = scope;
     }
+    if (tokenHandle != null) {
+      _json["token_handle"] = tokenHandle;
+    }
     if (userId != null) {
       _json["user_id"] = userId;
     }
@@ -411,7 +407,6 @@
 }
 
 
-/** Not documented yet. */
 class Userinfoplus {
   /** The user's email address. */
   core.String email;
@@ -428,7 +423,7 @@
   /** The hosted domain e.g. example.com if the user is Google apps user. */
   core.String hd;
 
-  /** The focus obfuscated gaia id of the user. */
+  /** The obfuscated ID of the user. */
   core.String id;
 
   /** URL of the profile page. */
@@ -526,5 +521,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/pagespeedonline/v1.dart b/generated/googleapis/lib/pagespeedonline/v1.dart
index 42b25ed..80e8067 100644
--- a/generated/googleapis/lib/pagespeedonline/v1.dart
+++ b/generated/googleapis/lib/pagespeedonline/v1.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.pagespeedonline.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client pagespeedonline/v1';
 
 /**
  * Lets you analyze the performance of a web page and get tailored suggestions
@@ -19,25 +22,24 @@
  */
 class PagespeedonlineApi {
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   PagespeedapiResourceApi get pagespeedapi => new PagespeedapiResourceApi(_requester);
 
   PagespeedonlineApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "pagespeedonline/v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class PagespeedapiResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PagespeedapiResourceApi(common_internal.ApiRequester client) : 
+  PagespeedapiResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
-   * Runs Page Speed analysis on the page at the specified URL, and returns a
-   * Page Speed score, a list of suggestions to make that page faster, and other
+   * Runs PageSpeed analysis on the page at the specified URL, and returns a
+   * PageSpeed score, a list of suggestions to make that page faster, and other
    * information.
    *
    * Request parameters:
@@ -51,7 +53,7 @@
    * [locale] - The locale used to localize formatted results
    * Value must have pattern "[a-zA-Z]+(_[a-zA-Z]+)?".
    *
-   * [rule] - A Page Speed rule to run; if none are given, all rules are run
+   * [rule] - A PageSpeed rule to run; if none are given, all rules are run
    * Value must have pattern "[a-zA-Z]+".
    *
    * [screenshot] - Indicates if binary data containing a screenshot should be
@@ -64,7 +66,7 @@
    *
    * Completes with a [Result].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -75,7 +77,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (url == null) {
@@ -115,7 +117,6 @@
 
 
 
-/** Not documented yet. */
 class ResultFormattedResultsRuleResultsValueUrlBlocksHeaderArgs {
   /**
    * Type of argument. One of URL, STRING_LITERAL, INT_LITERAL, BYTES, or
@@ -188,7 +189,6 @@
 }
 
 
-/** Not documented yet. */
 class ResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetailsArgs {
   /**
    * Type of argument. One of URL, STRING_LITERAL, INT_LITERAL, BYTES, or
@@ -224,7 +224,6 @@
 }
 
 
-/** Not documented yet. */
 class ResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails {
   /** List of arguments for the format string. */
   core.List<ResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetailsArgs> args;
@@ -261,7 +260,6 @@
 }
 
 
-/** Not documented yet. */
 class ResultFormattedResultsRuleResultsValueUrlBlocksUrlsResultArgs {
   /**
    * Type of argument. One of URL, STRING_LITERAL, INT_LITERAL, BYTES, or
@@ -336,7 +334,6 @@
 }
 
 
-/** Not documented yet. */
 class ResultFormattedResultsRuleResultsValueUrlBlocksUrls {
   /**
    * List of entries that provide additional details about a single URL.
@@ -375,7 +372,6 @@
 }
 
 
-/** Not documented yet. */
 class ResultFormattedResultsRuleResultsValueUrlBlocks {
   /** Heading to be displayed with the list of URLs. */
   ResultFormattedResultsRuleResultsValueUrlBlocksHeader header;
@@ -468,15 +464,15 @@
 
 
 /**
- * Localized Page Speed results. Contains a ruleResults entry for each Page
- * Speed rule instantiated and run by the server.
+ * Localized PageSpeed results. Contains a ruleResults entry for each PageSpeed
+ * rule instantiated and run by the server.
  */
 class ResultFormattedResults {
   /** The locale of the formattedResults, e.g. "en_US". */
   core.String locale;
 
   /**
-   * Dictionary of formatted rule results, with one entry for each Page Speed
+   * Dictionary of formatted rule results, with one entry for each PageSpeed
    * rule instantiated and run by the server.
    */
   core.Map<core.String, ResultFormattedResultsRuleResultsValue> ruleResults;
@@ -489,7 +485,7 @@
       locale = _json["locale"];
     }
     if (_json.containsKey("ruleResults")) {
-      ruleResults = common_internal.mapMap(_json["ruleResults"], (item) => new ResultFormattedResultsRuleResultsValue.fromJson(item));
+      ruleResults = commons.mapMap(_json["ruleResults"], (item) => new ResultFormattedResultsRuleResultsValue.fromJson(item));
     }
   }
 
@@ -499,7 +495,7 @@
       _json["locale"] = locale;
     }
     if (ruleResults != null) {
-      _json["ruleResults"] = common_internal.mapMap(ruleResults, (item) => (item).toJson());
+      _json["ruleResults"] = commons.mapMap(ruleResults, (item) => (item).toJson());
     }
     return _json;
   }
@@ -647,7 +643,7 @@
 }
 
 
-/** Base64 encoded screenshot of the page that was analyzed. */
+/** Base64-encoded screenshot of the page that was analyzed. */
 class ResultScreenshot {
   /** Image data base64 encoded. */
   core.String data;
@@ -706,18 +702,12 @@
 }
 
 
-/** The version of the Page Speed SDK used to generate these results. */
+/** The version of PageSpeed used to generate these results. */
 class ResultVersion {
-  /**
-   * The major version number of the Page Speed SDK used to generate these
-   * results.
-   */
+  /** The major version number of PageSpeed used to generate these results. */
   core.int major;
 
-  /**
-   * The minor version number of the Page Speed SDK used to generate these
-   * results.
-   */
+  /** The minor version number of PageSpeed used to generate these results. */
   core.int minor;
 
 
@@ -745,11 +735,10 @@
 }
 
 
-/** Not documented yet. */
 class Result {
   /**
-   * Localized Page Speed results. Contains a ruleResults entry for each Page
-   * Speed rule instantiated and run by the server.
+   * Localized PageSpeed results. Contains a ruleResults entry for each
+   * PageSpeed rule instantiated and run by the server.
    */
   ResultFormattedResults formattedResults;
 
@@ -781,19 +770,19 @@
   core.int responseCode;
 
   /**
-   * The Page Speed Score (0-100), which indicates how much faster a page could
+   * The PageSpeed Score (0-100), which indicates how much faster a page could
    * be. A high score indicates little room for improvement, while a lower score
    * indicates more room for improvement.
    */
   core.int score;
 
-  /** Base64 encoded screenshot of the page that was analyzed. */
+  /** Base64-encoded screenshot of the page that was analyzed. */
   ResultScreenshot screenshot;
 
   /** Title of the page, as displayed in the browser's title bar. */
   core.String title;
 
-  /** The version of the Page Speed SDK used to generate these results. */
+  /** The version of PageSpeed used to generate these results. */
   ResultVersion version;
 
 
@@ -867,5 +856,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/pagespeedonline/v2.dart b/generated/googleapis/lib/pagespeedonline/v2.dart
index 7159cad..5813c15 100644
--- a/generated/googleapis/lib/pagespeedonline/v2.dart
+++ b/generated/googleapis/lib/pagespeedonline/v2.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.pagespeedonline.v2;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client pagespeedonline/v2';
 
 /**
  * Lets you analyze the performance of a web page and get tailored suggestions
@@ -19,20 +22,19 @@
  */
 class PagespeedonlineApi {
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   PagespeedapiResourceApi get pagespeedapi => new PagespeedapiResourceApi(_requester);
 
   PagespeedonlineApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "pagespeedonline/v2/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class PagespeedapiResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PagespeedapiResourceApi(common_internal.ApiRequester client) : 
+  PagespeedapiResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -64,7 +66,7 @@
    *
    * Completes with a [Result].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -75,7 +77,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (url == null) {
@@ -115,7 +117,6 @@
 
 
 
-/** Not documented yet. */
 class PagespeedApiFormatStringV2ArgsRects {
   /** The height of the rect. */
   core.int height;
@@ -166,7 +167,6 @@
 }
 
 
-/** Not documented yet. */
 class PagespeedApiFormatStringV2ArgsSecondaryRects {
   /** The height of the rect. */
   core.int height;
@@ -217,7 +217,6 @@
 }
 
 
-/** Not documented yet. */
 class PagespeedApiFormatStringV2Args {
   /** The placeholder key for this arg, as a string. */
   core.String key;
@@ -288,7 +287,6 @@
 }
 
 
-/** Not documented yet. */
 class PagespeedApiFormatStringV2 {
   /** List of arguments for the format string. */
   core.List<PagespeedApiFormatStringV2Args> args;
@@ -380,7 +378,6 @@
 }
 
 
-/** Not documented yet. */
 class PagespeedApiImageV2 {
   /** Image data base64 encoded. */
   core.String data;
@@ -460,7 +457,6 @@
 }
 
 
-/** Not documented yet. */
 class ResultFormattedResultsRuleResultsValueUrlBlocksUrls {
   /**
    * List of entries that provide additional details about a single URL.
@@ -499,7 +495,6 @@
 }
 
 
-/** Not documented yet. */
 class ResultFormattedResultsRuleResultsValueUrlBlocks {
   /** Heading to be displayed with the list of URLs. */
   PagespeedApiFormatStringV2 header;
@@ -638,7 +633,7 @@
       locale = _json["locale"];
     }
     if (_json.containsKey("ruleResults")) {
-      ruleResults = common_internal.mapMap(_json["ruleResults"], (item) => new ResultFormattedResultsRuleResultsValue.fromJson(item));
+      ruleResults = commons.mapMap(_json["ruleResults"], (item) => new ResultFormattedResultsRuleResultsValue.fromJson(item));
     }
   }
 
@@ -648,7 +643,7 @@
       _json["locale"] = locale;
     }
     if (ruleResults != null) {
-      _json["ruleResults"] = common_internal.mapMap(ruleResults, (item) => (item).toJson());
+      _json["ruleResults"] = commons.mapMap(ruleResults, (item) => (item).toJson());
     }
     return _json;
   }
@@ -858,7 +853,6 @@
 }
 
 
-/** Not documented yet. */
 class Result {
   /**
    * Localized PageSpeed results. Contains a ruleResults entry for each
@@ -928,7 +922,7 @@
       responseCode = _json["responseCode"];
     }
     if (_json.containsKey("ruleGroups")) {
-      ruleGroups = common_internal.mapMap(_json["ruleGroups"], (item) => new ResultRuleGroupsValue.fromJson(item));
+      ruleGroups = commons.mapMap(_json["ruleGroups"], (item) => new ResultRuleGroupsValue.fromJson(item));
     }
     if (_json.containsKey("screenshot")) {
       screenshot = new PagespeedApiImageV2.fromJson(_json["screenshot"]);
@@ -962,7 +956,7 @@
       _json["responseCode"] = responseCode;
     }
     if (ruleGroups != null) {
-      _json["ruleGroups"] = common_internal.mapMap(ruleGroups, (item) => (item).toJson());
+      _json["ruleGroups"] = commons.mapMap(ruleGroups, (item) => (item).toJson());
     }
     if (screenshot != null) {
       _json["screenshot"] = (screenshot).toJson();
@@ -976,5 +970,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/plus/v1.dart b/generated/googleapis/lib/plus/v1.dart
index 3aab278..7f573f1 100644
--- a/generated/googleapis/lib/plus/v1.dart
+++ b/generated/googleapis/lib/plus/v1.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.plus.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection_1;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection_1;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client plus/v1';
 
 /**
  * The Google+ API enables developers to build on top of the Google+ platform.
@@ -30,7 +33,7 @@
   static const UserinfoProfileScope = "https://www.googleapis.com/auth/userinfo.profile";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   ActivitiesResourceApi get activities => new ActivitiesResourceApi(_requester);
   CommentsResourceApi get comments => new CommentsResourceApi(_requester);
@@ -38,15 +41,14 @@
   PeopleResourceApi get people => new PeopleResourceApi(_requester);
 
   PlusApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "plus/v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class ActivitiesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ActivitiesResourceApi(common_internal.ApiRequester client) : 
+  ActivitiesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -58,7 +60,7 @@
    *
    * Completes with a [Activity].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -69,7 +71,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (activityId == null) {
@@ -77,7 +79,7 @@
     }
 
 
-    _url = 'activities/' + common_internal.Escaper.ecapeVariable('$activityId');
+    _url = 'activities/' + commons.Escaper.ecapeVariable('$activityId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -113,7 +115,7 @@
    *
    * Completes with a [ActivityFeed].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -124,7 +126,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -141,7 +143,7 @@
     }
 
 
-    _url = 'people/' + common_internal.Escaper.ecapeVariable('$userId') + '/activities/' + common_internal.Escaper.ecapeVariable('$collection');
+    _url = 'people/' + commons.Escaper.ecapeVariable('$userId') + '/activities/' + commons.Escaper.ecapeVariable('$collection');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -180,7 +182,7 @@
    *
    * Completes with a [ActivityFeed].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -191,7 +193,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (query == null) {
@@ -227,11 +229,10 @@
 }
 
 
-/** Not documented yet. */
 class CommentsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  CommentsResourceApi(common_internal.ApiRequester client) : 
+  CommentsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -243,7 +244,7 @@
    *
    * Completes with a [Comment].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -254,7 +255,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (commentId == null) {
@@ -262,7 +263,7 @@
     }
 
 
-    _url = 'comments/' + common_internal.Escaper.ecapeVariable('$commentId');
+    _url = 'comments/' + commons.Escaper.ecapeVariable('$commentId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -297,7 +298,7 @@
    *
    * Completes with a [CommentFeed].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -308,7 +309,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (activityId == null) {
@@ -325,7 +326,7 @@
     }
 
 
-    _url = 'activities/' + common_internal.Escaper.ecapeVariable('$activityId') + '/comments';
+    _url = 'activities/' + commons.Escaper.ecapeVariable('$activityId') + '/comments';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -340,11 +341,10 @@
 }
 
 
-/** Not documented yet. */
 class MomentsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  MomentsResourceApi(common_internal.ApiRequester client) : 
+  MomentsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -366,7 +366,7 @@
    *
    * Completes with a [Moment].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -377,7 +377,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -394,7 +394,7 @@
     }
 
 
-    _url = 'people/' + common_internal.Escaper.ecapeVariable('$userId') + '/moments/' + common_internal.Escaper.ecapeVariable('$collection');
+    _url = 'people/' + commons.Escaper.ecapeVariable('$userId') + '/moments/' + commons.Escaper.ecapeVariable('$collection');
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -434,7 +434,7 @@
    *
    * Completes with a [MomentsFeed].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -445,7 +445,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -468,7 +468,7 @@
     }
 
 
-    _url = 'people/' + common_internal.Escaper.ecapeVariable('$userId') + '/moments/' + common_internal.Escaper.ecapeVariable('$collection');
+    _url = 'people/' + commons.Escaper.ecapeVariable('$userId') + '/moments/' + commons.Escaper.ecapeVariable('$collection');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -487,7 +487,7 @@
    *
    * [id] - The ID of the moment to delete.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -498,7 +498,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -507,7 +507,7 @@
 
     _downloadOptions = null;
 
-    _url = 'moments/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'moments/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -522,11 +522,10 @@
 }
 
 
-/** Not documented yet. */
 class PeopleResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PeopleResourceApi(common_internal.ApiRequester client) : 
+  PeopleResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -541,7 +540,7 @@
    *
    * Completes with a [Person].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -552,7 +551,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -560,7 +559,7 @@
     }
 
 
-    _url = 'people/' + common_internal.Escaper.ecapeVariable('$userId');
+    _url = 'people/' + commons.Escaper.ecapeVariable('$userId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -604,7 +603,7 @@
    *
    * Completes with a [PeopleFeed].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -615,7 +614,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -635,7 +634,7 @@
     }
 
 
-    _url = 'people/' + common_internal.Escaper.ecapeVariable('$userId') + '/people/' + common_internal.Escaper.ecapeVariable('$collection');
+    _url = 'people/' + commons.Escaper.ecapeVariable('$userId') + '/people/' + commons.Escaper.ecapeVariable('$collection');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -671,7 +670,7 @@
    *
    * Completes with a [PeopleFeed].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -682,7 +681,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (activityId == null) {
@@ -699,7 +698,7 @@
     }
 
 
-    _url = 'activities/' + common_internal.Escaper.ecapeVariable('$activityId') + '/people/' + common_internal.Escaper.ecapeVariable('$collection');
+    _url = 'activities/' + commons.Escaper.ecapeVariable('$activityId') + '/people/' + commons.Escaper.ecapeVariable('$collection');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -734,7 +733,7 @@
    *
    * Completes with a [PeopleFeed].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -745,7 +744,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (query == null) {
@@ -779,7 +778,6 @@
 
 
 
-/** Not documented yet. */
 class Acl {
   /** Description of the access granted, suitable for display. */
   core.String description;
@@ -1209,7 +1207,6 @@
 }
 
 
-/** Not documented yet. */
 class ActivityObjectAttachmentsThumbnails {
   /** Potential name of the thumbnail. */
   core.String description;
@@ -1251,7 +1248,6 @@
 }
 
 
-/** Not documented yet. */
 class ActivityObjectAttachments {
   /**
    * If the attachment is an article, this property contains a snippet of text
@@ -1606,7 +1602,6 @@
 }
 
 
-/** Not documented yet. */
 class Activity {
   /** Identifies who has access to see this activity. */
   Acl access;
@@ -1824,7 +1819,6 @@
 }
 
 
-/** Not documented yet. */
 class ActivityFeed {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -2012,7 +2006,6 @@
 }
 
 
-/** Not documented yet. */
 class CommentInReplyTo {
   /** The ID of the activity. */
   core.String id;
@@ -2118,7 +2111,6 @@
 }
 
 
-/** Not documented yet. */
 class Comment {
   /** The person who posted this comment. */
   CommentActor actor;
@@ -2242,7 +2234,6 @@
 }
 
 
-/** Not documented yet. */
 class CommentFeed {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -2339,7 +2330,6 @@
 }
 
 
-/** Not documented yet. */
 class ItemScope {
   /** The subject matter of the content. */
   ItemScope about;
@@ -2921,7 +2911,6 @@
 }
 
 
-/** Not documented yet. */
 class Moment {
   /** The moment ID. */
   core.String id;
@@ -3012,7 +3001,6 @@
 }
 
 
-/** Not documented yet. */
 class MomentsFeed {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -3108,7 +3096,6 @@
 }
 
 
-/** Not documented yet. */
 class PeopleFeed {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -3375,7 +3362,6 @@
 }
 
 
-/** Not documented yet. */
 class PersonEmails {
   /**
    * The type of address. Possible values include, but are not limited to, the
@@ -3523,7 +3509,6 @@
 }
 
 
-/** Not documented yet. */
 class PersonOrganizations {
   /** The department within the organization. Deprecated. */
   core.String department;
@@ -3629,7 +3614,6 @@
 }
 
 
-/** Not documented yet. */
 class PersonPlacesLived {
   /** If "true", this place of residence is this person's primary residence. */
   core.bool primary;
@@ -3665,7 +3649,6 @@
 }
 
 
-/** Not documented yet. */
 class PersonUrls {
   /** The label of the URL. */
   core.String label;
@@ -3714,7 +3697,6 @@
 }
 
 
-/** Not documented yet. */
 class Person {
   /** A short biography for this person. */
   core.String aboutMe;
@@ -4101,7 +4083,6 @@
 }
 
 
-/** Not documented yet. */
 class Place {
   /** The physical address of the place. */
   PlaceAddress address;
@@ -4161,7 +4142,6 @@
 }
 
 
-/** Not documented yet. */
 class PlusAclentryResource {
   /** A descriptive name for this entry. Suitable for display. */
   core.String displayName;
@@ -4214,5 +4194,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/plusdomains/v1.dart b/generated/googleapis/lib/plusdomains/v1.dart
index d77131b..b641a8d 100644
--- a/generated/googleapis/lib/plusdomains/v1.dart
+++ b/generated/googleapis/lib/plusdomains/v1.dart
@@ -1,17 +1,22 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.plusDomains.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection_1;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection_1;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError, Media, UploadOptions,
+    ResumableUploadOptions, DownloadOptions, PartialDownloadOptions,
+    ByteRange;
+
+const core.String USER_AGENT = 'dart-api-client plusDomains/v1';
 
 /**
  * The Google+ API enables developers to build on top of the Google+ platform.
@@ -52,7 +57,7 @@
   static const UserinfoProfileScope = "https://www.googleapis.com/auth/userinfo.profile";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   ActivitiesResourceApi get activities => new ActivitiesResourceApi(_requester);
   AudiencesResourceApi get audiences => new AudiencesResourceApi(_requester);
@@ -62,15 +67,14 @@
   PeopleResourceApi get people => new PeopleResourceApi(_requester);
 
   PlusDomainsApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "plusDomains/v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class ActivitiesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ActivitiesResourceApi(common_internal.ApiRequester client) : 
+  ActivitiesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -82,7 +86,7 @@
    *
    * Completes with a [Activity].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -93,7 +97,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (activityId == null) {
@@ -101,7 +105,7 @@
     }
 
 
-    _url = 'activities/' + common_internal.Escaper.ecapeVariable('$activityId');
+    _url = 'activities/' + commons.Escaper.ecapeVariable('$activityId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -129,7 +133,7 @@
    *
    * Completes with a [Activity].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -140,7 +144,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -154,7 +158,7 @@
     }
 
 
-    _url = 'people/' + common_internal.Escaper.ecapeVariable('$userId') + '/activities';
+    _url = 'people/' + commons.Escaper.ecapeVariable('$userId') + '/activities';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -191,7 +195,7 @@
    *
    * Completes with a [ActivityFeed].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -202,7 +206,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -219,7 +223,7 @@
     }
 
 
-    _url = 'people/' + common_internal.Escaper.ecapeVariable('$userId') + '/activities/' + common_internal.Escaper.ecapeVariable('$collection');
+    _url = 'people/' + commons.Escaper.ecapeVariable('$userId') + '/activities/' + commons.Escaper.ecapeVariable('$collection');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -234,11 +238,10 @@
 }
 
 
-/** Not documented yet. */
 class AudiencesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AudiencesResourceApi(common_internal.ApiRequester client) : 
+  AudiencesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -260,7 +263,7 @@
    *
    * Completes with a [AudiencesFeed].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -271,7 +274,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -285,7 +288,7 @@
     }
 
 
-    _url = 'people/' + common_internal.Escaper.ecapeVariable('$userId') + '/audiences';
+    _url = 'people/' + commons.Escaper.ecapeVariable('$userId') + '/audiences';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -300,11 +303,10 @@
 }
 
 
-/** Not documented yet. */
 class CirclesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  CirclesResourceApi(common_internal.ApiRequester client) : 
+  CirclesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -323,7 +325,7 @@
    *
    * Completes with a [Circle].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -334,7 +336,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (circleId == null) {
@@ -348,7 +350,7 @@
     }
 
 
-    _url = 'circles/' + common_internal.Escaper.ecapeVariable('$circleId') + '/people';
+    _url = 'circles/' + commons.Escaper.ecapeVariable('$circleId') + '/people';
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -369,7 +371,7 @@
    *
    * Completes with a [Circle].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -380,7 +382,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (circleId == null) {
@@ -388,7 +390,7 @@
     }
 
 
-    _url = 'circles/' + common_internal.Escaper.ecapeVariable('$circleId');
+    _url = 'circles/' + commons.Escaper.ecapeVariable('$circleId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -412,7 +414,7 @@
    *
    * Completes with a [Circle].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -423,7 +425,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -434,7 +436,7 @@
     }
 
 
-    _url = 'people/' + common_internal.Escaper.ecapeVariable('$userId') + '/circles';
+    _url = 'people/' + commons.Escaper.ecapeVariable('$userId') + '/circles';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -465,7 +467,7 @@
    *
    * Completes with a [CircleFeed].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -476,7 +478,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -490,7 +492,7 @@
     }
 
 
-    _url = 'people/' + common_internal.Escaper.ecapeVariable('$userId') + '/circles';
+    _url = 'people/' + commons.Escaper.ecapeVariable('$userId') + '/circles';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -513,7 +515,7 @@
    *
    * Completes with a [Circle].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -524,7 +526,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -535,7 +537,7 @@
     }
 
 
-    _url = 'circles/' + common_internal.Escaper.ecapeVariable('$circleId');
+    _url = 'circles/' + commons.Escaper.ecapeVariable('$circleId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -554,7 +556,7 @@
    *
    * [circleId] - The ID of the circle to delete.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -565,7 +567,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (circleId == null) {
@@ -574,7 +576,7 @@
 
     _downloadOptions = null;
 
-    _url = 'circles/' + common_internal.Escaper.ecapeVariable('$circleId');
+    _url = 'circles/' + commons.Escaper.ecapeVariable('$circleId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -599,7 +601,7 @@
    * [userId] - IDs of the people to remove from the circle. Optional, can be
    * repeated.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -610,7 +612,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (circleId == null) {
@@ -625,7 +627,7 @@
 
     _downloadOptions = null;
 
-    _url = 'circles/' + common_internal.Escaper.ecapeVariable('$circleId') + '/people';
+    _url = 'circles/' + commons.Escaper.ecapeVariable('$circleId') + '/people';
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -648,7 +650,7 @@
    *
    * Completes with a [Circle].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -659,7 +661,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -670,7 +672,7 @@
     }
 
 
-    _url = 'circles/' + common_internal.Escaper.ecapeVariable('$circleId');
+    _url = 'circles/' + commons.Escaper.ecapeVariable('$circleId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -685,11 +687,10 @@
 }
 
 
-/** Not documented yet. */
 class CommentsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  CommentsResourceApi(common_internal.ApiRequester client) : 
+  CommentsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -701,7 +702,7 @@
    *
    * Completes with a [Comment].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -712,7 +713,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (commentId == null) {
@@ -720,7 +721,7 @@
     }
 
 
-    _url = 'comments/' + common_internal.Escaper.ecapeVariable('$commentId');
+    _url = 'comments/' + commons.Escaper.ecapeVariable('$commentId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -743,7 +744,7 @@
    *
    * Completes with a [Comment].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -754,7 +755,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -765,7 +766,7 @@
     }
 
 
-    _url = 'activities/' + common_internal.Escaper.ecapeVariable('$activityId') + '/comments';
+    _url = 'activities/' + commons.Escaper.ecapeVariable('$activityId') + '/comments';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -800,7 +801,7 @@
    *
    * Completes with a [CommentFeed].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -811,7 +812,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (activityId == null) {
@@ -828,7 +829,7 @@
     }
 
 
-    _url = 'activities/' + common_internal.Escaper.ecapeVariable('$activityId') + '/comments';
+    _url = 'activities/' + commons.Escaper.ecapeVariable('$activityId') + '/comments';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -843,11 +844,10 @@
 }
 
 
-/** Not documented yet. */
 class MediaResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  MediaResourceApi(common_internal.ApiRequester client) : 
+  MediaResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -873,18 +873,18 @@
    *
    * Completes with a [Media].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<Media> insert(Media request, core.String userId, core.String collection, {common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<Media> insert(Media request, core.String userId, core.String collection, {commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -901,11 +901,11 @@
     _uploadOptions =  uploadOptions;
 
     if (_uploadMedia == null) {
-      _url = 'people/' + common_internal.Escaper.ecapeVariable('$userId') + '/media/' + common_internal.Escaper.ecapeVariable('$collection');
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/plusDomains/v1/people/' + common_internal.Escaper.ecapeVariable('$userId') + '/media/' + common_internal.Escaper.ecapeVariable('$collection');
+      _url = 'people/' + commons.Escaper.ecapeVariable('$userId') + '/media/' + commons.Escaper.ecapeVariable('$collection');
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/plusDomains/v1/people/' + commons.Escaper.ecapeVariable('$userId') + '/media/' + commons.Escaper.ecapeVariable('$collection');
     } else {
-      _url = '/upload/plusDomains/v1/people/' + common_internal.Escaper.ecapeVariable('$userId') + '/media/' + common_internal.Escaper.ecapeVariable('$collection');
+      _url = '/upload/plusDomains/v1/people/' + commons.Escaper.ecapeVariable('$userId') + '/media/' + commons.Escaper.ecapeVariable('$collection');
     }
 
 
@@ -922,11 +922,10 @@
 }
 
 
-/** Not documented yet. */
 class PeopleResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PeopleResourceApi(common_internal.ApiRequester client) : 
+  PeopleResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -939,7 +938,7 @@
    *
    * Completes with a [Person].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -950,7 +949,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -958,7 +957,7 @@
     }
 
 
-    _url = 'people/' + common_internal.Escaper.ecapeVariable('$userId');
+    _url = 'people/' + commons.Escaper.ecapeVariable('$userId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -999,7 +998,7 @@
    *
    * Completes with a [PeopleFeed].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1010,7 +1009,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (userId == null) {
@@ -1030,7 +1029,7 @@
     }
 
 
-    _url = 'people/' + common_internal.Escaper.ecapeVariable('$userId') + '/people/' + common_internal.Escaper.ecapeVariable('$collection');
+    _url = 'people/' + commons.Escaper.ecapeVariable('$userId') + '/people/' + commons.Escaper.ecapeVariable('$collection');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1067,7 +1066,7 @@
    *
    * Completes with a [PeopleFeed].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1078,7 +1077,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (activityId == null) {
@@ -1095,7 +1094,7 @@
     }
 
 
-    _url = 'activities/' + common_internal.Escaper.ecapeVariable('$activityId') + '/people/' + common_internal.Escaper.ecapeVariable('$collection');
+    _url = 'activities/' + commons.Escaper.ecapeVariable('$activityId') + '/people/' + commons.Escaper.ecapeVariable('$collection');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1125,7 +1124,7 @@
    *
    * Completes with a [PeopleFeed].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1136,7 +1135,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (circleId == null) {
@@ -1150,7 +1149,7 @@
     }
 
 
-    _url = 'circles/' + common_internal.Escaper.ecapeVariable('$circleId') + '/people';
+    _url = 'circles/' + commons.Escaper.ecapeVariable('$circleId') + '/people';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1166,7 +1165,6 @@
 
 
 
-/** Not documented yet. */
 class Acl {
   /** Description of the access granted, suitable for display. */
   core.String description;
@@ -1554,7 +1552,6 @@
 }
 
 
-/** Not documented yet. */
 class ActivityObjectAttachmentsPreviewThumbnails {
   /** URL of the thumbnail image. */
   core.String url;
@@ -1629,7 +1626,6 @@
 }
 
 
-/** Not documented yet. */
 class ActivityObjectAttachmentsThumbnails {
   /** Potential name of the thumbnail. */
   core.String description;
@@ -1671,7 +1667,6 @@
 }
 
 
-/** Not documented yet. */
 class ActivityObjectAttachments {
   /**
    * If the attachment is an article, this property contains a snippet of text
@@ -2108,7 +2103,6 @@
 }
 
 
-/** Not documented yet. */
 class Activity {
   /** Identifies who has access to see this activity. */
   Acl access;
@@ -2326,7 +2320,6 @@
 }
 
 
-/** Not documented yet. */
 class ActivityFeed {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -2435,7 +2428,6 @@
 }
 
 
-/** Not documented yet. */
 class Audience {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -2505,7 +2497,6 @@
 }
 
 
-/** Not documented yet. */
 class AudiencesFeed {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -2599,7 +2590,6 @@
 }
 
 
-/** Not documented yet. */
 class Circle {
   /** The description of this circle. */
   core.String description;
@@ -2677,7 +2667,6 @@
 }
 
 
-/** Not documented yet. */
 class CircleFeed {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -2853,7 +2842,6 @@
 }
 
 
-/** Not documented yet. */
 class CommentInReplyTo {
   /** The ID of the activity. */
   core.String id;
@@ -2959,7 +2947,6 @@
 }
 
 
-/** Not documented yet. */
 class Comment {
   /** The person who posted this comment. */
   CommentActor actor;
@@ -3083,7 +3070,6 @@
 }
 
 
-/** Not documented yet. */
 class CommentFeed {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -3283,7 +3269,6 @@
 }
 
 
-/** Not documented yet. */
 class Media {
   /** The person who uploaded this media. */
   MediaAuthor author;
@@ -3480,7 +3465,6 @@
 }
 
 
-/** Not documented yet. */
 class PeopleFeed {
   /** ETag of this response for caching purposes. */
   core.String etag;
@@ -3700,7 +3684,6 @@
 }
 
 
-/** Not documented yet. */
 class PersonEmails {
   /**
    * The type of address. Possible values include, but are not limited to, the
@@ -3848,7 +3831,6 @@
 }
 
 
-/** Not documented yet. */
 class PersonOrganizations {
   /** The department within the organization. Deprecated. */
   core.String department;
@@ -3954,7 +3936,6 @@
 }
 
 
-/** Not documented yet. */
 class PersonPlacesLived {
   /** If "true", this place of residence is this person's primary residence. */
   core.bool primary;
@@ -3990,7 +3971,6 @@
 }
 
 
-/** Not documented yet. */
 class PersonUrls {
   /** The label of the URL. */
   core.String label;
@@ -4039,7 +4019,6 @@
 }
 
 
-/** Not documented yet. */
 class Person {
   /** A short biography for this person. */
   core.String aboutMe;
@@ -4404,7 +4383,6 @@
 }
 
 
-/** Not documented yet. */
 class Place {
   /** The physical address of the place. */
   PlaceAddress address;
@@ -4464,7 +4442,6 @@
 }
 
 
-/** Not documented yet. */
 class PlusDomainsAclentryResource {
   /** A descriptive name for this entry. Suitable for display. */
   core.String displayName;
@@ -4519,7 +4496,6 @@
 }
 
 
-/** Not documented yet. */
 class Videostream {
   /** The height, in pixels, of the video resource. */
   core.int height;
@@ -4568,5 +4544,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/prediction/v1_6.dart b/generated/googleapis/lib/prediction/v1_6.dart
index 2aff4b2..34ccc9b 100644
--- a/generated/googleapis/lib/prediction/v1_6.dart
+++ b/generated/googleapis/lib/prediction/v1_6.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.prediction.v1_6;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client prediction/v1.6';
 
 /**
  * Lets you access a cloud hosted machine learning service that makes it easy to
@@ -31,21 +34,20 @@
   static const PredictionScope = "https://www.googleapis.com/auth/prediction";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   HostedmodelsResourceApi get hostedmodels => new HostedmodelsResourceApi(_requester);
   TrainedmodelsResourceApi get trainedmodels => new TrainedmodelsResourceApi(_requester);
 
   PredictionApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "prediction/v1.6/projects/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class HostedmodelsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  HostedmodelsResourceApi(common_internal.ApiRequester client) : 
+  HostedmodelsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -61,7 +63,7 @@
    *
    * Completes with a [Output].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -72,7 +74,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -86,7 +88,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/hostedmodels/' + common_internal.Escaper.ecapeVariable('$hostedModelName') + '/predict';
+    _url = commons.Escaper.ecapeVariable('$project') + '/hostedmodels/' + commons.Escaper.ecapeVariable('$hostedModelName') + '/predict';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -101,11 +103,10 @@
 }
 
 
-/** Not documented yet. */
 class TrainedmodelsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  TrainedmodelsResourceApi(common_internal.ApiRequester client) : 
+  TrainedmodelsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -119,7 +120,7 @@
    *
    * Completes with a [Analyze].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -130,7 +131,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -141,7 +142,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/trainedmodels/' + common_internal.Escaper.ecapeVariable('$id') + '/analyze';
+    _url = commons.Escaper.ecapeVariable('$project') + '/trainedmodels/' + commons.Escaper.ecapeVariable('$id') + '/analyze';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -162,7 +163,7 @@
    *
    * [id] - The unique name for the predictive model.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -173,7 +174,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -185,7 +186,7 @@
 
     _downloadOptions = null;
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/trainedmodels/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = commons.Escaper.ecapeVariable('$project') + '/trainedmodels/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -208,7 +209,7 @@
    *
    * Completes with a [Insert2].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -219,7 +220,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -230,7 +231,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/trainedmodels/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = commons.Escaper.ecapeVariable('$project') + '/trainedmodels/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -253,7 +254,7 @@
    *
    * Completes with a [Insert2].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -264,7 +265,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -275,7 +276,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/trainedmodels';
+    _url = commons.Escaper.ecapeVariable('$project') + '/trainedmodels';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -300,7 +301,7 @@
    *
    * Completes with a [List].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -311,7 +312,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -325,7 +326,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/trainedmodels/list';
+    _url = commons.Escaper.ecapeVariable('$project') + '/trainedmodels/list';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -350,7 +351,7 @@
    *
    * Completes with a [Output].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -361,7 +362,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -375,7 +376,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/trainedmodels/' + common_internal.Escaper.ecapeVariable('$id') + '/predict';
+    _url = commons.Escaper.ecapeVariable('$project') + '/trainedmodels/' + commons.Escaper.ecapeVariable('$id') + '/predict';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -400,7 +401,7 @@
    *
    * Completes with a [Insert2].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -411,7 +412,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -425,7 +426,7 @@
     }
 
 
-    _url = common_internal.Escaper.ecapeVariable('$project') + '/trainedmodels/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = commons.Escaper.ecapeVariable('$project') + '/trainedmodels/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -441,7 +442,6 @@
 
 
 
-/** Not documented yet. */
 class AnalyzeDataDescriptionFeaturesCategoricalValues {
   /** Number of times this feature had this value. */
   core.String count;
@@ -573,7 +573,6 @@
 }
 
 
-/** Not documented yet. */
 class AnalyzeDataDescriptionFeatures {
   /** Description of the categorical values of this feature. */
   AnalyzeDataDescriptionFeaturesCategorical categorical;
@@ -666,7 +665,6 @@
 }
 
 
-/** Not documented yet. */
 class AnalyzeDataDescriptionOutputFeatureText {
   /** Number of times the output label occurred in the data set. */
   core.String count;
@@ -814,7 +812,6 @@
 }
 
 
-/** Not documented yet. */
 class Analyze {
   /** Description of the data the model was trained on. */
   AnalyzeDataDescription dataDescription;
@@ -912,7 +909,6 @@
 }
 
 
-/** Not documented yet. */
 class Input {
   /** Input to the model for a prediction. */
   InputInput input;
@@ -936,7 +932,6 @@
 }
 
 
-/** Not documented yet. */
 class InsertTrainingInstances {
   /**
    * The input features for this instance.
@@ -974,7 +969,6 @@
 }
 
 
-/** Not documented yet. */
 class Insert {
   /** The unique name for the predictive model. */
   core.String id;
@@ -1146,7 +1140,6 @@
 }
 
 
-/** Not documented yet. */
 class Insert2 {
   /** Insert time of the model (as a RFC 3339 timestamp). */
   core.DateTime created;
@@ -1263,7 +1256,6 @@
 }
 
 
-/** Not documented yet. */
 class List {
   /** List of models. */
   core.List<Insert2> items;
@@ -1314,7 +1306,6 @@
 }
 
 
-/** Not documented yet. */
 class OutputOutputMulti {
   /** The class label. */
   core.String label;
@@ -1347,7 +1338,6 @@
 }
 
 
-/** Not documented yet. */
 class Output {
   /** The unique name for the predictive model. */
   core.String id;
@@ -1419,7 +1409,6 @@
 }
 
 
-/** Not documented yet. */
 class Update {
   /**
    * The input features for this instance.
@@ -1455,5 +1444,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/qpxexpress/v1.dart b/generated/googleapis/lib/qpxexpress/v1.dart
index 040252b..6de1e5d 100644
--- a/generated/googleapis/lib/qpxexpress/v1.dart
+++ b/generated/googleapis/lib/qpxexpress/v1.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.qpxExpress.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client qpxExpress/v1';
 
 /**
  * Lets you find the least expensive flights between an origin and a
@@ -19,20 +22,19 @@
  */
 class QpxExpressApi {
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   TripsResourceApi get trips => new TripsResourceApi(_requester);
 
   QpxExpressApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "qpxExpress/v1/trips/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class TripsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  TripsResourceApi(common_internal.ApiRequester client) : 
+  TripsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -44,7 +46,7 @@
    *
    * Completes with a [TripsSearchResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -55,7 +57,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -447,7 +449,6 @@
  * character alphanumeric code used to identify a fare.)
  */
 class FareInfo {
-  /** Not documented yet. */
   core.String basisCode;
 
   /**
@@ -541,7 +542,6 @@
  * change of aircraft between legs.
  */
 class FlightInfo {
-  /** Not documented yet. */
   core.String carrier;
 
   /** The flight number. */
@@ -1899,5 +1899,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/reseller/v1.dart b/generated/googleapis/lib/reseller/v1.dart
index 6b0b078..b279e03 100644
--- a/generated/googleapis/lib/reseller/v1.dart
+++ b/generated/googleapis/lib/reseller/v1.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.reseller.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client reseller/v1';
 
 /** Lets you create and manage your customers and their subscriptions. */
 class ResellerApi {
@@ -22,21 +25,20 @@
   static const AppsOrderReadonlyScope = "https://www.googleapis.com/auth/apps.order.readonly";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   CustomersResourceApi get customers => new CustomersResourceApi(_requester);
   SubscriptionsResourceApi get subscriptions => new SubscriptionsResourceApi(_requester);
 
   ResellerApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "apps/reseller/v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class CustomersResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  CustomersResourceApi(common_internal.ApiRequester client) : 
+  CustomersResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -48,7 +50,7 @@
    *
    * Completes with a [Customer].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -59,7 +61,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (customerId == null) {
@@ -67,7 +69,7 @@
     }
 
 
-    _url = 'customers/' + common_internal.Escaper.ecapeVariable('$customerId');
+    _url = 'customers/' + commons.Escaper.ecapeVariable('$customerId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -92,7 +94,7 @@
    *
    * Completes with a [Customer].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -103,7 +105,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -138,7 +140,7 @@
    *
    * Completes with a [Customer].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -149,7 +151,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -160,7 +162,7 @@
     }
 
 
-    _url = 'customers/' + common_internal.Escaper.ecapeVariable('$customerId');
+    _url = 'customers/' + commons.Escaper.ecapeVariable('$customerId');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -183,7 +185,7 @@
    *
    * Completes with a [Customer].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -194,7 +196,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -205,7 +207,7 @@
     }
 
 
-    _url = 'customers/' + common_internal.Escaper.ecapeVariable('$customerId');
+    _url = 'customers/' + commons.Escaper.ecapeVariable('$customerId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -220,11 +222,10 @@
 }
 
 
-/** Not documented yet. */
 class SubscriptionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  SubscriptionsResourceApi(common_internal.ApiRequester client) : 
+  SubscriptionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -238,7 +239,7 @@
    *
    * Completes with a [Subscription].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -249,7 +250,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (customerId == null) {
@@ -260,7 +261,7 @@
     }
 
 
-    _url = 'customers/' + common_internal.Escaper.ecapeVariable('$customerId') + '/subscriptions/' + common_internal.Escaper.ecapeVariable('$subscriptionId') + '/activate';
+    _url = 'customers/' + commons.Escaper.ecapeVariable('$customerId') + '/subscriptions/' + commons.Escaper.ecapeVariable('$subscriptionId') + '/activate';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -285,7 +286,7 @@
    *
    * Completes with a [Subscription].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -296,7 +297,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -310,7 +311,7 @@
     }
 
 
-    _url = 'customers/' + common_internal.Escaper.ecapeVariable('$customerId') + '/subscriptions/' + common_internal.Escaper.ecapeVariable('$subscriptionId') + '/changePlan';
+    _url = 'customers/' + commons.Escaper.ecapeVariable('$customerId') + '/subscriptions/' + commons.Escaper.ecapeVariable('$subscriptionId') + '/changePlan';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -335,7 +336,7 @@
    *
    * Completes with a [Subscription].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -346,7 +347,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -360,7 +361,7 @@
     }
 
 
-    _url = 'customers/' + common_internal.Escaper.ecapeVariable('$customerId') + '/subscriptions/' + common_internal.Escaper.ecapeVariable('$subscriptionId') + '/changeRenewalSettings';
+    _url = 'customers/' + commons.Escaper.ecapeVariable('$customerId') + '/subscriptions/' + commons.Escaper.ecapeVariable('$subscriptionId') + '/changeRenewalSettings';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -385,7 +386,7 @@
    *
    * Completes with a [Subscription].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -396,7 +397,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -410,7 +411,7 @@
     }
 
 
-    _url = 'customers/' + common_internal.Escaper.ecapeVariable('$customerId') + '/subscriptions/' + common_internal.Escaper.ecapeVariable('$subscriptionId') + '/changeSeats';
+    _url = 'customers/' + commons.Escaper.ecapeVariable('$customerId') + '/subscriptions/' + commons.Escaper.ecapeVariable('$subscriptionId') + '/changeSeats';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -440,7 +441,7 @@
    * - "suspend" : Suspends the subscriptions for 4 days before cancelling it
    * - "transfer_to_direct" : Transfers a subscription directly to Google
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -451,7 +452,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (customerId == null) {
@@ -467,7 +468,7 @@
 
     _downloadOptions = null;
 
-    _url = 'customers/' + common_internal.Escaper.ecapeVariable('$customerId') + '/subscriptions/' + common_internal.Escaper.ecapeVariable('$subscriptionId');
+    _url = 'customers/' + commons.Escaper.ecapeVariable('$customerId') + '/subscriptions/' + commons.Escaper.ecapeVariable('$subscriptionId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -490,7 +491,7 @@
    *
    * Completes with a [Subscription].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -501,7 +502,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (customerId == null) {
@@ -512,7 +513,7 @@
     }
 
 
-    _url = 'customers/' + common_internal.Escaper.ecapeVariable('$customerId') + '/subscriptions/' + common_internal.Escaper.ecapeVariable('$subscriptionId');
+    _url = 'customers/' + commons.Escaper.ecapeVariable('$customerId') + '/subscriptions/' + commons.Escaper.ecapeVariable('$subscriptionId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -539,7 +540,7 @@
    *
    * Completes with a [Subscription].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -550,7 +551,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -564,7 +565,7 @@
     }
 
 
-    _url = 'customers/' + common_internal.Escaper.ecapeVariable('$customerId') + '/subscriptions';
+    _url = 'customers/' + commons.Escaper.ecapeVariable('$customerId') + '/subscriptions';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -598,7 +599,7 @@
    *
    * Completes with a [Subscriptions].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -609,7 +610,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (customerAuthToken != null) {
@@ -652,7 +653,7 @@
    *
    * Completes with a [Subscription].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -663,7 +664,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (customerId == null) {
@@ -674,7 +675,7 @@
     }
 
 
-    _url = 'customers/' + common_internal.Escaper.ecapeVariable('$customerId') + '/subscriptions/' + common_internal.Escaper.ecapeVariable('$subscriptionId') + '/startPaidService';
+    _url = 'customers/' + commons.Escaper.ecapeVariable('$customerId') + '/subscriptions/' + commons.Escaper.ecapeVariable('$subscriptionId') + '/startPaidService';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -697,7 +698,7 @@
    *
    * Completes with a [Subscription].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -708,7 +709,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (customerId == null) {
@@ -719,7 +720,7 @@
     }
 
 
-    _url = 'customers/' + common_internal.Escaper.ecapeVariable('$customerId') + '/subscriptions/' + common_internal.Escaper.ecapeVariable('$subscriptionId') + '/suspend';
+    _url = 'customers/' + commons.Escaper.ecapeVariable('$customerId') + '/subscriptions/' + commons.Escaper.ecapeVariable('$subscriptionId') + '/suspend';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1151,7 +1152,6 @@
 
 /** Transfer related information for the subscription. */
 class SubscriptionTransferInfo {
-  /** Not documented yet. */
   core.int minimumTransferableSeats;
 
   /** Time when transfer token or intent to transfer will expire. */
@@ -1399,5 +1399,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/siteverification/v1.dart b/generated/googleapis/lib/siteverification/v1.dart
index af6e6e9..3f5db26 100644
--- a/generated/googleapis/lib/siteverification/v1.dart
+++ b/generated/googleapis/lib/siteverification/v1.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.siteVerification.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client siteVerification/v1';
 
 /**
  * Lets you programatically verify ownership of websites or domains with Google.
@@ -24,20 +27,19 @@
   static const SiteverificationVerifyOnlyScope = "https://www.googleapis.com/auth/siteverification.verify_only";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   WebResourceResourceApi get webResource => new WebResourceResourceApi(_requester);
 
   SiteVerificationApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "siteVerification/v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class WebResourceResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  WebResourceResourceApi(common_internal.ApiRequester client) : 
+  WebResourceResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -47,7 +49,7 @@
    *
    * [id] - The id of a verified site or domain.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -58,7 +60,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -67,7 +69,7 @@
 
     _downloadOptions = null;
 
-    _url = 'webResource/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'webResource/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -88,7 +90,7 @@
    *
    * Completes with a [SiteVerificationWebResourceResource].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -99,7 +101,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -107,7 +109,7 @@
     }
 
 
-    _url = 'webResource/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'webResource/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -128,7 +130,7 @@
    *
    * Completes with a [SiteVerificationWebResourceGettokenResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -139,7 +141,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -170,7 +172,7 @@
    *
    * Completes with a [SiteVerificationWebResourceResource].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -181,7 +183,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -212,7 +214,7 @@
    *
    * Completes with a [SiteVerificationWebResourceListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -223,7 +225,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -252,7 +254,7 @@
    *
    * Completes with a [SiteVerificationWebResourceResource].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -263,7 +265,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -274,7 +276,7 @@
     }
 
 
-    _url = 'webResource/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'webResource/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -297,7 +299,7 @@
    *
    * Completes with a [SiteVerificationWebResourceResource].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -308,7 +310,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -319,7 +321,7 @@
     }
 
 
-    _url = 'webResource/' + common_internal.Escaper.ecapeVariable('$id');
+    _url = 'webResource/' + commons.Escaper.ecapeVariable('$id');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -374,7 +376,6 @@
 }
 
 
-/** Not documented yet. */
 class SiteVerificationWebResourceGettokenRequest {
   /** The site for which a verification token will be generated. */
   SiteVerificationWebResourceGettokenRequestSite site;
@@ -410,7 +411,6 @@
 }
 
 
-/** Not documented yet. */
 class SiteVerificationWebResourceGettokenResponse {
   /**
    * The verification method to use in conjunction with this token. For FILE,
@@ -452,7 +452,6 @@
 }
 
 
-/** Not documented yet. */
 class SiteVerificationWebResourceListResponse {
   /** The list of sites that are owned by the authenticated user. */
   core.List<SiteVerificationWebResourceResource> items;
@@ -512,7 +511,6 @@
 }
 
 
-/** Not documented yet. */
 class SiteVerificationWebResourceResource {
   /**
    * The string used to identify this site. This value should be used in the
@@ -555,5 +553,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/src/common_internal.dart b/generated/googleapis/lib/src/common_internal.dart
deleted file mode 100644
index 5d26e7c..0000000
--- a/generated/googleapis/lib/src/common_internal.dart
+++ /dev/null
@@ -1,921 +0,0 @@
-library googleapis.common_internal;
-
-import "dart:async";
-import "dart:convert";
-import "dart:collection" as collection;
-
-import "package:crypto/crypto.dart" as crypto;
-import "../common/common.dart" as common_external;
-import "package:http/http.dart" as http;
-
-const String USER_AGENT_STRING =
-    'google-api-dart-client googleapis/0.6.1';
-
-const CONTENT_TYPE_JSON_UTF8 = 'application/json; charset=utf-8';
-
-/**
- * Base class for all API clients, offering generic methods for
- * HTTP Requests to the API
- */
-class ApiRequester {
-  final http.Client _httpClient;
-  final String _rootUrl;
-  final String _basePath;
-
-  ApiRequester(this._httpClient, this._rootUrl, this._basePath) {
-    assert(_rootUrl.endsWith('/'));
-  }
-
-
-  /**
-   * Sends a HTTPRequest using [method] (usually GET or POST) to [requestUrl]
-   * using the specified [urlParams] and [queryParams]. Optionally include a
-   * [body] and/or [uploadMedia] in the request.
-   *
-   * If [uploadMedia] was specified [downloadOptions] must be
-   * [DownloadOptions.Metadata] or `null`.
-   *
-   * If [downloadOptions] is [DownloadOptions.Metadata] the result will be
-   * decoded as JSON.
-   *
-   * If [downloadOptions] is `null` the result will be a Future completing with
-   * `null`.
-   *
-   * Otherwise the result will be downloaded as a [common_external.Media]
-   */
-  Future request(String requestUrl, String method,
-                 {String body, Map queryParams,
-                  common_external.Media uploadMedia,
-                  common_external.UploadOptions uploadOptions,
-                  common_external.DownloadOptions downloadOptions:
-                  common_external.DownloadOptions.Metadata}) {
-    if (uploadMedia != null &&
-        downloadOptions != common_external.DownloadOptions.Metadata) {
-      throw new ArgumentError('When uploading a [Media] you cannot download a '
-                              '[Media] at the same time!');
-    }
-    common_external.ByteRange downloadRange;
-    if (downloadOptions is common_external.PartialDownloadOptions &&
-        !downloadOptions.isFullDownload) {
-      downloadRange = downloadOptions.range;
-    }
-
-    return _request(requestUrl, method, body, queryParams,
-                    uploadMedia, uploadOptions,
-                    downloadOptions,
-                    downloadRange)
-        .then(_validateResponse).then((http.StreamedResponse response) {
-      if (downloadOptions == null) {
-        // If no download options are given, the response is of no interest
-        // and we will drain the stream.
-        return response.stream.drain();
-      } else if (downloadOptions == common_external.DownloadOptions.Metadata) {
-        // Downloading JSON Metadata
-        var stringStream = _decodeStreamAsText(response);
-        if (stringStream != null) {
-          return stringStream.join('').then((String bodyString) {
-            if (bodyString == '') return null;
-            return JSON.decode(bodyString);
-          });
-        } else {
-          throw new common_external.ApiRequestError(
-              "Unable to read response with content-type "
-              "${response.headers['content-type']}.");
-        }
-      } else {
-        // Downloading Media.
-        var contentType = response.headers['content-type'];
-        if (contentType == null) {
-          throw new common_external.ApiRequestError(
-              "No 'content-type' header in media response.");
-        }
-        var contentLength;
-        try {
-          contentLength = int.parse(response.headers['content-length']);
-        } catch (_) {
-          // We silently ignore errors here. If no content-length was specified
-          // we use `null`.
-          // Please note that the code below still asserts the content-length
-          // is correct for range downloads.
-        }
-
-        if (downloadRange != null) {
-          if (contentLength != downloadRange.length) {
-            throw new common_external.ApiRequestError(
-                "Content length of response does not match requested range "
-                "length.");
-          }
-          var contentRange = response.headers['content-range'];
-          var expected = 'bytes ${downloadRange.start}-${downloadRange.end}/';
-          if (contentRange == null || !contentRange.startsWith(expected)) {
-            throw new common_external.ApiRequestError("Attempting partial "
-                "download but got invalid 'Content-Range' header "
-                "(was: $contentRange, expected: $expected).");
-          }
-        }
-
-        return new common_external.Media(
-            response.stream, contentLength, contentType: contentType);
-      }
-    });
-  }
-
-  Future _request(String requestUrl, String method,
-                  String body, Map queryParams,
-                  common_external.Media uploadMedia,
-                  common_external.UploadOptions uploadOptions,
-                  common_external.DownloadOptions downloadOptions,
-                  common_external.ByteRange downloadRange) {
-    bool downloadAsMedia =
-        downloadOptions != null &&
-        downloadOptions != common_external.DownloadOptions.Metadata;
-
-    if (queryParams == null) queryParams = {};
-
-    if (uploadMedia != null) {
-      if (uploadOptions is common_external.ResumableUploadOptions) {
-        queryParams['uploadType'] = const ['resumable'];
-      } else if (body == null) {
-        queryParams['uploadType'] = const ['media'];
-      } else {
-        queryParams['uploadType'] = const ['multipart'];
-      }
-    }
-
-    if (downloadAsMedia) {
-      queryParams['alt'] = const ['media'];
-    } else if (downloadOptions != null) {
-      queryParams['alt'] = const ['json'];
-    }
-
-    var path;
-    if (requestUrl.startsWith('/')) {
-      path ="$_rootUrl${requestUrl.substring(1)}";
-    } else {
-      path ="$_rootUrl${_basePath}$requestUrl";
-    }
-
-    bool containsQueryParameter = path.contains('?');
-    addQueryParameter(String name, String value) {
-      name = Escaper.escapeQueryComponent(name);
-      value = Escaper.escapeQueryComponent(value);
-      if (containsQueryParameter) {
-        path = '$path&$name=$value';
-      } else {
-        path = '$path?$name=$value';
-      }
-      containsQueryParameter = true;
-    }
-    queryParams.forEach((String key, List<String> values) {
-      for (var value in values) {
-        addQueryParameter(key, value);
-      }
-    });
-
-    var uri = Uri.parse(path);
-
-    Future simpleUpload() {
-      var bodyStream = uploadMedia.stream;
-      var request = new RequestImpl(method, uri, bodyStream);
-      request.headers.addAll({
-        'user-agent' : USER_AGENT_STRING,
-        'content-type' : uploadMedia.contentType,
-        'content-length' : '${uploadMedia.length}'
-      });
-      return _httpClient.send(request);
-    }
-
-    Future simpleRequest() {
-      var length = 0;
-      var bodyController = new StreamController<List<int>>();
-      if (body != null) {
-        var bytes = UTF8.encode(body);
-        bodyController.add(bytes);
-        length = bytes.length;
-      }
-      bodyController.close();
-
-      var headers;
-      if (downloadRange != null) {
-        headers = {
-          'user-agent' : USER_AGENT_STRING,
-          'content-type' : CONTENT_TYPE_JSON_UTF8,
-          'content-length' : '$length',
-          'range' :  'bytes=${downloadRange.start}-${downloadRange.end}',
-        };
-      } else {
-        headers = {
-          'user-agent' : USER_AGENT_STRING,
-          'content-type' : CONTENT_TYPE_JSON_UTF8,
-          'content-length' : '$length',
-        };
-      }
-
-      var request = new RequestImpl(method, uri, bodyController.stream);
-      request.headers.addAll(headers);
-      return _httpClient.send(request);
-    }
-
-    if (uploadMedia != null) {
-      // Three upload types:
-      // 1. Resumable: Upload of data + metdata with multiple requests.
-      // 2. Simple: Upload of media.
-      // 3. Multipart: Upload of data + metadata.
-
-      if (uploadOptions is common_external.ResumableUploadOptions) {
-        var helper = new ResumableMediaUploader(
-            _httpClient, uploadMedia, body, uri, method, uploadOptions);
-        return helper.upload();
-      }
-
-      if (uploadMedia.length == null) {
-        throw new ArgumentError(
-            'For non-resumable uploads you need to specify the length of the '
-            'media to upload.');
-      }
-
-      if (body == null) {
-        return simpleUpload();
-      } else {
-        var uploader = new MultipartMediaUploader(
-            _httpClient, uploadMedia, body, uri, method);
-        return uploader.upload();
-      }
-    }
-    return simpleRequest();
-  }
-}
-
-
-/**
- * Does media uploads using the multipart upload protocol.
- */
-class MultipartMediaUploader {
-  static final _boundary = '314159265358979323846';
-  static final _base64Encoder = new Base64Encoder();
-
-  final http.Client _httpClient;
-  final common_external.Media _uploadMedia;
-  final Uri _uri;
-  final String _body;
-  final String _method;
-
-  MultipartMediaUploader(
-      this._httpClient, this._uploadMedia, this._body, this._uri, this._method);
-
-  Future<http.StreamedResponse> upload() {
-    var base64MediaStream =
-        _uploadMedia.stream.transform(_base64Encoder).transform(ASCII.encoder);
-    var base64MediaStreamLength =
-        Base64Encoder.lengthOfBase64Stream(_uploadMedia.length);
-
-    // NOTE: We assume that [_body] is encoded JSON without any \r or \n in it.
-    // This guarantees us that [_body] cannot contain a valid multipart
-    // boundary.
-    var bodyHead =
-        '--$_boundary\r\n'
-        "Content-Type: $CONTENT_TYPE_JSON_UTF8\r\n\r\n"
-        + _body +
-        '\r\n--$_boundary\r\n'
-        "Content-Type: ${_uploadMedia.contentType}\r\n"
-        "Content-Transfer-Encoding: base64\r\n\r\n";
-    var bodyTail = '\r\n--$_boundary--';
-
-    var totalLength =
-        bodyHead.length + base64MediaStreamLength + bodyTail.length;
-
-    var bodyController = new StreamController<List<int>>();
-    bodyController.add(UTF8.encode(bodyHead));
-    bodyController.addStream(base64MediaStream).then((_) {
-      bodyController.add(UTF8.encode(bodyTail));
-    }).catchError((error, stack) {
-      bodyController.addError(error, stack);
-    }).then((_) {
-      bodyController.close();
-    });
-
-    var headers = {
-        'user-agent' : USER_AGENT_STRING,
-        'content-type' : "multipart/related; boundary=\"$_boundary\"",
-        'content-length' : '$totalLength'
-    };
-    var bodyStream = bodyController.stream;
-    var request = new RequestImpl(_method, _uri, bodyStream);
-    request.headers.addAll(headers);
-    return _httpClient.send(request);
-  }
-}
-
-
-/**
- * Base64 encodes a stream of bytes.
- */
-class Base64Encoder implements StreamTransformer<List<int>, String> {
-  static int lengthOfBase64Stream(int lengthOfByteStream) {
-    return ((lengthOfByteStream + 2) ~/ 3) * 4;
-  }
-
-  Stream<String> bind(Stream<List<int>> stream) {
-    StreamController<String> controller;
-
-    // Holds between 0 and 3 bytes and is used as a buffer.
-    List<int> remainingBytes = [];
-
-    void onData(List<int> bytes) {
-      if ((remainingBytes.length + bytes.length) < 3) {
-        remainingBytes.addAll(bytes);
-        return;
-      }
-      int start;
-      if (remainingBytes.length == 0) {
-        start = 0;
-      } else if (remainingBytes.length == 1) {
-        remainingBytes.add(bytes[0]);
-        remainingBytes.add(bytes[1]);
-        start = 2;
-      } else if (remainingBytes.length == 2) {
-        remainingBytes.add(bytes[0]);
-        start = 1;
-      }
-
-      // Convert & Send bytes from buffer (if necessary).
-      if (remainingBytes.length > 0) {
-        controller.add(crypto.CryptoUtils.bytesToBase64(remainingBytes));
-        remainingBytes.clear();
-      }
-
-      int chunksOf3 = (bytes.length - start) ~/ 3;
-      int end = start + 3 * chunksOf3;
-      int remaining = bytes.length - end;
-
-      // Convert & Send main bytes.
-      if (start == 0 && end == bytes.length) {
-        // Fast path if [bytes] are devisible by 3.
-        controller.add(crypto.CryptoUtils.bytesToBase64(bytes));
-      } else {
-        controller.add(
-            crypto.CryptoUtils.bytesToBase64(bytes.sublist(start, end)));
-
-        // Buffer remaining bytes if necessary.
-        if (end < bytes.length) {
-          remainingBytes.addAll(bytes.sublist(end));
-        }
-      }
-    }
-
-    void onError(error, stack) {
-      controller.addError(error, stack);
-    }
-
-    void onDone() {
-      if (remainingBytes.length > 0) {
-        controller.add(crypto.CryptoUtils.bytesToBase64(remainingBytes));
-        remainingBytes.clear();
-      }
-      controller.close();
-    }
-
-    var subscription;
-    controller = new StreamController<String>(
-        onListen: () {
-          subscription = stream.listen(
-              onData, onError: onError, onDone: onDone);
-        },
-        onPause: () {
-          subscription.pause();
-        },
-        onResume: () {
-          subscription.resume();
-        },
-        onCancel: () {
-          subscription.cancel();
-        });
-    return controller.stream;
-  }
-}
-
-
-// TODO: Buffer less if we know the content length in advance.
-/**
- * Does media uploads using the resumable upload protocol.
- */
-class ResumableMediaUploader {
-  final http.Client _httpClient;
-  final common_external.Media _uploadMedia;
-  final Uri _uri;
-  final String _body;
-  final String _method;
-  final common_external.ResumableUploadOptions _options;
-
-  ResumableMediaUploader(
-      this._httpClient, this._uploadMedia, this._body, this._uri, this._method,
-      this._options);
-
-  /**
-   * Returns the final [http.StreamedResponse] if the upload succeded and
-   * completes with an error otherwise.
-   *
-   * The returned response stream has not been listened to.
-   */
-  Future<http.StreamedResponse> upload() {
-    return _startSession().then((Uri uploadUri) {
-      StreamSubscription subscription;
-
-      var completer = new Completer<http.StreamedResponse>();
-      bool completed = false;
-
-      var chunkStack = new ChunkStack(_options.chunkSize);
-      subscription = _uploadMedia.stream.listen((List<int> bytes) {
-        chunkStack.addBytes(bytes);
-
-        // Upload all but the last chunk.
-        // The final send will be done in the [onDone] handler.
-        bool hasPartialChunk = chunkStack.hasPartialChunk;
-        if (chunkStack.length > 1 ||
-            (chunkStack.length == 1 && hasPartialChunk)) {
-          // Pause the input stream.
-          subscription.pause();
-
-          // Upload all chunks except the last one.
-          var fullChunks;
-          if (hasPartialChunk) {
-            fullChunks = chunkStack.removeSublist(0, chunkStack.length);
-          } else {
-            fullChunks = chunkStack.removeSublist(0, chunkStack.length - 1);
-          }
-          Future.forEach(fullChunks,
-                         (c) => _uploadChunkDrained(uploadUri, c)).then((_) {
-            // All chunks uploaded, we can continue consuming data.
-            subscription.resume();
-          }).catchError((error, stack) {
-            subscription.cancel();
-            completed = true;
-            completer.completeError(error, stack);
-          });
-        }
-      }, onError: (error, stack) {
-        subscription.cancel();
-        if (!completed) {
-          completed = true;
-          completer.completeError(error, stack);
-        }
-      }, onDone: () {
-        if (!completed) {
-          chunkStack.finalize();
-
-          var lastChunk;
-          if (chunkStack.length == 1) {
-            lastChunk = chunkStack.removeSublist(0, chunkStack.length).first;
-          } else {
-            completer.completeError(new StateError(
-                'Resumable uploads need to result in at least one non-empty '
-                'chunk at the end.'));
-            return;
-          }
-          var end = lastChunk.endOfChunk;
-
-          // Validate that we have the correct number of bytes if length was
-          // specified.
-          if (_uploadMedia.length != null) {
-            if (end < _uploadMedia.length) {
-              completer.completeError(new common_external.ApiRequestError(
-                  'Received less bytes than indicated by [Media.length].'));
-              return;
-            } else if (end > _uploadMedia.length) {
-              completer.completeError(new common_external.ApiRequestError(
-                  'Received more bytes than indicated by [Media.length].'));
-              return;
-            }
-          }
-
-          // Upload last chunk and *do not drain the response* but complete
-          // with it.
-          _uploadChunkResumable(uploadUri, lastChunk, lastChunk: true)
-              .then((response) {
-            completer.complete(response);
-          }).catchError((error, stack) {
-            completer.completeError(error, stack);
-          });
-        }
-      });
-
-      return completer.future;
-    });
-  }
-
-  /**
-   * Starts a resumable upload.
-   *
-   * Returns the [Uri] which should be used for uploading all content.
-   */
-  Future<Uri> _startSession() {
-    var length = 0;
-    var bytes;
-    if (_body != null) {
-      bytes = UTF8.encode(_body);
-      length = bytes.length;
-    }
-    var bodyStream = _bytes2Stream(bytes);
-
-    var request = new RequestImpl(_method, _uri, bodyStream);
-    request.headers.addAll({
-      'user-agent' : USER_AGENT_STRING,
-      'content-type' : CONTENT_TYPE_JSON_UTF8,
-      'content-length' : '$length',
-      'x-upload-content-type' : _uploadMedia.contentType,
-      'x-upload-content-length' : '${_uploadMedia.length}',
-    });
-
-    return _httpClient.send(request).then((http.StreamedResponse response) {
-      return response.stream.drain().then((_) {
-        var uploadUri = response.headers['location'];
-        if (response.statusCode != 200 || uploadUri == null) {
-          throw new common_external.ApiRequestError(
-              'Invalid response for resumable upload attempt '
-              '(status was: ${response.statusCode})');
-        }
-        return Uri.parse(uploadUri);
-      });
-    });
-  }
-
-  /**
-   * Uploads [chunk], retries upon server errors. The response stream will be
-   * drained.
-   */
-  Future _uploadChunkDrained(Uri uri, ResumableChunk chunk) {
-    return _uploadChunkResumable(uri, chunk).then((response) {
-      return response.stream.drain();
-    });
-  }
-
-  /**
-   * Does repeated attempts to upload [chunk].
-   */
-  Future _uploadChunkResumable(Uri uri,
-                               ResumableChunk chunk,
-                               {bool lastChunk: false}) {
-    tryUpload(int attemptsLeft) {
-      return _uploadChunk(uri, chunk, lastChunk: lastChunk)
-          .then((http.StreamedResponse response) {
-        var status = response.statusCode;
-        if (attemptsLeft > 0 &&
-            (status == 500 || (502 <= status && status < 504))) {
-          return response.stream.drain().then((_) {
-            // Delay the next attempt. Default backoff function is exponential.
-            int failedAttemts = _options.numberOfAttempts - attemptsLeft;
-            var duration = _options.backoffFunction(failedAttemts);
-            if (duration == null) {
-              throw new common_external.DetailedApiRequestError(
-                  status,
-                  'Resumable upload: Uploading a chunk resulted in status '
-                  '$status. Maximum number of retries reached.');
-            }
-
-            return new Future.delayed(duration).then((_) {
-              return tryUpload(attemptsLeft - 1);
-            });
-          });
-        } else if (!lastChunk && status != 308) {
-            return response.stream.drain().then((_) {
-              throw new common_external.DetailedApiRequestError(
-                  status,
-                  'Resumable upload: Uploading a chunk resulted in status '
-                  '$status instead of 308.');
-            });
-        } else if (lastChunk && status != 201 && status != 200) {
-          return response.stream.drain().then((_) {
-            throw new common_external.DetailedApiRequestError(
-                status,
-                'Resumable upload: Uploading a chunk resulted in status '
-                '$status instead of 200 or 201.');
-          });
-        } else {
-          return response;
-        }
-      });
-    }
-
-    return tryUpload(_options.numberOfAttempts - 1);
-  }
-
-  /**
-   * Uploads [length] bytes in [byteArrays] and ensures the upload was
-   * successful.
-   *
-   * Content-Range: [start ... (start + length)[
-   *
-   * Returns the returned [http.StreamedResponse] or completes with an error if
-   * the upload did not succeed. The response stream will not be listened to.
-   */
-  Future _uploadChunk(Uri uri, ResumableChunk chunk, {bool lastChunk: false}) {
-    // If [uploadMedia.length] is null, we do not know the length.
-    var mediaTotalLength = _uploadMedia.length;
-    if (mediaTotalLength == null || lastChunk) {
-      if (lastChunk) {
-        mediaTotalLength = '${chunk.endOfChunk}';
-      } else {
-        mediaTotalLength = '*';
-      }
-    }
-
-    var headers = {
-        'user-agent' : USER_AGENT_STRING,
-        'content-type' : _uploadMedia.contentType,
-        'content-length' : '${chunk.length}',
-        'content-range' :
-            'bytes ${chunk.offset}-${chunk.endOfChunk - 1}/$mediaTotalLength',
-    };
-
-    var stream = _listOfBytes2Stream(chunk.byteArrays);
-    var request = new RequestImpl('PUT', uri, stream);
-    request.headers.addAll(headers);
-    return _httpClient.send(request);
-  }
-
-  Stream<List<int>> _bytes2Stream(List<int> bytes) {
-    var bodyController = new StreamController<List<int>>();
-    if (bytes != null) {
-      bodyController.add(bytes);
-    }
-    bodyController.close();
-    return bodyController.stream;
-  }
-
-  Stream<List<int>> _listOfBytes2Stream(List<List<int>> listOfBytes) {
-    var controller = new StreamController();
-    for (var array in listOfBytes) {
-      controller.add(array);
-    }
-    controller.close();
-    return controller.stream;
-  }
-}
-
-
-/**
- * Represents a stack of [ResumableChunk]s.
- */
-class ChunkStack {
-  final int _chunkSize;
-  final List<ResumableChunk> _chunkStack = [];
-
-  // Currently accumulated data.
-  List<List<int>> _byteArrays = [];
-  int _length = 0;
-  int _offset = 0;
-
-  bool _finalized = false;
-
-  ChunkStack(this._chunkSize);
-
-  /**
-   * Whether data for a not-yet-finished [ResumableChunk] is present. A call to
-   * `finalize` will create a [ResumableChunk] of this data.
-   */
-  bool get hasPartialChunk => _length > 0;
-
-  /**
-   * The number of chunks in this [ChunkStack].
-   */
-  int get length => _chunkStack.length;
-
-  /**
-   * The total number of bytes which have been converted to [ResumableChunk]s.
-   * Can only be called once this [ChunkStack] has been finalized.
-   */
-  int get totalByteLength {
-    if (!_finalized) {
-      throw new StateError('ChunkStack has not been finalized yet.');
-    }
-
-    return _offset;
-  }
-
-  /**
-   * Returns the chunks [from] ... [to] and deletes it from the stack.
-   */
-  List<ResumableChunk> removeSublist(int from, int to) {
-    var sublist = _chunkStack.sublist(from, to);
-    _chunkStack.removeRange(from, to);
-    return sublist;
-  }
-
-  /**
-   * Adds [bytes] to the buffer. If the buffer is larger than the given chunk
-   * size a new [ResumableChunk] will be created.
-   */
-  void addBytes(List<int> bytes) {
-    if (_finalized) {
-      throw new StateError('ChunkStack has already been finalized.');
-    }
-
-    var remaining = _chunkSize - _length;
-
-    if (bytes.length >= remaining) {
-      var left = bytes.sublist(0, remaining);
-      var right = bytes.sublist(remaining);
-
-      _byteArrays.add(left);
-      _length += left.length;
-
-      _chunkStack.add(new ResumableChunk(_byteArrays, _offset, _length));
-
-      _byteArrays = [];
-      _offset += _length;
-      _length = 0;
-
-      addBytes(right);
-    } else if (bytes.length > 0) {
-      _byteArrays.add(bytes);
-      _length += bytes.length;
-    }
-  }
-
-  /**
-   * Finalizes this [ChunkStack] and creates the last chunk (may have less bytes
-   * than the chunk size, but not zero).
-   */
-  void finalize() {
-    if (_finalized) {
-      throw new StateError('ChunkStack has already been finalized.');
-    }
-    _finalized = true;
-
-    if (_length > 0) {
-      _chunkStack.add(new ResumableChunk(_byteArrays, _offset, _length));
-      _offset += _length;
-    }
-  }
-}
-
-
-/**
- * Represents a chunk of data that will be transferred in one http request.
- */
-class ResumableChunk {
-  final List<List<int>> byteArrays;
-  final int offset;
-  final int length;
-
-  /**
-   * Index of the next byte after this chunk.
-   */
-  int get endOfChunk => offset + length;
-
-  ResumableChunk(this.byteArrays, this.offset, this.length);
-}
-
-class RequestImpl extends http.BaseRequest {
-  final Stream<List<int>> _stream;
-
-  RequestImpl(String method, Uri url, [Stream<List<int>> stream])
-      : _stream = stream == null ? new Stream.fromIterable([]) : stream,
-        super(method, url);
-
-  http.ByteStream finalize() {
-    super.finalize();
-    return new http.ByteStream(_stream);
-  }
-}
-
-
-class Escaper {
-  // Character class definitions from RFC 6570
-  // (see http://tools.ietf.org/html/rfc6570)
-  // ALPHA          =  %x41-5A / %x61-7A   ; A-Z / a-z
-  // DIGIT          =  %x30-39             ; 0
-  // HEXDIG         =  DIGIT / "A" / "B" / "C" / "D" / "E" / "F"
-  // pct-encoded    =  "%" HEXDIG HEXDIG
-  // unreserved     =  ALPHA / DIGIT / "-" / "." / "_" / "~"
-  // reserved       =  gen-delims / sub-delims
-  // gen-delims     =  ":" / "/" / "?" / "#" / "[" / "]" / "@"
-  // sub-delims     =  "!" / "$" / "&" / "'" / "(" / ")"
-  //                /  "*" / "+" / "," / ";" / "="
-
-  // NOTE: Uri.encodeQueryComponent() does the following:
-  // ...
-  // Then the resulting bytes are "percent-encoded". This transforms spaces
-  // (U+0020) to a plus sign ('+') and all bytes that are not the ASCII decimal
-  // digits, letters or one of '-._~' are written as a percent sign '%'
-  // followed by the two-digit hexadecimal representation of the byte.
-  // ...
-
-  // NOTE: Uri.encodeFull() does the following:
-  // ...
-  // All characters except uppercase and lowercase letters, digits and the
-  // characters !#$&'()*+,-./:;=?@_~ are percent-encoded.
-  // ...
-
-  static String ecapeVariableReserved(String name) {
-    // ... perform variable expansion, as defined in Section 3.2.1, with the
-    // allowed characters being those in the set
-    // (unreserved / reserved / pct-encoded)
-
-    // NOTE: The chracters [ and ] need (according to URI Template spec) not be
-    // percent encoded. The dart implementation does percent-encode [ and ].
-    // This gives us in effect a conservative encoding, since the server side
-    // must interpret percent-encoded parts anyway due to arbitrary unicode.
-
-    // NOTE: This is broken in the discovery protocol. It allows ? and & to be
-    // expanded via URI Templates which may generate completely bogus URIs.
-    // TODO/FIXME: Should we change this to _encodeUnreserved() as well
-    // (disadvantage, slashes get encoded at this point)?
-    return Uri.encodeFull(name);
-  }
-
-  static String ecapePathComponent(String name) {
-    // For each defined variable in the variable-list, append "/" to the
-    // result string and then perform variable expansion, as defined in
-    // Section 3.2.1, with the allowed characters being those in the
-    // *unreserved set*.
-    return _encodeUnreserved(name);
-  }
-
-  static String ecapeVariable(String name) {
-    // ... perform variable expansion, as defined in Section 3.2.1, with the
-    // allowed characters being those in the *unreserved set*.
-    return _encodeUnreserved(name);
-  }
-
-  static String escapeQueryComponent(String name) {
-    // This method will not be used by UriTemplate, but rather for encoding
-    // normal query name/value pairs.
-
-    // NOTE: For safety reasons we use '%20' instead of '+' here as well.
-    // TODO/FIXME: Should we do this?
-    return _encodeUnreserved(name);
-  }
-
-  static String _encodeUnreserved(String name) {
-    // The only difference between dart's [Uri.encodeQueryComponent] and the
-    // encoding defined by RFC 6570 for the above-defined unreserved character
-    // set is the encoding of space.
-    // Dart's Uri class will convert spaces to '+' which we replace by '%20'.
-    return Uri.encodeQueryComponent(name).replaceAll('+', '%20');
-  }
-}
-
-
-Future<http.StreamedResponse> _validateResponse(
-    http.StreamedResponse response) {
-  var statusCode = response.statusCode;
-
-  // TODO: We assume that status codes between [200..400[ are OK.
-  // Can we assume this?
-  if (statusCode < 200 || statusCode >= 400) {
-    throwGeneralError() {
-      throw new common_external.DetailedApiRequestError(
-          statusCode, 'No error details. HTTP status was: ${statusCode}.');
-    }
-
-    // Some error happened, try to decode the response and fetch the error.
-    Stream<String> stringStream = _decodeStreamAsText(response);
-    if (stringStream != null) {
-      return stringStream.transform(JSON.decoder).first.then((json) {
-        if (json is Map && json['error'] is Map) {
-          var error = json['error'];
-          var code = error['code'];
-          var message = error['message'];
-          throw new common_external.DetailedApiRequestError(code, message);
-        } else {
-          throwGeneralError();
-        }
-      });
-    } else {
-      throwGeneralError();
-    }
-  }
-
-  return new Future.value(response);
-}
-
-
-Stream<String> _decodeStreamAsText(http.StreamedResponse response) {
-  // TODO: Correctly handle the response content-types, using correct
-  // decoder.
-  // Currently we assume that the api endpoint is responding with json
-  // encoded in UTF8.
-  String contentType = response.headers['content-type'];
-  if (contentType != null &&
-      contentType.toLowerCase().startsWith('application/json')) {
-    return response.stream.transform(new Utf8Decoder(allowMalformed: true));
-  } else {
-    return null;
-  }
-}
-
-Map mapMap(Map source, [Object convert(Object source) = null]) {
-  assert(source != null);
-  var result = new collection.LinkedHashMap();
-  source.forEach((String key, value) {
-    assert(key != null);
-    if(convert == null) {
-      result[key] = value;
-    } else {
-      result[key] = convert(value);
-    }
-  });
-  return result;
-}
-
diff --git a/generated/googleapis/lib/storage/v1.dart b/generated/googleapis/lib/storage/v1.dart
index 86302b7..096b85d 100644
--- a/generated/googleapis/lib/storage/v1.dart
+++ b/generated/googleapis/lib/storage/v1.dart
@@ -1,17 +1,22 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.storage.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError, Media, UploadOptions,
+    ResumableUploadOptions, DownloadOptions, PartialDownloadOptions,
+    ByteRange;
+
+const core.String USER_AGENT = 'dart-api-client storage/v1';
 
 /** Lets you store and retrieve potentially-large, immutable data objects. */
 class StorageApi {
@@ -28,7 +33,7 @@
   static const DevstorageReadWriteScope = "https://www.googleapis.com/auth/devstorage.read_write";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   BucketAccessControlsResourceApi get bucketAccessControls => new BucketAccessControlsResourceApi(_requester);
   BucketsResourceApi get buckets => new BucketsResourceApi(_requester);
@@ -38,15 +43,14 @@
   ObjectsResourceApi get objects => new ObjectsResourceApi(_requester);
 
   StorageApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "storage/v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class BucketAccessControlsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  BucketAccessControlsResourceApi(common_internal.ApiRequester client) : 
+  BucketAccessControlsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -61,7 +65,7 @@
    * user-emailAddress, group-groupId, group-emailAddress, allUsers, or
    * allAuthenticatedUsers.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -72,7 +76,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (bucket == null) {
@@ -84,7 +88,7 @@
 
     _downloadOptions = null;
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/acl/' + common_internal.Escaper.ecapeVariable('$entity');
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket') + '/acl/' + commons.Escaper.ecapeVariable('$entity');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -109,7 +113,7 @@
    *
    * Completes with a [BucketAccessControl].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -120,7 +124,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (bucket == null) {
@@ -131,7 +135,7 @@
     }
 
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/acl/' + common_internal.Escaper.ecapeVariable('$entity');
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket') + '/acl/' + commons.Escaper.ecapeVariable('$entity');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -154,7 +158,7 @@
    *
    * Completes with a [BucketAccessControl].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -165,7 +169,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -176,7 +180,7 @@
     }
 
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/acl';
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket') + '/acl';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -197,7 +201,7 @@
    *
    * Completes with a [BucketAccessControls].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -208,7 +212,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (bucket == null) {
@@ -216,7 +220,7 @@
     }
 
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/acl';
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket') + '/acl';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -244,7 +248,7 @@
    *
    * Completes with a [BucketAccessControl].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -255,7 +259,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -269,7 +273,7 @@
     }
 
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/acl/' + common_internal.Escaper.ecapeVariable('$entity');
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket') + '/acl/' + commons.Escaper.ecapeVariable('$entity');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -296,7 +300,7 @@
    *
    * Completes with a [BucketAccessControl].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -307,7 +311,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -321,7 +325,7 @@
     }
 
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/acl/' + common_internal.Escaper.ecapeVariable('$entity');
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket') + '/acl/' + commons.Escaper.ecapeVariable('$entity');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -336,11 +340,10 @@
 }
 
 
-/** Not documented yet. */
 class BucketsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  BucketsResourceApi(common_internal.ApiRequester client) : 
+  BucketsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -356,7 +359,7 @@
    * [ifMetagenerationNotMatch] - If set, only deletes the bucket if its
    * metageneration does not match this value.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -367,7 +370,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (bucket == null) {
@@ -382,7 +385,7 @@
 
     _downloadOptions = null;
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket');
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -416,7 +419,7 @@
    *
    * Completes with a [Bucket].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -427,7 +430,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (bucket == null) {
@@ -444,7 +447,7 @@
     }
 
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket');
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -501,7 +504,7 @@
    *
    * Completes with a [Bucket].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -512,7 +515,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -566,7 +569,7 @@
    *
    * Completes with a [Buckets].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -577,7 +580,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (project == null) {
@@ -661,7 +664,7 @@
    *
    * Completes with a [Bucket].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -672,7 +675,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -698,7 +701,7 @@
     }
 
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket');
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -761,7 +764,7 @@
    *
    * Completes with a [Bucket].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -772,7 +775,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -798,7 +801,7 @@
     }
 
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket');
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -813,11 +816,10 @@
 }
 
 
-/** Not documented yet. */
 class ChannelsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ChannelsResourceApi(common_internal.ApiRequester client) : 
+  ChannelsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -827,7 +829,7 @@
    *
    * Request parameters:
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -838,7 +840,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -862,11 +864,10 @@
 }
 
 
-/** Not documented yet. */
 class DefaultObjectAccessControlsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  DefaultObjectAccessControlsResourceApi(common_internal.ApiRequester client) : 
+  DefaultObjectAccessControlsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -881,7 +882,7 @@
    * user-emailAddress, group-groupId, group-emailAddress, allUsers, or
    * allAuthenticatedUsers.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -892,7 +893,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (bucket == null) {
@@ -904,7 +905,7 @@
 
     _downloadOptions = null;
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/defaultObjectAcl/' + common_internal.Escaper.ecapeVariable('$entity');
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket') + '/defaultObjectAcl/' + commons.Escaper.ecapeVariable('$entity');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -930,7 +931,7 @@
    *
    * Completes with a [ObjectAccessControl].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -941,7 +942,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (bucket == null) {
@@ -952,7 +953,7 @@
     }
 
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/defaultObjectAcl/' + common_internal.Escaper.ecapeVariable('$entity');
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket') + '/defaultObjectAcl/' + commons.Escaper.ecapeVariable('$entity');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -975,7 +976,7 @@
    *
    * Completes with a [ObjectAccessControl].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -986,7 +987,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -997,7 +998,7 @@
     }
 
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/defaultObjectAcl';
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket') + '/defaultObjectAcl';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1024,7 +1025,7 @@
    *
    * Completes with a [ObjectAccessControls].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1035,7 +1036,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (bucket == null) {
@@ -1049,7 +1050,7 @@
     }
 
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/defaultObjectAcl';
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket') + '/defaultObjectAcl';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1077,7 +1078,7 @@
    *
    * Completes with a [ObjectAccessControl].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1088,7 +1089,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1102,7 +1103,7 @@
     }
 
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/defaultObjectAcl/' + common_internal.Escaper.ecapeVariable('$entity');
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket') + '/defaultObjectAcl/' + commons.Escaper.ecapeVariable('$entity');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1129,7 +1130,7 @@
    *
    * Completes with a [ObjectAccessControl].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1140,7 +1141,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1154,7 +1155,7 @@
     }
 
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/defaultObjectAcl/' + common_internal.Escaper.ecapeVariable('$entity');
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket') + '/defaultObjectAcl/' + commons.Escaper.ecapeVariable('$entity');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1169,11 +1170,10 @@
 }
 
 
-/** Not documented yet. */
 class ObjectAccessControlsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ObjectAccessControlsResourceApi(common_internal.ApiRequester client) : 
+  ObjectAccessControlsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1193,7 +1193,7 @@
    * [generation] - If present, selects a specific revision of this object (as
    * opposed to the latest version, the default).
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1204,7 +1204,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (bucket == null) {
@@ -1222,7 +1222,7 @@
 
     _downloadOptions = null;
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/o/' + common_internal.Escaper.ecapeVariable('$object') + '/acl/' + common_internal.Escaper.ecapeVariable('$entity');
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket') + '/o/' + commons.Escaper.ecapeVariable('$object') + '/acl/' + commons.Escaper.ecapeVariable('$entity');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1252,7 +1252,7 @@
    *
    * Completes with a [ObjectAccessControl].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1263,7 +1263,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (bucket == null) {
@@ -1280,7 +1280,7 @@
     }
 
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/o/' + common_internal.Escaper.ecapeVariable('$object') + '/acl/' + common_internal.Escaper.ecapeVariable('$entity');
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket') + '/o/' + commons.Escaper.ecapeVariable('$object') + '/acl/' + commons.Escaper.ecapeVariable('$entity');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1308,7 +1308,7 @@
    *
    * Completes with a [ObjectAccessControl].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1319,7 +1319,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1336,7 +1336,7 @@
     }
 
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/o/' + common_internal.Escaper.ecapeVariable('$object') + '/acl';
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket') + '/o/' + commons.Escaper.ecapeVariable('$object') + '/acl';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1362,7 +1362,7 @@
    *
    * Completes with a [ObjectAccessControls].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1373,7 +1373,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (bucket == null) {
@@ -1387,7 +1387,7 @@
     }
 
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/o/' + common_internal.Escaper.ecapeVariable('$object') + '/acl';
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket') + '/o/' + commons.Escaper.ecapeVariable('$object') + '/acl';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1420,7 +1420,7 @@
    *
    * Completes with a [ObjectAccessControl].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1431,7 +1431,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1451,7 +1451,7 @@
     }
 
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/o/' + common_internal.Escaper.ecapeVariable('$object') + '/acl/' + common_internal.Escaper.ecapeVariable('$entity');
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket') + '/o/' + commons.Escaper.ecapeVariable('$object') + '/acl/' + commons.Escaper.ecapeVariable('$entity');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -1483,7 +1483,7 @@
    *
    * Completes with a [ObjectAccessControl].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1494,7 +1494,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1514,7 +1514,7 @@
     }
 
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/o/' + common_internal.Escaper.ecapeVariable('$object') + '/acl/' + common_internal.Escaper.ecapeVariable('$entity');
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket') + '/o/' + commons.Escaper.ecapeVariable('$object') + '/acl/' + commons.Escaper.ecapeVariable('$entity');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1529,11 +1529,10 @@
 }
 
 
-/** Not documented yet. */
 class ObjectsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ObjectsResourceApi(common_internal.ApiRequester client) : 
+  ObjectsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1563,6 +1562,18 @@
    * - "publicRead" : Object owner gets OWNER access, and allUsers get READER
    * access.
    *
+   * [encryptionAlgorithm] - Specifies the encryption algorithm that was used to
+   * encrypt the object, if any. Only 'AES256' is supported currently.
+   * Algorithm, key, and key hash must be supplied together.
+   *
+   * [encryptionKey] - Provides a base64-encoded 256-bit key that was used to
+   * encrypt the object, if any. Algorithm, key, and key hash must be supplied
+   * together.
+   *
+   * [encryptionKeyHash] - Provides the digest of the key for error-checking
+   * transmission. A digest is in the format of '='. Algorithm, key, and key
+   * hash must be supplied together.
+   *
    * [ifGenerationMatch] - Makes the operation conditional on whether the
    * object's current generation matches the given value.
    *
@@ -1577,20 +1588,20 @@
    *
    * - [Object] for Metadata downloads (see [downloadOptions]).
    *
-   * - [common.Media] for Media downloads (see [downloadOptions]).
+   * - [commons.Media] for Media downloads (see [downloadOptions]).
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future compose(ComposeRequest request, core.String destinationBucket, core.String destinationObject, {core.String destinationPredefinedAcl, core.String ifGenerationMatch, core.String ifMetagenerationMatch, common.DownloadOptions downloadOptions: common.DownloadOptions.Metadata}) {
+  async.Future compose(ComposeRequest request, core.String destinationBucket, core.String destinationObject, {core.String destinationPredefinedAcl, core.String encryptionAlgorithm, core.String encryptionKey, core.String encryptionKeyHash, core.String ifGenerationMatch, core.String ifMetagenerationMatch, commons.DownloadOptions downloadOptions: commons.DownloadOptions.Metadata}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1605,6 +1616,15 @@
     if (destinationPredefinedAcl != null) {
       _queryParams["destinationPredefinedAcl"] = [destinationPredefinedAcl];
     }
+    if (encryptionAlgorithm != null) {
+      _queryParams["encryptionAlgorithm"] = [encryptionAlgorithm];
+    }
+    if (encryptionKey != null) {
+      _queryParams["encryptionKey"] = [encryptionKey];
+    }
+    if (encryptionKeyHash != null) {
+      _queryParams["encryptionKeyHash"] = [encryptionKeyHash];
+    }
     if (ifGenerationMatch != null) {
       _queryParams["ifGenerationMatch"] = [ifGenerationMatch];
     }
@@ -1614,7 +1634,7 @@
 
     _downloadOptions = downloadOptions;
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$destinationBucket') + '/o/' + common_internal.Escaper.ecapeVariable('$destinationObject') + '/compose';
+    _url = 'b/' + commons.Escaper.ecapeVariable('$destinationBucket') + '/o/' + commons.Escaper.ecapeVariable('$destinationObject') + '/compose';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1624,7 +1644,7 @@
                                        uploadMedia: _uploadMedia,
                                        downloadOptions: _downloadOptions);
     if (_downloadOptions == null ||
-        _downloadOptions == common.DownloadOptions.Metadata) {
+        _downloadOptions == commons.DownloadOptions.Metadata) {
       return _response.then((data) => new Object.fromJson(data));
     } else {
       return _response;
@@ -1664,6 +1684,18 @@
    * - "publicRead" : Object owner gets OWNER access, and allUsers get READER
    * access.
    *
+   * [encryptionAlgorithm] - Specifies the encryption algorithm that was used to
+   * encrypt the object, if any. Only 'AES256' is supported currently.
+   * Algorithm, key, and key hash must be supplied together.
+   *
+   * [encryptionKey] - Provides a base64-encoded 256-bit key that was used to
+   * encrypt the object, if any. Algorithm, key, and key hash must be supplied
+   * together.
+   *
+   * [encryptionKeyHash] - Provides the digest of the key for error-checking
+   * transmission. A digest is in the format of '='. Algorithm, key, and key
+   * hash must be supplied together.
+   *
    * [ifGenerationMatch] - Makes the operation conditional on whether the
    * destination object's current generation matches the given value.
    *
@@ -1706,20 +1738,20 @@
    *
    * - [Object] for Metadata downloads (see [downloadOptions]).
    *
-   * - [common.Media] for Media downloads (see [downloadOptions]).
+   * - [commons.Media] for Media downloads (see [downloadOptions]).
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future copy(Object request, core.String sourceBucket, core.String sourceObject, core.String destinationBucket, core.String destinationObject, {core.String destinationPredefinedAcl, core.String ifGenerationMatch, core.String ifGenerationNotMatch, core.String ifMetagenerationMatch, core.String ifMetagenerationNotMatch, core.String ifSourceGenerationMatch, core.String ifSourceGenerationNotMatch, core.String ifSourceMetagenerationMatch, core.String ifSourceMetagenerationNotMatch, core.String projection, core.String sourceGeneration, common.DownloadOptions downloadOptions: common.DownloadOptions.Metadata}) {
+  async.Future copy(Object request, core.String sourceBucket, core.String sourceObject, core.String destinationBucket, core.String destinationObject, {core.String destinationPredefinedAcl, core.String encryptionAlgorithm, core.String encryptionKey, core.String encryptionKeyHash, core.String ifGenerationMatch, core.String ifGenerationNotMatch, core.String ifMetagenerationMatch, core.String ifMetagenerationNotMatch, core.String ifSourceGenerationMatch, core.String ifSourceGenerationNotMatch, core.String ifSourceMetagenerationMatch, core.String ifSourceMetagenerationNotMatch, core.String projection, core.String sourceGeneration, commons.DownloadOptions downloadOptions: commons.DownloadOptions.Metadata}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1740,6 +1772,15 @@
     if (destinationPredefinedAcl != null) {
       _queryParams["destinationPredefinedAcl"] = [destinationPredefinedAcl];
     }
+    if (encryptionAlgorithm != null) {
+      _queryParams["encryptionAlgorithm"] = [encryptionAlgorithm];
+    }
+    if (encryptionKey != null) {
+      _queryParams["encryptionKey"] = [encryptionKey];
+    }
+    if (encryptionKeyHash != null) {
+      _queryParams["encryptionKeyHash"] = [encryptionKeyHash];
+    }
     if (ifGenerationMatch != null) {
       _queryParams["ifGenerationMatch"] = [ifGenerationMatch];
     }
@@ -1773,7 +1814,7 @@
 
     _downloadOptions = downloadOptions;
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$sourceBucket') + '/o/' + common_internal.Escaper.ecapeVariable('$sourceObject') + '/copyTo/b/' + common_internal.Escaper.ecapeVariable('$destinationBucket') + '/o/' + common_internal.Escaper.ecapeVariable('$destinationObject');
+    _url = 'b/' + commons.Escaper.ecapeVariable('$sourceBucket') + '/o/' + commons.Escaper.ecapeVariable('$sourceObject') + '/copyTo/b/' + commons.Escaper.ecapeVariable('$destinationBucket') + '/o/' + commons.Escaper.ecapeVariable('$destinationObject');
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1783,7 +1824,7 @@
                                        uploadMedia: _uploadMedia,
                                        downloadOptions: _downloadOptions);
     if (_downloadOptions == null ||
-        _downloadOptions == common.DownloadOptions.Metadata) {
+        _downloadOptions == commons.DownloadOptions.Metadata) {
       return _response.then((data) => new Object.fromJson(data));
     } else {
       return _response;
@@ -1815,7 +1856,7 @@
    * [ifMetagenerationNotMatch] - Makes the operation conditional on whether the
    * object's current metageneration does not match the given value.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1826,7 +1867,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (bucket == null) {
@@ -1853,7 +1894,7 @@
 
     _downloadOptions = null;
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/o/' + common_internal.Escaper.ecapeVariable('$object');
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket') + '/o/' + commons.Escaper.ecapeVariable('$object');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1874,6 +1915,17 @@
    *
    * [object] - Name of the object.
    *
+   * [encryptionAlgorithm] - Specifies the encryption algorithm that would be
+   * used to decrypt the object. Only 'AES256' is supported currently.
+   * Algorithm, key, and key hash must be supplied together.
+   *
+   * [encryptionKey] - Provides a base64-encoded 256-bit key to decrypt the
+   * object. Algorithm, key, and key hash must be supplied together.
+   *
+   * [encryptionKeyHash] - Provides the digest of the key for error-checking
+   * transmission. A digest is in the format of '='. Algorithm, key, and key
+   * hash must be supplied together.
+   *
    * [generation] - If present, selects a specific revision of this object (as
    * opposed to the latest version, the default).
    *
@@ -1902,20 +1954,20 @@
    *
    * - [Object] for Metadata downloads (see [downloadOptions]).
    *
-   * - [common.Media] for Media downloads (see [downloadOptions]).
+   * - [commons.Media] for Media downloads (see [downloadOptions]).
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future get(core.String bucket, core.String object, {core.String generation, core.String ifGenerationMatch, core.String ifGenerationNotMatch, core.String ifMetagenerationMatch, core.String ifMetagenerationNotMatch, core.String projection, common.DownloadOptions downloadOptions: common.DownloadOptions.Metadata}) {
+  async.Future get(core.String bucket, core.String object, {core.String encryptionAlgorithm, core.String encryptionKey, core.String encryptionKeyHash, core.String generation, core.String ifGenerationMatch, core.String ifGenerationNotMatch, core.String ifMetagenerationMatch, core.String ifMetagenerationNotMatch, core.String projection, commons.DownloadOptions downloadOptions: commons.DownloadOptions.Metadata}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (bucket == null) {
@@ -1924,6 +1976,15 @@
     if (object == null) {
       throw new core.ArgumentError("Parameter object is required.");
     }
+    if (encryptionAlgorithm != null) {
+      _queryParams["encryptionAlgorithm"] = [encryptionAlgorithm];
+    }
+    if (encryptionKey != null) {
+      _queryParams["encryptionKey"] = [encryptionKey];
+    }
+    if (encryptionKeyHash != null) {
+      _queryParams["encryptionKeyHash"] = [encryptionKeyHash];
+    }
     if (generation != null) {
       _queryParams["generation"] = [generation];
     }
@@ -1945,7 +2006,7 @@
 
     _downloadOptions = downloadOptions;
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/o/' + common_internal.Escaper.ecapeVariable('$object');
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket') + '/o/' + commons.Escaper.ecapeVariable('$object');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1955,7 +2016,7 @@
                                        uploadMedia: _uploadMedia,
                                        downloadOptions: _downloadOptions);
     if (_downloadOptions == null ||
-        _downloadOptions == common.DownloadOptions.Metadata) {
+        _downloadOptions == commons.DownloadOptions.Metadata) {
       return _response.then((data) => new Object.fromJson(data));
     } else {
       return _response;
@@ -1978,6 +2039,17 @@
    * object with uploadType=media to indicate the encoding of the content being
    * uploaded.
    *
+   * [encryptionAlgorithm] - Specifies the encryption algorithm that would be
+   * used to encrypt the object. Only 'AES256' is supported currently.
+   * Algorithm, key, and key hash must be supplied together.
+   *
+   * [encryptionKey] - Provides a base64-encoded 256-bit key to encrypt the
+   * object. Algorithm, key, and key hash must be supplied together.
+   *
+   * [encryptionKeyHash] - Provides the digest of the key for error-checking
+   * transmission. A digest is in the format of '='. Algorithm, key, and key
+   * hash must be supplied together.
+   *
    * [ifGenerationMatch] - Makes the operation conditional on whether the
    * object's current generation matches the given value.
    *
@@ -2026,20 +2098,20 @@
    *
    * - [Object] for Metadata downloads (see [downloadOptions]).
    *
-   * - [common.Media] for Media downloads (see [downloadOptions]).
+   * - [commons.Media] for Media downloads (see [downloadOptions]).
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future insert(Object request, core.String bucket, {core.String contentEncoding, core.String ifGenerationMatch, core.String ifGenerationNotMatch, core.String ifMetagenerationMatch, core.String ifMetagenerationNotMatch, core.String name, core.String predefinedAcl, core.String projection, common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia, common.DownloadOptions downloadOptions: common.DownloadOptions.Metadata}) {
+  async.Future insert(Object request, core.String bucket, {core.String contentEncoding, core.String encryptionAlgorithm, core.String encryptionKey, core.String encryptionKeyHash, core.String ifGenerationMatch, core.String ifGenerationNotMatch, core.String ifMetagenerationMatch, core.String ifMetagenerationNotMatch, core.String name, core.String predefinedAcl, core.String projection, commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia, commons.DownloadOptions downloadOptions: commons.DownloadOptions.Metadata}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2051,6 +2123,15 @@
     if (contentEncoding != null) {
       _queryParams["contentEncoding"] = [contentEncoding];
     }
+    if (encryptionAlgorithm != null) {
+      _queryParams["encryptionAlgorithm"] = [encryptionAlgorithm];
+    }
+    if (encryptionKey != null) {
+      _queryParams["encryptionKey"] = [encryptionKey];
+    }
+    if (encryptionKeyHash != null) {
+      _queryParams["encryptionKeyHash"] = [encryptionKeyHash];
+    }
     if (ifGenerationMatch != null) {
       _queryParams["ifGenerationMatch"] = [ifGenerationMatch];
     }
@@ -2078,11 +2159,11 @@
     _downloadOptions = downloadOptions;
 
     if (_uploadMedia == null) {
-      _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/o';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
-      _url = '/resumable/upload/storage/v1/b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/o';
+      _url = 'b/' + commons.Escaper.ecapeVariable('$bucket') + '/o';
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/storage/v1/b/' + commons.Escaper.ecapeVariable('$bucket') + '/o';
     } else {
-      _url = '/upload/storage/v1/b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/o';
+      _url = '/upload/storage/v1/b/' + commons.Escaper.ecapeVariable('$bucket') + '/o';
     }
 
 
@@ -2094,7 +2175,7 @@
                                        uploadMedia: _uploadMedia,
                                        downloadOptions: _downloadOptions);
     if (_downloadOptions == null ||
-        _downloadOptions == common.DownloadOptions.Metadata) {
+        _downloadOptions == commons.DownloadOptions.Metadata) {
       return _response.then((data) => new Object.fromJson(data));
     } else {
       return _response;
@@ -2132,7 +2213,7 @@
    *
    * Completes with a [Objects].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2143,7 +2224,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (bucket == null) {
@@ -2169,7 +2250,7 @@
     }
 
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/o';
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket') + '/o';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2192,6 +2273,19 @@
    *
    * [object] - Name of the object.
    *
+   * [encryptionAlgorithm] - For downloading encrypted objects, specifies the
+   * encryption algorithm that would be used to decrypt the object. Only
+   * 'AES256' is supported currently. Algorithm, key, and key hash must be
+   * supplied together.
+   *
+   * [encryptionKey] - For downloading encrypted objects, provides a
+   * base64-encoded 256-bit key to decrypt the object. Algorithm, key, and key
+   * hash must be supplied together.
+   *
+   * [encryptionKeyHash] - For downloading encrypted objects, provides the
+   * digest of the key for error-checking transmission. A digest is in the
+   * format of '='. Algorithm, key, and key hash must be supplied together.
+   *
    * [generation] - If present, selects a specific revision of this object (as
    * opposed to the latest version, the default).
    *
@@ -2228,18 +2322,18 @@
    *
    * Completes with a [Object].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<Object> patch(Object request, core.String bucket, core.String object, {core.String generation, core.String ifGenerationMatch, core.String ifGenerationNotMatch, core.String ifMetagenerationMatch, core.String ifMetagenerationNotMatch, core.String predefinedAcl, core.String projection}) {
+  async.Future<Object> patch(Object request, core.String bucket, core.String object, {core.String encryptionAlgorithm, core.String encryptionKey, core.String encryptionKeyHash, core.String generation, core.String ifGenerationMatch, core.String ifGenerationNotMatch, core.String ifMetagenerationMatch, core.String ifMetagenerationNotMatch, core.String predefinedAcl, core.String projection}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2251,6 +2345,15 @@
     if (object == null) {
       throw new core.ArgumentError("Parameter object is required.");
     }
+    if (encryptionAlgorithm != null) {
+      _queryParams["encryptionAlgorithm"] = [encryptionAlgorithm];
+    }
+    if (encryptionKey != null) {
+      _queryParams["encryptionKey"] = [encryptionKey];
+    }
+    if (encryptionKeyHash != null) {
+      _queryParams["encryptionKeyHash"] = [encryptionKeyHash];
+    }
     if (generation != null) {
       _queryParams["generation"] = [generation];
     }
@@ -2274,7 +2377,7 @@
     }
 
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/o/' + common_internal.Escaper.ecapeVariable('$object');
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket') + '/o/' + commons.Escaper.ecapeVariable('$object');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -2297,6 +2400,19 @@
    *
    * [object] - Name of the object.
    *
+   * [encryptionAlgorithm] - For downloading encrypted objects, specifies the
+   * encryption algorithm that would be used to decrypt the object. Only
+   * 'AES256' is supported currently. Algorithm, key, and key hash must be
+   * supplied together.
+   *
+   * [encryptionKey] - For downloading encrypted objects, provides a
+   * base64-encoded 256-bit key to decrypt the object. Algorithm, key, and key
+   * hash must be supplied together.
+   *
+   * [encryptionKeyHash] - For downloading encrypted objects, provides the
+   * digest of the key for error-checking transmission. A digest is in the
+   * format of '='. Algorithm, key, and key hash must be supplied together.
+   *
    * [generation] - If present, selects a specific revision of this object (as
    * opposed to the latest version, the default).
    *
@@ -2339,20 +2455,20 @@
    *
    * - [Object] for Metadata downloads (see [downloadOptions]).
    *
-   * - [common.Media] for Media downloads (see [downloadOptions]).
+   * - [commons.Media] for Media downloads (see [downloadOptions]).
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future update(Object request, core.String bucket, core.String object, {core.String generation, core.String ifGenerationMatch, core.String ifGenerationNotMatch, core.String ifMetagenerationMatch, core.String ifMetagenerationNotMatch, core.String predefinedAcl, core.String projection, common.DownloadOptions downloadOptions: common.DownloadOptions.Metadata}) {
+  async.Future update(Object request, core.String bucket, core.String object, {core.String encryptionAlgorithm, core.String encryptionKey, core.String encryptionKeyHash, core.String generation, core.String ifGenerationMatch, core.String ifGenerationNotMatch, core.String ifMetagenerationMatch, core.String ifMetagenerationNotMatch, core.String predefinedAcl, core.String projection, commons.DownloadOptions downloadOptions: commons.DownloadOptions.Metadata}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2364,6 +2480,15 @@
     if (object == null) {
       throw new core.ArgumentError("Parameter object is required.");
     }
+    if (encryptionAlgorithm != null) {
+      _queryParams["encryptionAlgorithm"] = [encryptionAlgorithm];
+    }
+    if (encryptionKey != null) {
+      _queryParams["encryptionKey"] = [encryptionKey];
+    }
+    if (encryptionKeyHash != null) {
+      _queryParams["encryptionKeyHash"] = [encryptionKeyHash];
+    }
     if (generation != null) {
       _queryParams["generation"] = [generation];
     }
@@ -2388,7 +2513,7 @@
 
     _downloadOptions = downloadOptions;
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/o/' + common_internal.Escaper.ecapeVariable('$object');
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket') + '/o/' + commons.Escaper.ecapeVariable('$object');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -2398,7 +2523,7 @@
                                        uploadMedia: _uploadMedia,
                                        downloadOptions: _downloadOptions);
     if (_downloadOptions == null ||
-        _downloadOptions == common.DownloadOptions.Metadata) {
+        _downloadOptions == commons.DownloadOptions.Metadata) {
       return _response.then((data) => new Object.fromJson(data));
     } else {
       return _response;
@@ -2438,7 +2563,7 @@
    *
    * Completes with a [Channel].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2449,7 +2574,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2478,7 +2603,7 @@
     }
 
 
-    _url = 'b/' + common_internal.Escaper.ecapeVariable('$bucket') + '/o/watch';
+    _url = 'b/' + commons.Escaper.ecapeVariable('$bucket') + '/o/watch';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2494,7 +2619,6 @@
 
 
 
-/** Not documented yet. */
 class BucketCors {
   /**
    * The value, in seconds, to return in the  Access-Control-Max-Age header used
@@ -2647,7 +2771,6 @@
 }
 
 
-/** Not documented yet. */
 class BucketLifecycleRule {
   /** The action to take. */
   BucketLifecycleRuleAction action;
@@ -2901,9 +3024,9 @@
 
   /**
    * The bucket's storage class. This defines how objects in the bucket are
-   * stored and determines the SLA and the cost of storage. Typical values are
-   * STANDARD and DURABLE_REDUCED_AVAILABILITY. Defaults to STANDARD. See the
-   * developer's guide for the authoritative list.
+   * stored and determines the SLA and the cost of storage. Values include
+   * STANDARD, NEARLINE and DURABLE_REDUCED_AVAILABILITY. Defaults to STANDARD.
+   * For more information, see storage classes.
    */
   core.String storageClass;
 
@@ -3431,7 +3554,6 @@
 }
 
 
-/** Not documented yet. */
 class ComposeRequestSourceObjects {
   /** The generation of this object to use as the source. */
   core.String generation;
@@ -4086,5 +4208,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/tagmanager/v1.dart b/generated/googleapis/lib/tagmanager/v1.dart
index 5a59ac3..9e02bf4 100644
--- a/generated/googleapis/lib/tagmanager/v1.dart
+++ b/generated/googleapis/lib/tagmanager/v1.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.tagmanager.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client tagmanager/v1';
 
 /** API for accessing Tag Manager accounts and containers. */
 class TagmanagerApi {
@@ -37,23 +40,22 @@
   static const TagmanagerReadonlyScope = "https://www.googleapis.com/auth/tagmanager.readonly";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AccountsResourceApi get accounts => new AccountsResourceApi(_requester);
 
   TagmanagerApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "tagmanager/v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class AccountsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AccountsContainersResourceApi get containers => new AccountsContainersResourceApi(_requester);
   AccountsPermissionsResourceApi get permissions => new AccountsPermissionsResourceApi(_requester);
 
-  AccountsResourceApi(common_internal.ApiRequester client) : 
+  AccountsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -65,7 +67,7 @@
    *
    * Completes with a [Account].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -76,7 +78,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -84,7 +86,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -103,7 +105,7 @@
    *
    * Completes with a [ListAccountsResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -114,7 +116,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -145,7 +147,7 @@
    *
    * Completes with a [Account].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -156,7 +158,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -170,7 +172,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -185,9 +187,8 @@
 }
 
 
-/** Not documented yet. */
 class AccountsContainersResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   AccountsContainersMacrosResourceApi get macros => new AccountsContainersMacrosResourceApi(_requester);
   AccountsContainersRulesResourceApi get rules => new AccountsContainersRulesResourceApi(_requester);
@@ -196,7 +197,7 @@
   AccountsContainersVariablesResourceApi get variables => new AccountsContainersVariablesResourceApi(_requester);
   AccountsContainersVersionsResourceApi get versions => new AccountsContainersVersionsResourceApi(_requester);
 
-  AccountsContainersResourceApi(common_internal.ApiRequester client) : 
+  AccountsContainersResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -210,7 +211,7 @@
    *
    * Completes with a [Container].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -221,7 +222,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -232,7 +233,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -253,7 +254,7 @@
    *
    * [containerId] - The GTM Container ID.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -264,7 +265,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -276,7 +277,7 @@
 
     _downloadOptions = null;
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -299,7 +300,7 @@
    *
    * Completes with a [Container].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -310,7 +311,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -321,7 +322,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -342,7 +343,7 @@
    *
    * Completes with a [ListContainersResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -353,7 +354,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -361,7 +362,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -389,7 +390,7 @@
    *
    * Completes with a [Container].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -400,7 +401,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -417,7 +418,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -432,11 +433,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsContainersMacrosResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsContainersMacrosResourceApi(common_internal.ApiRequester client) : 
+  AccountsContainersMacrosResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -452,7 +452,7 @@
    *
    * Completes with a [Macro].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -463,7 +463,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -477,7 +477,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/macros';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/macros';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -500,7 +500,7 @@
    *
    * [macroId] - The GTM Macro ID.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -511,7 +511,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -526,7 +526,7 @@
 
     _downloadOptions = null;
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/macros/' + common_internal.Escaper.ecapeVariable('$macroId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/macros/' + commons.Escaper.ecapeVariable('$macroId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -551,7 +551,7 @@
    *
    * Completes with a [Macro].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -562,7 +562,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -576,7 +576,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/macros/' + common_internal.Escaper.ecapeVariable('$macroId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/macros/' + commons.Escaper.ecapeVariable('$macroId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -599,7 +599,7 @@
    *
    * Completes with a [ListMacrosResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -610,7 +610,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -621,7 +621,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/macros';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/macros';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -651,7 +651,7 @@
    *
    * Completes with a [Macro].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -662,7 +662,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -682,7 +682,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/macros/' + common_internal.Escaper.ecapeVariable('$macroId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/macros/' + commons.Escaper.ecapeVariable('$macroId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -697,11 +697,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsContainersRulesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsContainersRulesResourceApi(common_internal.ApiRequester client) : 
+  AccountsContainersRulesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -717,7 +716,7 @@
    *
    * Completes with a [Rule].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -728,7 +727,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -742,7 +741,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/rules';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/rules';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -765,7 +764,7 @@
    *
    * [ruleId] - The GTM Rule ID.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -776,7 +775,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -791,7 +790,7 @@
 
     _downloadOptions = null;
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/rules/' + common_internal.Escaper.ecapeVariable('$ruleId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/rules/' + commons.Escaper.ecapeVariable('$ruleId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -816,7 +815,7 @@
    *
    * Completes with a [Rule].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -827,7 +826,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -841,7 +840,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/rules/' + common_internal.Escaper.ecapeVariable('$ruleId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/rules/' + commons.Escaper.ecapeVariable('$ruleId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -864,7 +863,7 @@
    *
    * Completes with a [ListRulesResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -875,7 +874,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -886,7 +885,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/rules';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/rules';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -916,7 +915,7 @@
    *
    * Completes with a [Rule].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -927,7 +926,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -947,7 +946,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/rules/' + common_internal.Escaper.ecapeVariable('$ruleId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/rules/' + commons.Escaper.ecapeVariable('$ruleId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -962,11 +961,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsContainersTagsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsContainersTagsResourceApi(common_internal.ApiRequester client) : 
+  AccountsContainersTagsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -982,7 +980,7 @@
    *
    * Completes with a [Tag].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -993,7 +991,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1007,7 +1005,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/tags';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/tags';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1030,7 +1028,7 @@
    *
    * [tagId] - The GTM Tag ID.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1041,7 +1039,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -1056,7 +1054,7 @@
 
     _downloadOptions = null;
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/tags/' + common_internal.Escaper.ecapeVariable('$tagId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/tags/' + commons.Escaper.ecapeVariable('$tagId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1081,7 +1079,7 @@
    *
    * Completes with a [Tag].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1092,7 +1090,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -1106,7 +1104,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/tags/' + common_internal.Escaper.ecapeVariable('$tagId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/tags/' + commons.Escaper.ecapeVariable('$tagId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1129,7 +1127,7 @@
    *
    * Completes with a [ListTagsResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1140,7 +1138,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -1151,7 +1149,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/tags';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/tags';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1181,7 +1179,7 @@
    *
    * Completes with a [Tag].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1192,7 +1190,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1212,7 +1210,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/tags/' + common_internal.Escaper.ecapeVariable('$tagId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/tags/' + commons.Escaper.ecapeVariable('$tagId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1227,11 +1225,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsContainersTriggersResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsContainersTriggersResourceApi(common_internal.ApiRequester client) : 
+  AccountsContainersTriggersResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1247,7 +1244,7 @@
    *
    * Completes with a [Trigger].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1258,7 +1255,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1272,7 +1269,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/triggers';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/triggers';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1295,7 +1292,7 @@
    *
    * [triggerId] - The GTM Trigger ID.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1306,7 +1303,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -1321,7 +1318,7 @@
 
     _downloadOptions = null;
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/triggers/' + common_internal.Escaper.ecapeVariable('$triggerId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/triggers/' + commons.Escaper.ecapeVariable('$triggerId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1346,7 +1343,7 @@
    *
    * Completes with a [Trigger].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1357,7 +1354,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -1371,7 +1368,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/triggers/' + common_internal.Escaper.ecapeVariable('$triggerId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/triggers/' + commons.Escaper.ecapeVariable('$triggerId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1394,7 +1391,7 @@
    *
    * Completes with a [ListTriggersResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1405,7 +1402,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -1416,7 +1413,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/triggers';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/triggers';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1446,7 +1443,7 @@
    *
    * Completes with a [Trigger].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1457,7 +1454,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1477,7 +1474,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/triggers/' + common_internal.Escaper.ecapeVariable('$triggerId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/triggers/' + commons.Escaper.ecapeVariable('$triggerId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1492,11 +1489,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsContainersVariablesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsContainersVariablesResourceApi(common_internal.ApiRequester client) : 
+  AccountsContainersVariablesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1512,7 +1508,7 @@
    *
    * Completes with a [Variable].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1523,7 +1519,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1537,7 +1533,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/variables';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/variables';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1560,7 +1556,7 @@
    *
    * [variableId] - The GTM Variable ID.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1571,7 +1567,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -1586,7 +1582,7 @@
 
     _downloadOptions = null;
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/variables/' + common_internal.Escaper.ecapeVariable('$variableId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/variables/' + commons.Escaper.ecapeVariable('$variableId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1611,7 +1607,7 @@
    *
    * Completes with a [Variable].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1622,7 +1618,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -1636,7 +1632,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/variables/' + common_internal.Escaper.ecapeVariable('$variableId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/variables/' + commons.Escaper.ecapeVariable('$variableId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1659,7 +1655,7 @@
    *
    * Completes with a [ListVariablesResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1670,7 +1666,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -1681,7 +1677,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/variables';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/variables';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1711,7 +1707,7 @@
    *
    * Completes with a [Variable].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1722,7 +1718,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1742,7 +1738,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/variables/' + common_internal.Escaper.ecapeVariable('$variableId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/variables/' + commons.Escaper.ecapeVariable('$variableId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -1757,11 +1753,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsContainersVersionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsContainersVersionsResourceApi(common_internal.ApiRequester client) : 
+  AccountsContainersVersionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1777,7 +1772,7 @@
    *
    * Completes with a [CreateContainerVersionResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1788,7 +1783,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1802,7 +1797,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/versions';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/versions';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -1825,7 +1820,7 @@
    *
    * [containerVersionId] - The GTM Container Version ID.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1836,7 +1831,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -1851,7 +1846,7 @@
 
     _downloadOptions = null;
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/versions/' + common_internal.Escaper.ecapeVariable('$containerVersionId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/versions/' + commons.Escaper.ecapeVariable('$containerVersionId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -1877,7 +1872,7 @@
    *
    * Completes with a [ContainerVersion].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1888,7 +1883,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -1902,7 +1897,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/versions/' + common_internal.Escaper.ecapeVariable('$containerVersionId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/versions/' + commons.Escaper.ecapeVariable('$containerVersionId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1927,7 +1922,7 @@
    *
    * Completes with a [ListContainerVersionsResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1938,7 +1933,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -1952,7 +1947,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/versions';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/versions';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -1980,7 +1975,7 @@
    *
    * Completes with a [PublishContainerVersionResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1991,7 +1986,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -2008,7 +2003,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/versions/' + common_internal.Escaper.ecapeVariable('$containerVersionId') + '/publish';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/versions/' + commons.Escaper.ecapeVariable('$containerVersionId') + '/publish';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2036,7 +2031,7 @@
    *
    * Completes with a [ContainerVersion].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2047,7 +2042,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -2061,7 +2056,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/versions/' + common_internal.Escaper.ecapeVariable('$containerVersionId') + '/restore';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/versions/' + commons.Escaper.ecapeVariable('$containerVersionId') + '/restore';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2086,7 +2081,7 @@
    *
    * Completes with a [ContainerVersion].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2097,7 +2092,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -2111,7 +2106,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/versions/' + common_internal.Escaper.ecapeVariable('$containerVersionId') + '/undelete';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/versions/' + commons.Escaper.ecapeVariable('$containerVersionId') + '/undelete';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2141,7 +2136,7 @@
    *
    * Completes with a [ContainerVersion].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2152,7 +2147,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2172,7 +2167,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/containers/' + common_internal.Escaper.ecapeVariable('$containerId') + '/versions/' + common_internal.Escaper.ecapeVariable('$containerVersionId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/containers/' + commons.Escaper.ecapeVariable('$containerId') + '/versions/' + commons.Escaper.ecapeVariable('$containerVersionId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -2187,11 +2182,10 @@
 }
 
 
-/** Not documented yet. */
 class AccountsPermissionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  AccountsPermissionsResourceApi(common_internal.ApiRequester client) : 
+  AccountsPermissionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2205,7 +2199,7 @@
    *
    * Completes with a [UserAccess].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2216,7 +2210,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2227,7 +2221,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/permissions';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/permissions';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -2249,7 +2243,7 @@
    *
    * [permissionId] - The GTM User ID.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2260,7 +2254,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -2272,7 +2266,7 @@
 
     _downloadOptions = null;
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/permissions/' + common_internal.Escaper.ecapeVariable('$permissionId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/permissions/' + commons.Escaper.ecapeVariable('$permissionId');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -2295,7 +2289,7 @@
    *
    * Completes with a [UserAccess].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2306,7 +2300,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -2317,7 +2311,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/permissions/' + common_internal.Escaper.ecapeVariable('$permissionId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/permissions/' + commons.Escaper.ecapeVariable('$permissionId');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2340,7 +2334,7 @@
    *
    * Completes with a [ListAccountUsersResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2351,7 +2345,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (accountId == null) {
@@ -2359,7 +2353,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/permissions';
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/permissions';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -2384,7 +2378,7 @@
    *
    * Completes with a [UserAccess].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2395,7 +2389,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2409,7 +2403,7 @@
     }
 
 
-    _url = 'accounts/' + common_internal.Escaper.ecapeVariable('$accountId') + '/permissions/' + common_internal.Escaper.ecapeVariable('$permissionId');
+    _url = 'accounts/' + commons.Escaper.ecapeVariable('$accountId') + '/permissions/' + commons.Escaper.ecapeVariable('$permissionId');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -4207,5 +4201,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/tasks/v1.dart b/generated/googleapis/lib/tasks/v1.dart
index 3376ecc..8a86481 100644
--- a/generated/googleapis/lib/tasks/v1.dart
+++ b/generated/googleapis/lib/tasks/v1.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.tasks.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client tasks/v1';
 
 /** Lets you manage your tasks and task lists. */
 class TasksApi {
@@ -22,21 +25,20 @@
   static const TasksReadonlyScope = "https://www.googleapis.com/auth/tasks.readonly";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   TasklistsResourceApi get tasklists => new TasklistsResourceApi(_requester);
   TasksResourceApi get tasks => new TasksResourceApi(_requester);
 
   TasksApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "tasks/v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class TasklistsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  TasklistsResourceApi(common_internal.ApiRequester client) : 
+  TasklistsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -46,7 +48,7 @@
    *
    * [tasklist] - Task list identifier.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -57,7 +59,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tasklist == null) {
@@ -66,7 +68,7 @@
 
     _downloadOptions = null;
 
-    _url = 'users/@me/lists/' + common_internal.Escaper.ecapeVariable('$tasklist');
+    _url = 'users/@me/lists/' + commons.Escaper.ecapeVariable('$tasklist');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -87,7 +89,7 @@
    *
    * Completes with a [TaskList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -98,7 +100,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tasklist == null) {
@@ -106,7 +108,7 @@
     }
 
 
-    _url = 'users/@me/lists/' + common_internal.Escaper.ecapeVariable('$tasklist');
+    _url = 'users/@me/lists/' + commons.Escaper.ecapeVariable('$tasklist');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -127,7 +129,7 @@
    *
    * Completes with a [TaskList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -138,7 +140,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -170,7 +172,7 @@
    *
    * Completes with a [TaskLists].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -181,7 +183,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (maxResults != null) {
@@ -216,7 +218,7 @@
    *
    * Completes with a [TaskList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -227,7 +229,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -238,7 +240,7 @@
     }
 
 
-    _url = 'users/@me/lists/' + common_internal.Escaper.ecapeVariable('$tasklist');
+    _url = 'users/@me/lists/' + commons.Escaper.ecapeVariable('$tasklist');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -261,7 +263,7 @@
    *
    * Completes with a [TaskList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -272,7 +274,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -283,7 +285,7 @@
     }
 
 
-    _url = 'users/@me/lists/' + common_internal.Escaper.ecapeVariable('$tasklist');
+    _url = 'users/@me/lists/' + commons.Escaper.ecapeVariable('$tasklist');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -298,11 +300,10 @@
 }
 
 
-/** Not documented yet. */
 class TasksResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  TasksResourceApi(common_internal.ApiRequester client) : 
+  TasksResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -314,7 +315,7 @@
    *
    * [tasklist] - Task list identifier.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -325,7 +326,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tasklist == null) {
@@ -334,7 +335,7 @@
 
     _downloadOptions = null;
 
-    _url = 'lists/' + common_internal.Escaper.ecapeVariable('$tasklist') + '/clear';
+    _url = 'lists/' + commons.Escaper.ecapeVariable('$tasklist') + '/clear';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -355,7 +356,7 @@
    *
    * [task] - Task identifier.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -366,7 +367,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tasklist == null) {
@@ -378,7 +379,7 @@
 
     _downloadOptions = null;
 
-    _url = 'lists/' + common_internal.Escaper.ecapeVariable('$tasklist') + '/tasks/' + common_internal.Escaper.ecapeVariable('$task');
+    _url = 'lists/' + commons.Escaper.ecapeVariable('$tasklist') + '/tasks/' + commons.Escaper.ecapeVariable('$task');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -401,7 +402,7 @@
    *
    * Completes with a [Task].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -412,7 +413,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tasklist == null) {
@@ -423,7 +424,7 @@
     }
 
 
-    _url = 'lists/' + common_internal.Escaper.ecapeVariable('$tasklist') + '/tasks/' + common_internal.Escaper.ecapeVariable('$task');
+    _url = 'lists/' + commons.Escaper.ecapeVariable('$tasklist') + '/tasks/' + commons.Escaper.ecapeVariable('$task');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -452,7 +453,7 @@
    *
    * Completes with a [Task].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -463,7 +464,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -480,7 +481,7 @@
     }
 
 
-    _url = 'lists/' + common_internal.Escaper.ecapeVariable('$tasklist') + '/tasks';
+    _url = 'lists/' + commons.Escaper.ecapeVariable('$tasklist') + '/tasks';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -533,7 +534,7 @@
    *
    * Completes with a [Tasks].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -544,7 +545,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tasklist == null) {
@@ -582,7 +583,7 @@
     }
 
 
-    _url = 'lists/' + common_internal.Escaper.ecapeVariable('$tasklist') + '/tasks';
+    _url = 'lists/' + commons.Escaper.ecapeVariable('$tasklist') + '/tasks';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -613,7 +614,7 @@
    *
    * Completes with a [Task].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -624,7 +625,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (tasklist == null) {
@@ -641,7 +642,7 @@
     }
 
 
-    _url = 'lists/' + common_internal.Escaper.ecapeVariable('$tasklist') + '/tasks/' + common_internal.Escaper.ecapeVariable('$task') + '/move';
+    _url = 'lists/' + commons.Escaper.ecapeVariable('$tasklist') + '/tasks/' + commons.Escaper.ecapeVariable('$task') + '/move';
 
     var _response = _requester.request(_url,
                                        "POST",
@@ -666,7 +667,7 @@
    *
    * Completes with a [Task].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -677,7 +678,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -691,7 +692,7 @@
     }
 
 
-    _url = 'lists/' + common_internal.Escaper.ecapeVariable('$tasklist') + '/tasks/' + common_internal.Escaper.ecapeVariable('$task');
+    _url = 'lists/' + commons.Escaper.ecapeVariable('$tasklist') + '/tasks/' + commons.Escaper.ecapeVariable('$task');
 
     var _response = _requester.request(_url,
                                        "PATCH",
@@ -716,7 +717,7 @@
    *
    * Completes with a [Task].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -727,7 +728,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -741,7 +742,7 @@
     }
 
 
-    _url = 'lists/' + common_internal.Escaper.ecapeVariable('$tasklist') + '/tasks/' + common_internal.Escaper.ecapeVariable('$task');
+    _url = 'lists/' + commons.Escaper.ecapeVariable('$tasklist') + '/tasks/' + commons.Escaper.ecapeVariable('$task');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -757,7 +758,6 @@
 
 
 
-/** Not documented yet. */
 class TaskLinks {
   /** The description. In HTML speak: Everything between <a> and </a>. */
   core.String description;
@@ -799,7 +799,6 @@
 }
 
 
-/** Not documented yet. */
 class Task {
   /**
    * Completion date of the task (as a RFC 3339 timestamp). This field is
@@ -971,7 +970,6 @@
 }
 
 
-/** Not documented yet. */
 class TaskList {
   /** ETag of the resource. */
   core.String etag;
@@ -1043,7 +1041,6 @@
 }
 
 
-/** Not documented yet. */
 class TaskLists {
   /** ETag of the resource. */
   core.String etag;
@@ -1094,7 +1091,6 @@
 }
 
 
-/** Not documented yet. */
 class Tasks {
   /** ETag of the resource. */
   core.String etag;
@@ -1143,5 +1139,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/translate/v2.dart b/generated/googleapis/lib/translate/v2.dart
index 8ec23bd..62b174a 100644
--- a/generated/googleapis/lib/translate/v2.dart
+++ b/generated/googleapis/lib/translate/v2.dart
@@ -1,37 +1,39 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.translate.v2;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client translate/v2';
 
 /** Lets you translate text from one language to another */
 class TranslateApi {
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   DetectionsResourceApi get detections => new DetectionsResourceApi(_requester);
   LanguagesResourceApi get languages => new LanguagesResourceApi(_requester);
   TranslationsResourceApi get translations => new TranslationsResourceApi(_requester);
 
   TranslateApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "language/translate/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class DetectionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  DetectionsResourceApi(common_internal.ApiRequester client) : 
+  DetectionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -43,7 +45,7 @@
    *
    * Completes with a [DetectionsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -54,7 +56,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (q == null || q.isEmpty) {
@@ -78,11 +80,10 @@
 }
 
 
-/** Not documented yet. */
 class LanguagesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  LanguagesResourceApi(common_internal.ApiRequester client) : 
+  LanguagesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -95,7 +96,7 @@
    *
    * Completes with a [LanguagesListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -106,7 +107,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (target != null) {
@@ -129,11 +130,10 @@
 }
 
 
-/** Not documented yet. */
 class TranslationsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  TranslationsResourceApi(common_internal.ApiRequester client) : 
+  TranslationsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -156,7 +156,7 @@
    *
    * Completes with a [TranslationsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -167,7 +167,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (q == null || q.isEmpty) {
@@ -205,7 +205,6 @@
 
 
 
-/** Not documented yet. */
 class DetectionsListResponse {
   /** A detections contains detection results of several text */
   core.List<DetectionsResource> detections;
@@ -229,7 +228,6 @@
 }
 
 
-/** Not documented yet. */
 class DetectionsResourceElement {
   /** The confidence of the detection resul of this language. */
   core.double confidence;
@@ -302,7 +300,6 @@
 }
 
 
-/** Not documented yet. */
 class LanguagesListResponse {
   /**
    * List of source/target languages supported by the translation API. If target
@@ -331,7 +328,6 @@
 }
 
 
-/** Not documented yet. */
 class LanguagesResource {
   /** The language code. */
   core.String language;
@@ -364,7 +360,6 @@
 }
 
 
-/** Not documented yet. */
 class TranslationsListResponse {
   /** Translations contains list of translation results of given text */
   core.List<TranslationsResource> translations;
@@ -388,7 +383,6 @@
 }
 
 
-/** Not documented yet. */
 class TranslationsResource {
   /** Detected source language if source parameter is unspecified. */
   core.String detectedSourceLanguage;
@@ -419,5 +413,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/urlshortener/v1.dart b/generated/googleapis/lib/urlshortener/v1.dart
index 050ce0a..f449fb7 100644
--- a/generated/googleapis/lib/urlshortener/v1.dart
+++ b/generated/googleapis/lib/urlshortener/v1.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.urlshortener.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client urlshortener/v1';
 
 /** Lets you create, inspect, and manage goo.gl short URLs */
 class UrlshortenerApi {
@@ -19,20 +22,19 @@
   static const UrlshortenerScope = "https://www.googleapis.com/auth/urlshortener";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   UrlResourceApi get url => new UrlResourceApi(_requester);
 
   UrlshortenerApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "urlshortener/v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class UrlResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  UrlResourceApi(common_internal.ApiRequester client) : 
+  UrlResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -50,7 +52,7 @@
    *
    * Completes with a [Url].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -61,7 +63,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (shortUrl == null) {
@@ -94,7 +96,7 @@
    *
    * Completes with a [Url].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -105,7 +107,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -139,7 +141,7 @@
    *
    * Completes with a [UrlHistory].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -150,7 +152,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (projection != null) {
@@ -177,7 +179,6 @@
 
 
 
-/** Not documented yet. */
 class AnalyticsSnapshot {
   /**
    * Top browsers, e.g. "Chrome"; sorted by (descending) click counts. Only
@@ -258,7 +259,6 @@
 }
 
 
-/** Not documented yet. */
 class AnalyticsSummary {
   /** Click analytics over all time. */
   AnalyticsSnapshot allTime;
@@ -318,7 +318,6 @@
 }
 
 
-/** Not documented yet. */
 class StringCount {
   /**
    * Number of clicks for this top entry, e.g. for this particular country or
@@ -354,7 +353,6 @@
 }
 
 
-/** Not documented yet. */
 class Url {
   /**
    * A summary of the click analytics for the short and long URL. Might not be
@@ -436,7 +434,6 @@
 }
 
 
-/** Not documented yet. */
 class UrlHistory {
   /** A list of URL resources. */
   core.List<Url> items;
@@ -499,5 +496,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/webfonts/v1.dart b/generated/googleapis/lib/webfonts/v1.dart
index 784fe97..cbb199e 100644
--- a/generated/googleapis/lib/webfonts/v1.dart
+++ b/generated/googleapis/lib/webfonts/v1.dart
@@ -1,35 +1,37 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.webfonts.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client webfonts/v1';
 
 /** The Google Fonts Developer API. */
 class WebfontsApi {
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   WebfontsResourceApi get webfonts => new WebfontsResourceApi(_requester);
 
   WebfontsApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "webfonts/v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class WebfontsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  WebfontsResourceApi(common_internal.ApiRequester client) : 
+  WebfontsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -48,7 +50,7 @@
    *
    * Completes with a [WebfontList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -59,7 +61,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (sort != null) {
@@ -83,7 +85,6 @@
 
 
 
-/** Not documented yet. */
 class Webfont {
   /** The category of the font. */
   core.String category;
@@ -175,7 +176,6 @@
 }
 
 
-/** Not documented yet. */
 class WebfontList {
   /** The list of fonts currently served by the Google Fonts API. */
   core.List<Webfont> items;
@@ -208,5 +208,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/webmasters/v3.dart b/generated/googleapis/lib/webmasters/v3.dart
index e4f4ae4..923c202 100644
--- a/generated/googleapis/lib/webmasters/v3.dart
+++ b/generated/googleapis/lib/webmasters/v3.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.webmasters.v3;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client webmasters/v3';
 
 /** Lets you view Google Webmaster Tools data for your verified sites. */
 class WebmastersApi {
@@ -22,7 +25,7 @@
   static const WebmastersReadonlyScope = "https://www.googleapis.com/auth/webmasters.readonly";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   SitemapsResourceApi get sitemaps => new SitemapsResourceApi(_requester);
   SitesResourceApi get sites => new SitesResourceApi(_requester);
@@ -30,15 +33,14 @@
   UrlcrawlerrorssamplesResourceApi get urlcrawlerrorssamples => new UrlcrawlerrorssamplesResourceApi(_requester);
 
   WebmastersApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "webmasters/v3/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class SitemapsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  SitemapsResourceApi(common_internal.ApiRequester client) : 
+  SitemapsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -52,7 +54,7 @@
    * [feedpath] - The URL of the actual sitemap (for example
    * http://www.example.com/sitemap.xml).
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -63,7 +65,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (siteUrl == null) {
@@ -75,7 +77,7 @@
 
     _downloadOptions = null;
 
-    _url = 'sites/' + common_internal.Escaper.ecapeVariable('$siteUrl') + '/sitemaps/' + common_internal.Escaper.ecapeVariable('$feedpath');
+    _url = 'sites/' + commons.Escaper.ecapeVariable('$siteUrl') + '/sitemaps/' + commons.Escaper.ecapeVariable('$feedpath');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -100,7 +102,7 @@
    *
    * Completes with a [WmxSitemap].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -111,7 +113,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (siteUrl == null) {
@@ -122,7 +124,7 @@
     }
 
 
-    _url = 'sites/' + common_internal.Escaper.ecapeVariable('$siteUrl') + '/sitemaps/' + common_internal.Escaper.ecapeVariable('$feedpath');
+    _url = 'sites/' + commons.Escaper.ecapeVariable('$siteUrl') + '/sitemaps/' + commons.Escaper.ecapeVariable('$feedpath');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -146,7 +148,7 @@
    *
    * Completes with a [SitemapsListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -157,7 +159,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (siteUrl == null) {
@@ -168,7 +170,7 @@
     }
 
 
-    _url = 'sites/' + common_internal.Escaper.ecapeVariable('$siteUrl') + '/sitemaps';
+    _url = 'sites/' + commons.Escaper.ecapeVariable('$siteUrl') + '/sitemaps';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -190,7 +192,7 @@
    *
    * [feedpath] - The URL of the sitemap to add.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -201,7 +203,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (siteUrl == null) {
@@ -213,7 +215,7 @@
 
     _downloadOptions = null;
 
-    _url = 'sites/' + common_internal.Escaper.ecapeVariable('$siteUrl') + '/sitemaps/' + common_internal.Escaper.ecapeVariable('$feedpath');
+    _url = 'sites/' + commons.Escaper.ecapeVariable('$siteUrl') + '/sitemaps/' + commons.Escaper.ecapeVariable('$feedpath');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -228,11 +230,10 @@
 }
 
 
-/** Not documented yet. */
 class SitesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  SitesResourceApi(common_internal.ApiRequester client) : 
+  SitesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -242,7 +243,7 @@
    *
    * [siteUrl] - The URL of the site to add.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -253,7 +254,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (siteUrl == null) {
@@ -262,7 +263,7 @@
 
     _downloadOptions = null;
 
-    _url = 'sites/' + common_internal.Escaper.ecapeVariable('$siteUrl');
+    _url = 'sites/' + commons.Escaper.ecapeVariable('$siteUrl');
 
     var _response = _requester.request(_url,
                                        "PUT",
@@ -282,7 +283,7 @@
    * [siteUrl] - The site's URL, including protocol, for example
    * 'http://www.example.com/'
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -293,7 +294,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (siteUrl == null) {
@@ -302,7 +303,7 @@
 
     _downloadOptions = null;
 
-    _url = 'sites/' + common_internal.Escaper.ecapeVariable('$siteUrl');
+    _url = 'sites/' + commons.Escaper.ecapeVariable('$siteUrl');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -324,7 +325,7 @@
    *
    * Completes with a [WmxSite].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -335,7 +336,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (siteUrl == null) {
@@ -343,7 +344,7 @@
     }
 
 
-    _url = 'sites/' + common_internal.Escaper.ecapeVariable('$siteUrl');
+    _url = 'sites/' + commons.Escaper.ecapeVariable('$siteUrl');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -362,7 +363,7 @@
    *
    * Completes with a [SitesListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -373,7 +374,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
 
@@ -393,11 +394,10 @@
 }
 
 
-/** Not documented yet. */
 class UrlcrawlerrorscountsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  UrlcrawlerrorscountsResourceApi(common_internal.ApiRequester client) : 
+  UrlcrawlerrorscountsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -432,7 +432,7 @@
    *
    * Completes with a [UrlCrawlErrorsCountsQueryResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -443,7 +443,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (siteUrl == null) {
@@ -460,7 +460,7 @@
     }
 
 
-    _url = 'sites/' + common_internal.Escaper.ecapeVariable('$siteUrl') + '/urlCrawlErrorsCounts/query';
+    _url = 'sites/' + commons.Escaper.ecapeVariable('$siteUrl') + '/urlCrawlErrorsCounts/query';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -475,11 +475,10 @@
 }
 
 
-/** Not documented yet. */
 class UrlcrawlerrorssamplesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  UrlcrawlerrorssamplesResourceApi(common_internal.ApiRequester client) : 
+  UrlcrawlerrorssamplesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -513,7 +512,7 @@
    *
    * Completes with a [UrlCrawlErrorsSample].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -524,7 +523,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (siteUrl == null) {
@@ -543,7 +542,7 @@
     _queryParams["platform"] = [platform];
 
 
-    _url = 'sites/' + common_internal.Escaper.ecapeVariable('$siteUrl') + '/urlCrawlErrorsSamples/' + common_internal.Escaper.ecapeVariable('$url');
+    _url = 'sites/' + commons.Escaper.ecapeVariable('$siteUrl') + '/urlCrawlErrorsSamples/' + commons.Escaper.ecapeVariable('$url');
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -584,7 +583,7 @@
    *
    * Completes with a [UrlCrawlErrorsSamplesListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -595,7 +594,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (siteUrl == null) {
@@ -611,7 +610,7 @@
     _queryParams["platform"] = [platform];
 
 
-    _url = 'sites/' + common_internal.Escaper.ecapeVariable('$siteUrl') + '/urlCrawlErrorsSamples';
+    _url = 'sites/' + commons.Escaper.ecapeVariable('$siteUrl') + '/urlCrawlErrorsSamples';
 
     var _response = _requester.request(_url,
                                        "GET",
@@ -653,7 +652,7 @@
    * - "smartphoneOnly"
    * - "web"
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -664,7 +663,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (siteUrl == null) {
@@ -684,7 +683,7 @@
 
     _downloadOptions = null;
 
-    _url = 'sites/' + common_internal.Escaper.ecapeVariable('$siteUrl') + '/urlCrawlErrorsSamples/' + common_internal.Escaper.ecapeVariable('$url');
+    _url = 'sites/' + commons.Escaper.ecapeVariable('$siteUrl') + '/urlCrawlErrorsSamples/' + commons.Escaper.ecapeVariable('$url');
 
     var _response = _requester.request(_url,
                                        "DELETE",
@@ -856,7 +855,6 @@
 }
 
 
-/** Not documented yet. */
 class UrlCrawlErrorsSample {
   /** The time the error was first detected, in RFC 3339 format. */
   core.DateTime firstDetected;
@@ -1006,7 +1004,6 @@
 }
 
 
-/** Not documented yet. */
 class WmxSitemap {
   /** The various content types in the sitemap. */
   core.List<WmxSitemapContent> contents;
@@ -1156,5 +1153,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/youtube/v3.dart b/generated/googleapis/lib/youtube/v3.dart
index f7e8042..08ab562 100644
--- a/generated/googleapis/lib/youtube/v3.dart
+++ b/generated/googleapis/lib/youtube/v3.dart
@@ -1,23 +1,31 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.youtube.v3;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError, Media, UploadOptions,
+    ResumableUploadOptions, DownloadOptions, PartialDownloadOptions,
+    ByteRange;
+
+const core.String USER_AGENT = 'dart-api-client youtube/v3';
 
 /** Programmatic access to YouTube features. */
 class YoutubeApi {
   /** Manage your YouTube account */
   static const YoutubeScope = "https://www.googleapis.com/auth/youtube";
 
+  /** Manage your YouTube account */
+  static const YoutubeForceSslScope = "https://www.googleapis.com/auth/youtube.force-ssl";
+
   /** View your YouTube account */
   static const YoutubeReadonlyScope = "https://www.googleapis.com/auth/youtube.readonly";
 
@@ -34,9 +42,10 @@
   static const YoutubepartnerChannelAuditScope = "https://www.googleapis.com/auth/youtubepartner-channel-audit";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   ActivitiesResourceApi get activities => new ActivitiesResourceApi(_requester);
+  CaptionsResourceApi get captions => new CaptionsResourceApi(_requester);
   ChannelBannersResourceApi get channelBanners => new ChannelBannersResourceApi(_requester);
   ChannelSectionsResourceApi get channelSections => new ChannelSectionsResourceApi(_requester);
   ChannelsResourceApi get channels => new ChannelsResourceApi(_requester);
@@ -55,15 +64,14 @@
   WatermarksResourceApi get watermarks => new WatermarksResourceApi(_requester);
 
   YoutubeApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "youtube/v3/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class ActivitiesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ActivitiesResourceApi(common_internal.ApiRequester client) : 
+  ActivitiesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -89,7 +97,7 @@
    *
    * Completes with a [Activity].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -100,7 +108,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -184,7 +192,7 @@
    *
    * Completes with a [ActivityListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -195,7 +203,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (part == null) {
@@ -243,11 +251,404 @@
 }
 
 
-/** Not documented yet. */
-class ChannelBannersResourceApi {
-  final common_internal.ApiRequester _requester;
+class CaptionsResourceApi {
+  final commons.ApiRequester _requester;
 
-  ChannelBannersResourceApi(common_internal.ApiRequester client) : 
+  CaptionsResourceApi(commons.ApiRequester client) : 
+      _requester = client;
+
+  /**
+   * Deletes a specified caption track.
+   *
+   * Request parameters:
+   *
+   * [id] - The id parameter identifies the caption track that is being deleted.
+   * The value is a caption track ID as identified by the id property in a
+   * caption resource.
+   *
+   * [debugProjectIdOverride] - The debugProjectIdOverride parameter should be
+   * used for mimicking a request for a certain project ID
+   *
+   * [onBehalfOf] - ID of the Google+ Page for the channel that the request is
+   * be on behalf of
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future delete(core.String id, {core.String debugProjectIdOverride, core.String onBehalfOf}) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (id == null) {
+      throw new core.ArgumentError("Parameter id is required.");
+    }
+    _queryParams["id"] = [id];
+    if (debugProjectIdOverride != null) {
+      _queryParams["debugProjectIdOverride"] = [debugProjectIdOverride];
+    }
+    if (onBehalfOf != null) {
+      _queryParams["onBehalfOf"] = [onBehalfOf];
+    }
+
+    _downloadOptions = null;
+
+    _url = 'captions';
+
+    var _response = _requester.request(_url,
+                                       "DELETE",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => null);
+  }
+
+  /**
+   * Downloads a caption track. The caption track is returned in its original
+   * format unless the request specifies a value for the tfmt parameter and in
+   * its original language unless the request specifies a value for the tlang
+   * parameter.
+   *
+   * Request parameters:
+   *
+   * [id] - The id parameter identifies the caption track that is being
+   * retrieved. The value is a caption track ID as identified by the id property
+   * in a caption resource.
+   *
+   * [debugProjectIdOverride] - The debugProjectIdOverride parameter should be
+   * used for mimicking a request for a certain project ID
+   *
+   * [onBehalfOf] - ID of the Google+ Page for the channel that the request is
+   * be on behalf of
+   *
+   * [tfmt] - The tfmt parameter specifies that the caption track should be
+   * returned in a specific format. If the parameter is not included in the
+   * request, the track is returned in its original format.
+   * Possible string values are:
+   * - "sbv" : SubViewer subtitle.
+   * - "scc" : Scenarist Closed Caption format.
+   * - "srt" : SubRip subtitle.
+   * - "ttml" : Timed Text Markup Language caption.
+   * - "vtt" : Web Video Text Tracks caption.
+   *
+   * [tlang] - The tlang parameter specifies that the API response should return
+   * a translation of the specified caption track. The parameter value is an ISO
+   * 639-1 two-letter language code that identifies the desired caption
+   * language. The translation is generated by using machine translation, such
+   * as Google Translate.
+   *
+   * [downloadOptions] - Options for downloading. A download can be either a
+   * Metadata (default) or Media download. Partial Media downloads are possible
+   * as well.
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future download(core.String id, {core.String debugProjectIdOverride, core.String onBehalfOf, core.String tfmt, core.String tlang, commons.DownloadOptions downloadOptions: commons.DownloadOptions.Metadata}) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (id == null) {
+      throw new core.ArgumentError("Parameter id is required.");
+    }
+    if (debugProjectIdOverride != null) {
+      _queryParams["debugProjectIdOverride"] = [debugProjectIdOverride];
+    }
+    if (onBehalfOf != null) {
+      _queryParams["onBehalfOf"] = [onBehalfOf];
+    }
+    if (tfmt != null) {
+      _queryParams["tfmt"] = [tfmt];
+    }
+    if (tlang != null) {
+      _queryParams["tlang"] = [tlang];
+    }
+
+    _downloadOptions = downloadOptions;
+
+    _url = 'captions/' + commons.Escaper.ecapeVariable('$id');
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    if (_downloadOptions == null ||
+        _downloadOptions == commons.DownloadOptions.Metadata) {
+      return _response.then((data) => null);
+    } else {
+      return _response;
+    }
+  }
+
+  /**
+   * Uploads a caption track.
+   *
+   * [request] - The metadata request object.
+   *
+   * Request parameters:
+   *
+   * [part] - The part parameter specifies the caption resource parts that the
+   * API response will include. Set the parameter value to snippet.
+   *
+   * [debugProjectIdOverride] - The debugProjectIdOverride parameter should be
+   * used for mimicking a request for a certain project ID.
+   *
+   * [onBehalfOf] - ID of the Google+ Page for the channel that the request is
+   * be on behalf of
+   *
+   * [sync] - The sync parameter indicates whether YouTube should automatically
+   * synchronize the caption file with the audio track of the video. If you set
+   * the value to true, YouTube will disregard any time codes that are in the
+   * uploaded caption file and generate new time codes for the captions.
+   *
+   * You should set the sync parameter to true if you are uploading a
+   * transcript, which has no time codes, or if you suspect the time codes in
+   * your file are incorrect and want YouTube to try to fix them.
+   *
+   * [uploadMedia] - The media to upload.
+   *
+   * [uploadOptions] - Options for the media upload. Streaming Media without the
+   * length being known ahead of time is only supported via resumable uploads.
+   *
+   * Completes with a [Caption].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Caption> insert(Caption request, core.String part, {core.String debugProjectIdOverride, core.String onBehalfOf, core.bool sync, commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (request != null) {
+      _body = convert.JSON.encode((request).toJson());
+    }
+    if (part == null) {
+      throw new core.ArgumentError("Parameter part is required.");
+    }
+    _queryParams["part"] = [part];
+    if (debugProjectIdOverride != null) {
+      _queryParams["debugProjectIdOverride"] = [debugProjectIdOverride];
+    }
+    if (onBehalfOf != null) {
+      _queryParams["onBehalfOf"] = [onBehalfOf];
+    }
+    if (sync != null) {
+      _queryParams["sync"] = ["${sync}"];
+    }
+
+    _uploadMedia =  uploadMedia;
+    _uploadOptions =  uploadOptions;
+
+    if (_uploadMedia == null) {
+      _url = 'captions';
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/youtube/v3/captions';
+    } else {
+      _url = '/upload/youtube/v3/captions';
+    }
+
+
+    var _response = _requester.request(_url,
+                                       "POST",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Caption.fromJson(data));
+  }
+
+  /**
+   * Returns a list of caption tracks that are associated with a specified
+   * video. Note that the API response does not contain the actual captions and
+   * that the captions.download method provides the ability to retrieve a
+   * caption track.
+   *
+   * Request parameters:
+   *
+   * [part] - The part parameter specifies the caption resource parts that the
+   * API response will include.
+   *
+   * [videoId] - The videoId parameter specifies the YouTube video ID of the
+   * video for which the API should return caption tracks.
+   *
+   * [debugProjectIdOverride] - The debugProjectIdOverride parameter should be
+   * used for mimicking a request for a certain project ID.
+   *
+   * [id] - The id parameter specifies a comma-separated list of IDs that
+   * identify the caption resources that should be retrieved. Each ID must
+   * identify a caption track associated with the specified video.
+   *
+   * [onBehalfOf] - ID of the Google+ Page for the channel that the request is
+   * on behalf of.
+   *
+   * Completes with a [CaptionListResponse].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<CaptionListResponse> list(core.String part, core.String videoId, {core.String debugProjectIdOverride, core.String id, core.String onBehalfOf}) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (part == null) {
+      throw new core.ArgumentError("Parameter part is required.");
+    }
+    _queryParams["part"] = [part];
+    if (videoId == null) {
+      throw new core.ArgumentError("Parameter videoId is required.");
+    }
+    _queryParams["videoId"] = [videoId];
+    if (debugProjectIdOverride != null) {
+      _queryParams["debugProjectIdOverride"] = [debugProjectIdOverride];
+    }
+    if (id != null) {
+      _queryParams["id"] = [id];
+    }
+    if (onBehalfOf != null) {
+      _queryParams["onBehalfOf"] = [onBehalfOf];
+    }
+
+
+    _url = 'captions';
+
+    var _response = _requester.request(_url,
+                                       "GET",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new CaptionListResponse.fromJson(data));
+  }
+
+  /**
+   * Updates a caption track. When updating a caption track, you can change the
+   * track's draft status, upload a new caption file for the track, or both.
+   *
+   * [request] - The metadata request object.
+   *
+   * Request parameters:
+   *
+   * [part] - The part parameter serves two purposes in this operation. It
+   * identifies the properties that the write operation will set as well as the
+   * properties that the API response will include. Set the property value to
+   * snippet if you are updating the track's draft status. Otherwise, set the
+   * property value to id.
+   *
+   * [debugProjectIdOverride] - The debugProjectIdOverride parameter should be
+   * used for mimicking a request for a certain project ID.
+   *
+   * [onBehalfOf] - ID of the Google+ Page for the channel that the request is
+   * be on behalf of
+   *
+   * [sync] - Note: The API server only processes the parameter value if the
+   * request contains an updated caption file.
+   *
+   * The sync parameter indicates whether YouTube should automatically
+   * synchronize the caption file with the audio track of the video. If you set
+   * the value to true, YouTube will automatically synchronize the caption track
+   * with the audio track.
+   *
+   * [uploadMedia] - The media to upload.
+   *
+   * [uploadOptions] - Options for the media upload. Streaming Media without the
+   * length being known ahead of time is only supported via resumable uploads.
+   *
+   * Completes with a [Caption].
+   *
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
+   * error.
+   *
+   * If the used [http.Client] completes with an error when making a REST call,
+   * this method  will complete with the same error.
+   */
+  async.Future<Caption> update(Caption request, core.String part, {core.String debugProjectIdOverride, core.String onBehalfOf, core.bool sync, commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
+    var _url = null;
+    var _queryParams = new core.Map();
+    var _uploadMedia = null;
+    var _uploadOptions = null;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
+    var _body = null;
+
+    if (request != null) {
+      _body = convert.JSON.encode((request).toJson());
+    }
+    if (part == null) {
+      throw new core.ArgumentError("Parameter part is required.");
+    }
+    _queryParams["part"] = [part];
+    if (debugProjectIdOverride != null) {
+      _queryParams["debugProjectIdOverride"] = [debugProjectIdOverride];
+    }
+    if (onBehalfOf != null) {
+      _queryParams["onBehalfOf"] = [onBehalfOf];
+    }
+    if (sync != null) {
+      _queryParams["sync"] = ["${sync}"];
+    }
+
+    _uploadMedia =  uploadMedia;
+    _uploadOptions =  uploadOptions;
+
+    if (_uploadMedia == null) {
+      _url = 'captions';
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
+      _url = '/resumable/upload/youtube/v3/captions';
+    } else {
+      _url = '/upload/youtube/v3/captions';
+    }
+
+
+    var _response = _requester.request(_url,
+                                       "PUT",
+                                       body: _body,
+                                       queryParams: _queryParams,
+                                       uploadOptions: _uploadOptions,
+                                       uploadMedia: _uploadMedia,
+                                       downloadOptions: _downloadOptions);
+    return _response.then((data) => new Caption.fromJson(data));
+  }
+
+}
+
+
+class ChannelBannersResourceApi {
+  final commons.ApiRequester _requester;
+
+  ChannelBannersResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -287,18 +688,18 @@
    *
    * Completes with a [ChannelBannerResource].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<ChannelBannerResource> insert(ChannelBannerResource request, {core.String onBehalfOfContentOwner, common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<ChannelBannerResource> insert(ChannelBannerResource request, {core.String onBehalfOfContentOwner, commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -313,7 +714,7 @@
 
     if (_uploadMedia == null) {
       _url = 'channelBanners/insert';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
       _url = '/resumable/upload/youtube/v3/channelBanners/insert';
     } else {
       _url = '/upload/youtube/v3/channelBanners/insert';
@@ -333,11 +734,10 @@
 }
 
 
-/** Not documented yet. */
 class ChannelSectionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ChannelSectionsResourceApi(common_internal.ApiRequester client) : 
+  ChannelSectionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -362,7 +762,7 @@
    * account that the user authenticates with must be linked to the specified
    * YouTube content owner.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -373,7 +773,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -447,7 +847,7 @@
    *
    * Completes with a [ChannelSection].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -458,7 +858,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -507,6 +907,14 @@
    * [channelId] - The channelId parameter specifies a YouTube channel ID. The
    * API will only return that channel's channelSections.
    *
+   * [hl] - The hl parameter indicates that the snippet.localized property
+   * values in the returned channelSection resources should be in the specified
+   * language if localized values for that language are available. For example,
+   * if the API request specifies hl=de, the snippet.localized properties in the
+   * API response will contain German titles if German titles are available.
+   * Channel owners can provide localized channel section titles using either
+   * the channelSections.insert or channelSections.update method.
+   *
    * [id] - The id parameter specifies a comma-separated list of the YouTube
    * channelSection ID(s) for the resource(s) that are being retrieved. In a
    * channelSection resource, the id property specifies the YouTube
@@ -530,18 +938,18 @@
    *
    * Completes with a [ChannelSectionListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<ChannelSectionListResponse> list(core.String part, {core.String channelId, core.String id, core.bool mine, core.String onBehalfOfContentOwner}) {
+  async.Future<ChannelSectionListResponse> list(core.String part, {core.String channelId, core.String hl, core.String id, core.bool mine, core.String onBehalfOfContentOwner}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (part == null) {
@@ -551,6 +959,9 @@
     if (channelId != null) {
       _queryParams["channelId"] = [channelId];
     }
+    if (hl != null) {
+      _queryParams["hl"] = [hl];
+    }
     if (id != null) {
       _queryParams["id"] = [id];
     }
@@ -603,7 +1014,7 @@
    *
    * Completes with a [ChannelSection].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -614,7 +1025,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -644,11 +1055,10 @@
 }
 
 
-/** Not documented yet. */
 class ChannelsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ChannelsResourceApi(common_internal.ApiRequester client) : 
+  ChannelsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -674,6 +1084,9 @@
    * [forUsername] - The forUsername parameter specifies a YouTube username,
    * thereby requesting the channel associated with that username.
    *
+   * [hl] - The hl parameter should be used for filter out the properties that
+   * are not in the given language. Used for the brandingSettings part.
+   *
    * [id] - The id parameter specifies a comma-separated list of the YouTube
    * channel ID(s) for the resource(s) that are being retrieved. In a channel
    * resource, the id property specifies the channel's YouTube channel ID.
@@ -710,18 +1123,18 @@
    *
    * Completes with a [ChannelListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<ChannelListResponse> list(core.String part, {core.String categoryId, core.String forUsername, core.String id, core.bool managedByMe, core.int maxResults, core.bool mine, core.bool mySubscribers, core.String onBehalfOfContentOwner, core.String pageToken}) {
+  async.Future<ChannelListResponse> list(core.String part, {core.String categoryId, core.String forUsername, core.String hl, core.String id, core.bool managedByMe, core.int maxResults, core.bool mine, core.bool mySubscribers, core.String onBehalfOfContentOwner, core.String pageToken}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (part == null) {
@@ -734,6 +1147,9 @@
     if (forUsername != null) {
       _queryParams["forUsername"] = [forUsername];
     }
+    if (hl != null) {
+      _queryParams["hl"] = [hl];
+    }
     if (id != null) {
       _queryParams["id"] = [id];
     }
@@ -799,7 +1215,7 @@
    *
    * Completes with a [Channel].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -810,7 +1226,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -840,11 +1256,10 @@
 }
 
 
-/** Not documented yet. */
 class GuideCategoriesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  GuideCategoriesResourceApi(common_internal.ApiRequester client) : 
+  GuideCategoriesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -876,7 +1291,7 @@
    *
    * Completes with a [GuideCategoryListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -887,7 +1302,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (part == null) {
@@ -920,11 +1335,10 @@
 }
 
 
-/** Not documented yet. */
 class I18nLanguagesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  I18nLanguagesResourceApi(common_internal.ApiRequester client) : 
+  I18nLanguagesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -941,7 +1355,7 @@
    *
    * Completes with a [I18nLanguageListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -952,7 +1366,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (part == null) {
@@ -979,11 +1393,10 @@
 }
 
 
-/** Not documented yet. */
 class I18nRegionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  I18nRegionsResourceApi(common_internal.ApiRequester client) : 
+  I18nRegionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1000,7 +1413,7 @@
    *
    * Completes with a [I18nRegionListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1011,7 +1424,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (part == null) {
@@ -1038,11 +1451,10 @@
 }
 
 
-/** Not documented yet. */
 class LiveBroadcastsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  LiveBroadcastsResourceApi(common_internal.ApiRequester client) : 
+  LiveBroadcastsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1100,7 +1512,7 @@
    *
    * Completes with a [LiveBroadcast].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1111,7 +1523,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -1214,7 +1626,7 @@
    *
    * Completes with a [LiveBroadcast].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1225,7 +1637,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -1306,7 +1718,7 @@
    * parameter value, without having to provide authentication credentials for
    * each separate channel.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1317,7 +1729,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -1394,7 +1806,7 @@
    *
    * Completes with a [LiveBroadcast].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1405,7 +1817,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1504,7 +1916,7 @@
    *
    * Completes with a [LiveBroadcastListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1515,7 +1927,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (part == null) {
@@ -1623,7 +2035,7 @@
    *
    * Completes with a [LiveBroadcast].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1634,7 +2046,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (broadcastStatus == null) {
@@ -1729,7 +2141,7 @@
    *
    * Completes with a [LiveBroadcast].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1740,7 +2152,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -1773,11 +2185,10 @@
 }
 
 
-/** Not documented yet. */
 class LiveStreamsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  LiveStreamsResourceApi(common_internal.ApiRequester client) : 
+  LiveStreamsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -1821,7 +2232,7 @@
    * parameter value, without having to provide authentication credentials for
    * each separate channel.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1832,7 +2243,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -1910,7 +2321,7 @@
    *
    * Completes with a [LiveStream].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -1921,7 +2332,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2013,7 +2424,7 @@
    *
    * Completes with a [LiveStreamListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2024,7 +2435,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (part == null) {
@@ -2118,7 +2529,7 @@
    *
    * Completes with a [LiveStream].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2129,7 +2540,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2162,11 +2573,10 @@
 }
 
 
-/** Not documented yet. */
 class PlaylistItemsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PlaylistItemsResourceApi(common_internal.ApiRequester client) : 
+  PlaylistItemsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2178,7 +2588,7 @@
    * playlist item that is being deleted. In a playlistItem resource, the id
    * property specifies the playlist item's ID.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2189,7 +2599,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -2240,7 +2650,7 @@
    *
    * Completes with a [PlaylistItem].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2251,7 +2661,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2332,7 +2742,7 @@
    *
    * Completes with a [PlaylistItemListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2343,7 +2753,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (part == null) {
@@ -2410,7 +2820,7 @@
    *
    * Completes with a [PlaylistItem].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2421,7 +2831,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2448,11 +2858,10 @@
 }
 
 
-/** Not documented yet. */
 class PlaylistsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  PlaylistsResourceApi(common_internal.ApiRequester client) : 
+  PlaylistsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2477,7 +2886,7 @@
    * account that the user authenticates with must be linked to the specified
    * YouTube content owner.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2488,7 +2897,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -2562,7 +2971,7 @@
    *
    * Completes with a [Playlist].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2573,7 +2982,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2624,6 +3033,9 @@
    * [channelId] - This value indicates that the API should only return the
    * specified channel's playlists.
    *
+   * [hl] - The hl parameter should be used for filter out the properties that
+   * are not in the given language. Used for the snippet part.
+   *
    * [id] - The id parameter specifies a comma-separated list of the YouTube
    * playlist ID(s) for the resource(s) that are being retrieved. In a playlist
    * resource, the id property specifies the playlist's YouTube playlist ID.
@@ -2674,18 +3086,18 @@
    *
    * Completes with a [PlaylistListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<PlaylistListResponse> list(core.String part, {core.String channelId, core.String id, core.int maxResults, core.bool mine, core.String onBehalfOfContentOwner, core.String onBehalfOfContentOwnerChannel, core.String pageToken}) {
+  async.Future<PlaylistListResponse> list(core.String part, {core.String channelId, core.String hl, core.String id, core.int maxResults, core.bool mine, core.String onBehalfOfContentOwner, core.String onBehalfOfContentOwnerChannel, core.String pageToken}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (part == null) {
@@ -2695,6 +3107,9 @@
     if (channelId != null) {
       _queryParams["channelId"] = [channelId];
     }
+    if (hl != null) {
+      _queryParams["hl"] = [hl];
+    }
     if (id != null) {
       _queryParams["id"] = [id];
     }
@@ -2767,7 +3182,7 @@
    *
    * Completes with a [Playlist].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -2778,7 +3193,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -2808,11 +3223,10 @@
 }
 
 
-/** Not documented yet. */
 class SearchResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  SearchResourceApi(common_internal.ApiRequester client) : 
+  SearchResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -2858,6 +3272,13 @@
    * CMS account linked to the specified content owner and
    * onBehalfOfContentOwner must be provided.
    *
+   * [forDeveloper] - The forDeveloper parameter restricts the search to only
+   * retrieve videos uploaded via the developer's application or website. The
+   * API server uses the request's authorization credentials to identify the
+   * developer. Therefore, a developer can restrict results to videos uploaded
+   * through the developer's own app or website but not to videos uploaded
+   * through other apps or sites.
+   *
    * [forMine] - The forMine parameter restricts the search to only retrieve
    * videos owned by the authenticated user. If you set this parameter to true,
    * then the type parameter's value must also be set to video.
@@ -3028,18 +3449,18 @@
    *
    * Completes with a [SearchListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<SearchListResponse> list(core.String part, {core.String channelId, core.String channelType, core.String eventType, core.bool forContentOwner, core.bool forMine, core.String location, core.String locationRadius, core.int maxResults, core.String onBehalfOfContentOwner, core.String order, core.String pageToken, core.DateTime publishedAfter, core.DateTime publishedBefore, core.String q, core.String regionCode, core.String relatedToVideoId, core.String relevanceLanguage, core.String safeSearch, core.String topicId, core.String type, core.String videoCaption, core.String videoCategoryId, core.String videoDefinition, core.String videoDimension, core.String videoDuration, core.String videoEmbeddable, core.String videoLicense, core.String videoSyndicated, core.String videoType}) {
+  async.Future<SearchListResponse> list(core.String part, {core.String channelId, core.String channelType, core.String eventType, core.bool forContentOwner, core.bool forDeveloper, core.bool forMine, core.String location, core.String locationRadius, core.int maxResults, core.String onBehalfOfContentOwner, core.String order, core.String pageToken, core.DateTime publishedAfter, core.DateTime publishedBefore, core.String q, core.String regionCode, core.String relatedToVideoId, core.String relevanceLanguage, core.String safeSearch, core.String topicId, core.String type, core.String videoCaption, core.String videoCategoryId, core.String videoDefinition, core.String videoDimension, core.String videoDuration, core.String videoEmbeddable, core.String videoLicense, core.String videoSyndicated, core.String videoType}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (part == null) {
@@ -3058,6 +3479,9 @@
     if (forContentOwner != null) {
       _queryParams["forContentOwner"] = ["${forContentOwner}"];
     }
+    if (forDeveloper != null) {
+      _queryParams["forDeveloper"] = ["${forDeveloper}"];
+    }
     if (forMine != null) {
       _queryParams["forMine"] = ["${forMine}"];
     }
@@ -3150,11 +3574,10 @@
 }
 
 
-/** Not documented yet. */
 class SubscriptionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  SubscriptionsResourceApi(common_internal.ApiRequester client) : 
+  SubscriptionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3166,7 +3589,7 @@
    * resource that is being deleted. In a subscription resource, the id property
    * specifies the YouTube subscription ID.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3177,7 +3600,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -3215,7 +3638,7 @@
    *
    * Completes with a [Subscription].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3226,7 +3649,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3334,7 +3757,7 @@
    *
    * Completes with a [SubscriptionListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3345,7 +3768,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (part == null) {
@@ -3399,11 +3822,10 @@
 }
 
 
-/** Not documented yet. */
 class ThumbnailsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ThumbnailsResourceApi(common_internal.ApiRequester client) : 
+  ThumbnailsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3431,18 +3853,18 @@
    *
    * Completes with a [ThumbnailSetResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<ThumbnailSetResponse> set(core.String videoId, {core.String onBehalfOfContentOwner, common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<ThumbnailSetResponse> set(core.String videoId, {core.String onBehalfOfContentOwner, commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (videoId == null) {
@@ -3458,7 +3880,7 @@
 
     if (_uploadMedia == null) {
       _url = 'thumbnails/set';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
       _url = '/resumable/upload/youtube/v3/thumbnails/set';
     } else {
       _url = '/upload/youtube/v3/thumbnails/set';
@@ -3478,11 +3900,10 @@
 }
 
 
-/** Not documented yet. */
 class VideoCategoriesResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  VideoCategoriesResourceApi(common_internal.ApiRequester client) : 
+  VideoCategoriesResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3505,7 +3926,7 @@
    *
    * Completes with a [VideoCategoryListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3516,7 +3937,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (part == null) {
@@ -3549,11 +3970,10 @@
 }
 
 
-/** Not documented yet. */
 class VideosResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  VideosResourceApi(common_internal.ApiRequester client) : 
+  VideosResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -3578,7 +3998,7 @@
    * CMS account that the user authenticates with must be linked to the
    * specified YouTube content owner.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3589,7 +4009,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -3639,7 +4059,7 @@
    *
    * Completes with a [VideoGetRatingResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3650,7 +4070,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -3744,18 +4164,18 @@
    *
    * Completes with a [Video].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<Video> insert(Video request, core.String part, {core.bool autoLevels, core.bool notifySubscribers, core.String onBehalfOfContentOwner, core.String onBehalfOfContentOwnerChannel, core.bool stabilize, common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future<Video> insert(Video request, core.String part, {core.bool autoLevels, core.bool notifySubscribers, core.String onBehalfOfContentOwner, core.String onBehalfOfContentOwnerChannel, core.bool stabilize, commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -3786,7 +4206,7 @@
 
     if (_uploadMedia == null) {
       _url = 'videos';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
       _url = '/resumable/upload/youtube/v3/videos';
     } else {
       _url = '/upload/youtube/v3/videos';
@@ -3888,7 +4308,7 @@
    *
    * Completes with a [VideoListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3899,7 +4319,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (part == null) {
@@ -3978,7 +4398,7 @@
    * account that the user authenticates with must be linked to the specified
    * YouTube content owner.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -3989,7 +4409,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -4066,7 +4486,7 @@
    *
    * Completes with a [Video].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4077,7 +4497,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -4107,11 +4527,10 @@
 }
 
 
-/** Not documented yet. */
 class WatermarksResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  WatermarksResourceApi(common_internal.ApiRequester client) : 
+  WatermarksResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -4139,18 +4558,18 @@
    * [uploadOptions] - Options for the media upload. Streaming Media without the
    * length being known ahead of time is only supported via resumable uploads.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future set(InvideoBranding request, core.String channelId, {core.String onBehalfOfContentOwner, common.UploadOptions uploadOptions : common.UploadOptions.Default, common.Media uploadMedia}) {
+  async.Future set(InvideoBranding request, core.String channelId, {core.String onBehalfOfContentOwner, commons.UploadOptions uploadOptions : commons.UploadOptions.Default, commons.Media uploadMedia}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -4170,7 +4589,7 @@
 
     if (_uploadMedia == null) {
       _url = 'watermarks/set';
-    } else if (_uploadOptions is common.ResumableUploadOptions) {
+    } else if (_uploadOptions is commons.ResumableUploadOptions) {
       _url = '/resumable/upload/youtube/v3/watermarks/set';
     } else {
       _url = '/upload/youtube/v3/watermarks/set';
@@ -4205,7 +4624,7 @@
    * user authenticates with needs to be linked to the specified YouTube content
    * owner.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -4216,7 +4635,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (channelId == null) {
@@ -5004,7 +5423,6 @@
 }
 
 
-/** Not documented yet. */
 class ActivityListResponse {
   /** Etag of this resource. */
   core.String etag;
@@ -5027,7 +5445,6 @@
    */
   core.String nextPageToken;
 
-  /** Not documented yet. */
   PageInfo pageInfo;
 
   /**
@@ -5036,7 +5453,6 @@
    */
   core.String prevPageToken;
 
-  /** Not documented yet. */
   TokenPagination tokenPagination;
 
   /** The visitorId identifies the visitor. */
@@ -5233,6 +5649,316 @@
 }
 
 
+/**
+ * A caption resource represents a YouTube caption track. A caption track is
+ * associated with exactly one YouTube video.
+ */
+class Caption {
+  /** Etag of this resource. */
+  core.String etag;
+
+  /** The ID that YouTube uses to uniquely identify the caption track. */
+  core.String id;
+
+  /**
+   * Identifies what kind of resource this is. Value: the fixed string
+   * "youtube#caption".
+   */
+  core.String kind;
+
+  /** The snippet object contains basic details about the caption. */
+  CaptionSnippet snippet;
+
+
+  Caption();
+
+  Caption.fromJson(core.Map _json) {
+    if (_json.containsKey("etag")) {
+      etag = _json["etag"];
+    }
+    if (_json.containsKey("id")) {
+      id = _json["id"];
+    }
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+    if (_json.containsKey("snippet")) {
+      snippet = new CaptionSnippet.fromJson(_json["snippet"]);
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (etag != null) {
+      _json["etag"] = etag;
+    }
+    if (id != null) {
+      _json["id"] = id;
+    }
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    if (snippet != null) {
+      _json["snippet"] = (snippet).toJson();
+    }
+    return _json;
+  }
+}
+
+
+class CaptionListResponse {
+  /** Etag of this resource. */
+  core.String etag;
+
+  /** Serialized EventId of the request which produced this response. */
+  core.String eventId;
+
+  /** A list of captions that match the request criteria. */
+  core.List<Caption> items;
+
+  /**
+   * Identifies what kind of resource this is. Value: the fixed string
+   * "youtube#captionListResponse".
+   */
+  core.String kind;
+
+  /** The visitorId identifies the visitor. */
+  core.String visitorId;
+
+
+  CaptionListResponse();
+
+  CaptionListResponse.fromJson(core.Map _json) {
+    if (_json.containsKey("etag")) {
+      etag = _json["etag"];
+    }
+    if (_json.containsKey("eventId")) {
+      eventId = _json["eventId"];
+    }
+    if (_json.containsKey("items")) {
+      items = _json["items"].map((value) => new Caption.fromJson(value)).toList();
+    }
+    if (_json.containsKey("kind")) {
+      kind = _json["kind"];
+    }
+    if (_json.containsKey("visitorId")) {
+      visitorId = _json["visitorId"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (etag != null) {
+      _json["etag"] = etag;
+    }
+    if (eventId != null) {
+      _json["eventId"] = eventId;
+    }
+    if (items != null) {
+      _json["items"] = items.map((value) => (value).toJson()).toList();
+    }
+    if (kind != null) {
+      _json["kind"] = kind;
+    }
+    if (visitorId != null) {
+      _json["visitorId"] = visitorId;
+    }
+    return _json;
+  }
+}
+
+
+/** Basic details about a caption track, such as its language and name. */
+class CaptionSnippet {
+  /**
+   * The type of audio track associated with the caption track.
+   * Possible string values are:
+   * - "commentary"
+   * - "descriptive"
+   * - "primary"
+   * - "unknown"
+   */
+  core.String audioTrackType;
+
+  /**
+   * The reason that YouTube failed to process the caption track. This property
+   * is only present if the state property's value is failed.
+   * Possible string values are:
+   * - "processingFailed"
+   * - "unknownFormat"
+   * - "unsupportedFormat"
+   */
+  core.String failureReason;
+
+  /**
+   * Indicates whether YouTube synchronized the caption track to the audio track
+   * in the video. The value will be true if a sync was explicitly requested
+   * when the caption track was uploaded. For example, when calling the
+   * captions.insert or captions.update methods, you can set the sync parameter
+   * to true to instruct YouTube to sync the uploaded track to the video. If the
+   * value is false, YouTube uses the time codes in the uploaded caption track
+   * to determine when to display captions.
+   */
+  core.bool isAutoSynced;
+
+  /**
+   * Indicates whether the track contains closed captions for the deaf and hard
+   * of hearing. The default value is false.
+   */
+  core.bool isCC;
+
+  /**
+   * Indicates whether the caption track is a draft. If the value is true, then
+   * the track is not publicly visible. The default value is false.
+   */
+  core.bool isDraft;
+
+  /**
+   * Indicates whether caption track is formatted for "easy reader," meaning it
+   * is at a third-grade level for language learners. The default value is
+   * false.
+   */
+  core.bool isEasyReader;
+
+  /**
+   * Indicates whether the caption track uses large text for the
+   * vision-impaired. The default value is false.
+   */
+  core.bool isLarge;
+
+  /**
+   * The language of the caption track. The property value is a BCP-47 language
+   * tag.
+   */
+  core.String language;
+
+  /**
+   * The date and time when the caption track was last updated. The value is
+   * specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.
+   */
+  core.DateTime lastUpdated;
+
+  /**
+   * The name of the caption track. The name is intended to be visible to the
+   * user as an option during playback.
+   */
+  core.String name;
+
+  /**
+   * The caption track's status.
+   * Possible string values are:
+   * - "failed"
+   * - "serving"
+   * - "syncing"
+   */
+  core.String status;
+
+  /**
+   * The caption track's type.
+   * Possible string values are:
+   * - "ASR"
+   * - "forced"
+   * - "standard"
+   */
+  core.String trackKind;
+
+  /**
+   * The ID that YouTube uses to uniquely identify the video associated with the
+   * caption track.
+   */
+  core.String videoId;
+
+
+  CaptionSnippet();
+
+  CaptionSnippet.fromJson(core.Map _json) {
+    if (_json.containsKey("audioTrackType")) {
+      audioTrackType = _json["audioTrackType"];
+    }
+    if (_json.containsKey("failureReason")) {
+      failureReason = _json["failureReason"];
+    }
+    if (_json.containsKey("isAutoSynced")) {
+      isAutoSynced = _json["isAutoSynced"];
+    }
+    if (_json.containsKey("isCC")) {
+      isCC = _json["isCC"];
+    }
+    if (_json.containsKey("isDraft")) {
+      isDraft = _json["isDraft"];
+    }
+    if (_json.containsKey("isEasyReader")) {
+      isEasyReader = _json["isEasyReader"];
+    }
+    if (_json.containsKey("isLarge")) {
+      isLarge = _json["isLarge"];
+    }
+    if (_json.containsKey("language")) {
+      language = _json["language"];
+    }
+    if (_json.containsKey("lastUpdated")) {
+      lastUpdated = core.DateTime.parse(_json["lastUpdated"]);
+    }
+    if (_json.containsKey("name")) {
+      name = _json["name"];
+    }
+    if (_json.containsKey("status")) {
+      status = _json["status"];
+    }
+    if (_json.containsKey("trackKind")) {
+      trackKind = _json["trackKind"];
+    }
+    if (_json.containsKey("videoId")) {
+      videoId = _json["videoId"];
+    }
+  }
+
+  core.Map toJson() {
+    var _json = new core.Map();
+    if (audioTrackType != null) {
+      _json["audioTrackType"] = audioTrackType;
+    }
+    if (failureReason != null) {
+      _json["failureReason"] = failureReason;
+    }
+    if (isAutoSynced != null) {
+      _json["isAutoSynced"] = isAutoSynced;
+    }
+    if (isCC != null) {
+      _json["isCC"] = isCC;
+    }
+    if (isDraft != null) {
+      _json["isDraft"] = isDraft;
+    }
+    if (isEasyReader != null) {
+      _json["isEasyReader"] = isEasyReader;
+    }
+    if (isLarge != null) {
+      _json["isLarge"] = isLarge;
+    }
+    if (language != null) {
+      _json["language"] = language;
+    }
+    if (lastUpdated != null) {
+      _json["lastUpdated"] = (lastUpdated).toIso8601String();
+    }
+    if (name != null) {
+      _json["name"] = name;
+    }
+    if (status != null) {
+      _json["status"] = status;
+    }
+    if (trackKind != null) {
+      _json["trackKind"] = trackKind;
+    }
+    if (videoId != null) {
+      _json["videoId"] = videoId;
+    }
+    return _json;
+  }
+}
+
+
 /** Brief description of the live stream cdn settings. */
 class CdnSettings {
   /** The format of the video stream that you are sending to Youtube. */
@@ -5389,7 +6115,7 @@
       kind = _json["kind"];
     }
     if (_json.containsKey("localizations")) {
-      localizations = common_internal.mapMap(_json["localizations"], (item) => new ChannelLocalization.fromJson(item));
+      localizations = commons.mapMap(_json["localizations"], (item) => new ChannelLocalization.fromJson(item));
     }
     if (_json.containsKey("snippet")) {
       snippet = new ChannelSnippet.fromJson(_json["snippet"]);
@@ -5435,7 +6161,7 @@
       _json["kind"] = kind;
     }
     if (localizations != null) {
-      _json["localizations"] = common_internal.mapMap(localizations, (item) => (item).toJson());
+      _json["localizations"] = commons.mapMap(localizations, (item) => (item).toJson());
     }
     if (snippet != null) {
       _json["snippet"] = (snippet).toJson();
@@ -5612,7 +6338,6 @@
 }
 
 
-/** Not documented yet. */
 class ChannelContentDetailsRelatedPlaylists {
   /**
    * The ID of the playlist that contains the channel"s favorite videos. Use the
@@ -5700,7 +6425,6 @@
    */
   core.String googlePlusUserId;
 
-  /** Not documented yet. */
   ChannelContentDetailsRelatedPlaylists relatedPlaylists;
 
 
@@ -5849,7 +6573,6 @@
 }
 
 
-/** Not documented yet. */
 class ChannelListResponse {
   /** Etag of this resource. */
   core.String etag;
@@ -5872,7 +6595,6 @@
    */
   core.String nextPageToken;
 
-  /** Not documented yet. */
   PageInfo pageInfo;
 
   /**
@@ -5881,7 +6603,6 @@
    */
   core.String prevPageToken;
 
-  /** Not documented yet. */
   TokenPagination tokenPagination;
 
   /** The visitorId identifies the visitor. */
@@ -5987,7 +6708,6 @@
 }
 
 
-/** Not documented yet. */
 class ChannelSection {
   /**
    * The contentDetails object contains details about the channel section
@@ -6033,7 +6753,7 @@
       kind = _json["kind"];
     }
     if (_json.containsKey("localizations")) {
-      localizations = common_internal.mapMap(_json["localizations"], (item) => new ChannelSectionLocalization.fromJson(item));
+      localizations = commons.mapMap(_json["localizations"], (item) => new ChannelSectionLocalization.fromJson(item));
     }
     if (_json.containsKey("snippet")) {
       snippet = new ChannelSectionSnippet.fromJson(_json["snippet"]);
@@ -6055,7 +6775,7 @@
       _json["kind"] = kind;
     }
     if (localizations != null) {
-      _json["localizations"] = common_internal.mapMap(localizations, (item) => (item).toJson());
+      _json["localizations"] = commons.mapMap(localizations, (item) => (item).toJson());
     }
     if (snippet != null) {
       _json["snippet"] = (snippet).toJson();
@@ -6101,7 +6821,6 @@
 }
 
 
-/** Not documented yet. */
 class ChannelSectionListResponse {
   /** Etag of this resource. */
   core.String etag;
@@ -6301,7 +7020,6 @@
 
 /** Branding properties for the channel view. */
 class ChannelSettings {
-  /** Not documented yet. */
   core.String defaultLanguage;
 
   /** Which content tab users should see when viewing the channel. */
@@ -6908,7 +7626,6 @@
    */
   core.String djctqRating;
 
-  /** Not documented yet. */
   core.List<core.String> djctqRatingReasons;
 
   /**
@@ -7963,7 +8680,6 @@
 }
 
 
-/** Not documented yet. */
 class GuideCategoryListResponse {
   /** Etag of this resource. */
   core.String etag;
@@ -7990,7 +8706,6 @@
    */
   core.String nextPageToken;
 
-  /** Not documented yet. */
   PageInfo pageInfo;
 
   /**
@@ -7999,7 +8714,6 @@
    */
   core.String prevPageToken;
 
-  /** Not documented yet. */
   TokenPagination tokenPagination;
 
   /** The visitorId identifies the visitor. */
@@ -8074,7 +8788,6 @@
 
 /** Basic details about a guide category. */
 class GuideCategorySnippet {
-  /** Not documented yet. */
   core.String channelId;
 
   /** Description of the guide category. */
@@ -8165,7 +8878,6 @@
 }
 
 
-/** Not documented yet. */
 class I18nLanguageListResponse {
   /** Etag of this resource. */
   core.String etag;
@@ -8324,7 +9036,6 @@
 }
 
 
-/** Not documented yet. */
 class I18nRegionListResponse {
   /** Etag of this resource. */
   core.String etag;
@@ -8713,9 +9424,7 @@
 }
 
 
-/** Not documented yet. */
 class InvideoBranding {
-  /** Not documented yet. */
   core.String imageBytes;
 
   core.List<core.int> get imageBytesAsBytes {
@@ -8726,16 +9435,12 @@
     imageBytes = crypto.CryptoUtils.bytesToBase64(_bytes, urlSafe: true);
   }
 
-  /** Not documented yet. */
   core.String imageUrl;
 
-  /** Not documented yet. */
   InvideoPosition position;
 
-  /** Not documented yet. */
   core.String targetChannelId;
 
-  /** Not documented yet. */
   InvideoTiming timing;
 
 
@@ -8951,9 +9656,7 @@
 }
 
 
-/** Not documented yet. */
 class LanguageTag {
-  /** Not documented yet. */
   core.String value;
 
 
@@ -9189,7 +9892,6 @@
 }
 
 
-/** Not documented yet. */
 class LiveBroadcastListResponse {
   /** Etag of this resource. */
   core.String etag;
@@ -9212,7 +9914,6 @@
    */
   core.String nextPageToken;
 
-  /** Not documented yet. */
   PageInfo pageInfo;
 
   /**
@@ -9221,7 +9922,6 @@
    */
   core.String prevPageToken;
 
-  /** Not documented yet. */
   TokenPagination tokenPagination;
 
   /** The visitorId identifies the visitor. */
@@ -9294,7 +9994,6 @@
 }
 
 
-/** Not documented yet. */
 class LiveBroadcastSnippet {
   /**
    * The date and time that the broadcast actually ended. This information is
@@ -9423,7 +10122,6 @@
 }
 
 
-/** Not documented yet. */
 class LiveBroadcastStatus {
   /**
    * The broadcast's status. The status can be updated using the API's
@@ -9651,7 +10349,6 @@
 }
 
 
-/** Not documented yet. */
 class LiveStreamListResponse {
   /** Etag of this resource. */
   core.String etag;
@@ -9674,7 +10371,6 @@
    */
   core.String nextPageToken;
 
-  /** Not documented yet. */
   PageInfo pageInfo;
 
   /**
@@ -9683,7 +10379,6 @@
    */
   core.String prevPageToken;
 
-  /** Not documented yet. */
   TokenPagination tokenPagination;
 
   /** The visitorId identifies the visitor. */
@@ -9756,7 +10451,6 @@
 }
 
 
-/** Not documented yet. */
 class LiveStreamSnippet {
   /**
    * The ID that YouTube uses to uniquely identify the channel that is
@@ -9820,7 +10514,7 @@
 /** Brief description of the live stream status. */
 class LiveStreamStatus {
   /**
-   * Not documented yet.
+   *
    * Possible string values are:
    * - "active"
    * - "created"
@@ -9849,15 +10543,12 @@
 }
 
 
-/** Not documented yet. */
 class LocalizedProperty {
-  /** Not documented yet. */
   core.String default_;
 
   /** The language of the default property. */
   LanguageTag defaultLanguage;
 
-  /** Not documented yet. */
   core.List<LocalizedString> localized;
 
 
@@ -9891,12 +10582,9 @@
 }
 
 
-/** Not documented yet. */
 class LocalizedString {
-  /** Not documented yet. */
   core.String language;
 
-  /** Not documented yet. */
   core.String value;
 
 
@@ -10090,7 +10778,7 @@
       kind = _json["kind"];
     }
     if (_json.containsKey("localizations")) {
-      localizations = common_internal.mapMap(_json["localizations"], (item) => new PlaylistLocalization.fromJson(item));
+      localizations = commons.mapMap(_json["localizations"], (item) => new PlaylistLocalization.fromJson(item));
     }
     if (_json.containsKey("player")) {
       player = new PlaylistPlayer.fromJson(_json["player"]);
@@ -10118,7 +10806,7 @@
       _json["kind"] = kind;
     }
     if (localizations != null) {
-      _json["localizations"] = common_internal.mapMap(localizations, (item) => (item).toJson());
+      _json["localizations"] = commons.mapMap(localizations, (item) => (item).toJson());
     }
     if (player != null) {
       _json["player"] = (player).toJson();
@@ -10134,7 +10822,6 @@
 }
 
 
-/** Not documented yet. */
 class PlaylistContentDetails {
   /** The number of videos in the playlist. */
   core.int itemCount;
@@ -10262,7 +10949,6 @@
 }
 
 
-/** Not documented yet. */
 class PlaylistItemContentDetails {
   /**
    * The time, measured in seconds from the start of the video, when the video
@@ -10328,7 +11014,6 @@
 }
 
 
-/** Not documented yet. */
 class PlaylistItemListResponse {
   /** Etag of this resource. */
   core.String etag;
@@ -10351,7 +11036,6 @@
    */
   core.String nextPageToken;
 
-  /** Not documented yet. */
   PageInfo pageInfo;
 
   /**
@@ -10360,7 +11044,6 @@
    */
   core.String prevPageToken;
 
-  /** Not documented yet. */
   TokenPagination tokenPagination;
 
   /** The visitorId identifies the visitor. */
@@ -10581,7 +11264,6 @@
 }
 
 
-/** Not documented yet. */
 class PlaylistListResponse {
   /** Etag of this resource. */
   core.String etag;
@@ -10604,7 +11286,6 @@
    */
   core.String nextPageToken;
 
-  /** Not documented yet. */
   PageInfo pageInfo;
 
   /**
@@ -10613,7 +11294,6 @@
    */
   core.String prevPageToken;
 
-  /** Not documented yet. */
   TokenPagination tokenPagination;
 
   /** The visitorId identifies the visitor. */
@@ -10719,7 +11399,6 @@
 }
 
 
-/** Not documented yet. */
 class PlaylistPlayer {
   /** An <iframe> tag that embeds a player that will play the playlist. */
   core.String embedHtml;
@@ -10851,7 +11530,6 @@
 }
 
 
-/** Not documented yet. */
 class PlaylistStatus {
   /**
    * The playlist's privacy status.
@@ -11111,7 +11789,6 @@
 }
 
 
-/** Not documented yet. */
 class SearchListResponse {
   /** Etag of this resource. */
   core.String etag;
@@ -11134,7 +11811,6 @@
    */
   core.String nextPageToken;
 
-  /** Not documented yet. */
   PageInfo pageInfo;
 
   /**
@@ -11143,7 +11819,6 @@
    */
   core.String prevPageToken;
 
-  /** Not documented yet. */
   TokenPagination tokenPagination;
 
   /** The visitorId identifies the visitor. */
@@ -11520,7 +12195,6 @@
 }
 
 
-/** Not documented yet. */
 class SubscriptionListResponse {
   /** Etag of this resource. */
   core.String etag;
@@ -11543,7 +12217,6 @@
    */
   core.String nextPageToken;
 
-  /** Not documented yet. */
   PageInfo pageInfo;
 
   /**
@@ -11552,7 +12225,6 @@
    */
   core.String prevPageToken;
 
-  /** Not documented yet. */
   TokenPagination tokenPagination;
 
   /** The visitorId identifies the visitor. */
@@ -11874,7 +12546,6 @@
 }
 
 
-/** Not documented yet. */
 class ThumbnailSetResponse {
   /** Etag of this resource. */
   core.String etag;
@@ -12094,7 +12765,7 @@
       liveStreamingDetails = new VideoLiveStreamingDetails.fromJson(_json["liveStreamingDetails"]);
     }
     if (_json.containsKey("localizations")) {
-      localizations = common_internal.mapMap(_json["localizations"], (item) => new VideoLocalization.fromJson(item));
+      localizations = commons.mapMap(_json["localizations"], (item) => new VideoLocalization.fromJson(item));
     }
     if (_json.containsKey("monetizationDetails")) {
       monetizationDetails = new VideoMonetizationDetails.fromJson(_json["monetizationDetails"]);
@@ -12155,7 +12826,7 @@
       _json["liveStreamingDetails"] = (liveStreamingDetails).toJson();
     }
     if (localizations != null) {
-      _json["localizations"] = common_internal.mapMap(localizations, (item) => (item).toJson());
+      _json["localizations"] = commons.mapMap(localizations, (item) => (item).toJson());
     }
     if (monetizationDetails != null) {
       _json["monetizationDetails"] = (monetizationDetails).toJson();
@@ -12192,7 +12863,6 @@
 }
 
 
-/** Not documented yet. */
 class VideoAgeGating {
   /**
    * Indicates whether or not the video has alcoholic beverage content. Only
@@ -12309,7 +12979,6 @@
 }
 
 
-/** Not documented yet. */
 class VideoCategoryListResponse {
   /** Etag of this resource. */
   core.String etag;
@@ -12336,7 +13005,6 @@
    */
   core.String nextPageToken;
 
-  /** Not documented yet. */
   PageInfo pageInfo;
 
   /**
@@ -12345,7 +13013,6 @@
    */
   core.String prevPageToken;
 
-  /** Not documented yet. */
   TokenPagination tokenPagination;
 
   /** The visitorId identifies the visitor. */
@@ -12420,7 +13087,6 @@
 
 /** Basic details about a video category, such as its localized title. */
 class VideoCategorySnippet {
-  /** Not documented yet. */
   core.bool assignable;
 
   /** The YouTube channel that created the video category. */
@@ -12625,7 +13291,6 @@
 }
 
 
-/** Not documented yet. */
 class VideoConversionPing {
   /**
    * Defines the context of the ping.
@@ -12673,7 +13338,6 @@
 }
 
 
-/** Not documented yet. */
 class VideoConversionPings {
   /**
    * Pings that the app shall fire for a video (authenticated by biscotti
@@ -13006,7 +13670,6 @@
 }
 
 
-/** Not documented yet. */
 class VideoGetRatingResponse {
   /** Etag of this resource. */
   core.String etag;
@@ -13069,7 +13732,6 @@
 }
 
 
-/** Not documented yet. */
 class VideoListResponse {
   /** Etag of this resource. */
   core.String etag;
@@ -13092,7 +13754,6 @@
    */
   core.String nextPageToken;
 
-  /** Not documented yet. */
   PageInfo pageInfo;
 
   /**
@@ -13101,7 +13762,6 @@
    */
   core.String prevPageToken;
 
-  /** Not documented yet. */
   TokenPagination tokenPagination;
 
   /** The visitorId identifies the visitor. */
@@ -13556,10 +14216,9 @@
 }
 
 
-/** Not documented yet. */
 class VideoRating {
   /**
-   * Not documented yet.
+   *
    * Possible string values are:
    * - "dislike"
    * - "like"
@@ -13568,7 +14227,6 @@
    */
   core.String rating;
 
-  /** Not documented yet. */
   core.String videoId;
 
 
@@ -14200,5 +14858,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/lib/youtubeanalytics/v1.dart b/generated/googleapis/lib/youtubeanalytics/v1.dart
index 72265be..7c063ca 100644
--- a/generated/googleapis/lib/youtubeanalytics/v1.dart
+++ b/generated/googleapis/lib/youtubeanalytics/v1.dart
@@ -1,17 +1,20 @@
+// This is a generated file (see the discoveryapis_generator project).
+
 library googleapis.youtubeAnalytics.v1;
 
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
+import 'dart:core' as core;
+import 'dart:collection' as collection;
+import 'dart:async' as async;
+import 'dart:convert' as convert;
 
-import "package:crypto/crypto.dart" as crypto;
+import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
+import 'package:crypto/crypto.dart' as crypto;
 import 'package:http/http.dart' as http;
-import '../src/common_internal.dart' as common_internal;
-import '../common/common.dart' as common;
 
-export '../common/common.dart' show ApiRequestError;
-export '../common/common.dart' show DetailedApiRequestError;
+export 'package:_discoveryapis_commons/_discoveryapis_commons.dart' show
+    ApiRequestError, DetailedApiRequestError;
+
+const core.String USER_AGENT = 'dart-api-client youtubeAnalytics/v1';
 
 /** Retrieve your YouTube Analytics reports. */
 class YoutubeAnalyticsApi {
@@ -31,7 +34,7 @@
   static const YtAnalyticsReadonlyScope = "https://www.googleapis.com/auth/yt-analytics.readonly";
 
 
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
   BatchReportDefinitionsResourceApi get batchReportDefinitions => new BatchReportDefinitionsResourceApi(_requester);
   BatchReportsResourceApi get batchReports => new BatchReportsResourceApi(_requester);
@@ -40,15 +43,14 @@
   ReportsResourceApi get reports => new ReportsResourceApi(_requester);
 
   YoutubeAnalyticsApi(http.Client client, {core.String rootUrl: "https://www.googleapis.com/", core.String servicePath: "youtube/analytics/v1/"}) :
-      _requester = new common_internal.ApiRequester(client, rootUrl, servicePath);
+      _requester = new commons.ApiRequester(client, rootUrl, servicePath, USER_AGENT);
 }
 
 
-/** Not documented yet. */
 class BatchReportDefinitionsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  BatchReportDefinitionsResourceApi(common_internal.ApiRequester client) : 
+  BatchReportDefinitionsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -61,7 +63,7 @@
    *
    * Completes with a [BatchReportDefinitionList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -72,7 +74,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (onBehalfOfContentOwner == null) {
@@ -96,11 +98,10 @@
 }
 
 
-/** Not documented yet. */
 class BatchReportsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  BatchReportsResourceApi(common_internal.ApiRequester client) : 
+  BatchReportsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -117,7 +118,7 @@
    *
    * Completes with a [BatchReportList].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -128,7 +129,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (batchReportDefinitionId == null) {
@@ -156,11 +157,10 @@
 }
 
 
-/** Not documented yet. */
 class GroupItemsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  GroupItemsResourceApi(common_internal.ApiRequester client) : 
+  GroupItemsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -184,7 +184,7 @@
    * account that the user authenticates with must be linked to the specified
    * YouTube content owner.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -195,7 +195,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -242,7 +242,7 @@
    *
    * Completes with a [GroupItem].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -253,7 +253,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -299,7 +299,7 @@
    *
    * Completes with a [GroupItemListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -310,7 +310,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (groupId == null) {
@@ -337,11 +337,10 @@
 }
 
 
-/** Not documented yet. */
 class GroupsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  GroupsResourceApi(common_internal.ApiRequester client) : 
+  GroupsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -365,7 +364,7 @@
    * account that the user authenticates with must be linked to the specified
    * YouTube content owner.
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -376,7 +375,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id == null) {
@@ -423,7 +422,7 @@
    *
    * Completes with a [Group].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -434,7 +433,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -486,7 +485,7 @@
    *
    * Completes with a [GroupListResponse].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -497,7 +496,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (id != null) {
@@ -545,7 +544,7 @@
    *
    * Completes with a [Group].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
@@ -556,7 +555,7 @@
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (request != null) {
@@ -582,11 +581,10 @@
 }
 
 
-/** Not documented yet. */
 class ReportsResourceApi {
-  final common_internal.ApiRequester _requester;
+  final commons.ApiRequester _requester;
 
-  ReportsResourceApi(common_internal.ApiRequester client) : 
+  ReportsResourceApi(commons.ApiRequester client) : 
       _requester = client;
 
   /**
@@ -618,6 +616,12 @@
    * and see the Metrics document for definitions of those metrics.
    * Value must have pattern "[0-9a-zA-Z,]+".
    *
+   * [currency] - The currency to which financial metrics should be converted.
+   * The default is US Dollar (USD). If the result contains no financial
+   * metrics, this flag will be ignored. Responds with an error if the specified
+   * currency is not recognized.
+   * Value must have pattern "[A-Z]{3}".
+   *
    * [dimensions] - A comma-separated list of YouTube Analytics dimensions, such
    * as views or ageGroup,gender. See the Available Reports document for a list
    * of the reports that you can retrieve and the dimensions used for those
@@ -647,18 +651,18 @@
    *
    * Completes with a [ResultTable].
    *
-   * Completes with a [common.ApiRequestError] if the API endpoint returned an
+   * Completes with a [commons.ApiRequestError] if the API endpoint returned an
    * error.
    *
    * If the used [http.Client] completes with an error when making a REST call,
    * this method  will complete with the same error.
    */
-  async.Future<ResultTable> query(core.String ids, core.String start_date, core.String end_date, core.String metrics, {core.String dimensions, core.String filters, core.int max_results, core.String sort, core.int start_index}) {
+  async.Future<ResultTable> query(core.String ids, core.String start_date, core.String end_date, core.String metrics, {core.String currency, core.String dimensions, core.String filters, core.int max_results, core.String sort, core.int start_index}) {
     var _url = null;
     var _queryParams = new core.Map();
     var _uploadMedia = null;
     var _uploadOptions = null;
-    var _downloadOptions = common.DownloadOptions.Metadata;
+    var _downloadOptions = commons.DownloadOptions.Metadata;
     var _body = null;
 
     if (ids == null) {
@@ -677,6 +681,9 @@
       throw new core.ArgumentError("Parameter metrics is required.");
     }
     _queryParams["metrics"] = [metrics];
+    if (currency != null) {
+      _queryParams["currency"] = [currency];
+    }
     if (dimensions != null) {
       _queryParams["dimensions"] = [dimensions];
     }
@@ -710,7 +717,6 @@
 
 
 
-/** Not documented yet. */
 class BatchReportOutputs {
   /**
    * Cloud storage URL to download this report. This URL is valid for 30
@@ -1017,12 +1023,9 @@
 }
 
 
-/** Not documented yet. */
 class GroupContentDetails {
-  /** Not documented yet. */
   core.String itemCount;
 
-  /** Not documented yet. */
   core.String itemType;
 
 
@@ -1050,12 +1053,9 @@
 }
 
 
-/** Not documented yet. */
 class GroupSnippet {
-  /** Not documented yet. */
   core.DateTime publishedAt;
 
-  /** Not documented yet. */
   core.String title;
 
 
@@ -1083,21 +1083,15 @@
 }
 
 
-/** Not documented yet. */
 class Group {
-  /** Not documented yet. */
   GroupContentDetails contentDetails;
 
-  /** Not documented yet. */
   core.String etag;
 
-  /** Not documented yet. */
   core.String id;
 
-  /** Not documented yet. */
   core.String kind;
 
-  /** Not documented yet. */
   GroupSnippet snippet;
 
 
@@ -1143,12 +1137,9 @@
 }
 
 
-/** Not documented yet. */
 class GroupItemResource {
-  /** Not documented yet. */
   core.String id;
 
-  /** Not documented yet. */
   core.String kind;
 
 
@@ -1176,21 +1167,15 @@
 }
 
 
-/** Not documented yet. */
 class GroupItem {
-  /** Not documented yet. */
   core.String etag;
 
-  /** Not documented yet. */
   core.String groupId;
 
-  /** Not documented yet. */
   core.String id;
 
-  /** Not documented yet. */
   core.String kind;
 
-  /** Not documented yet. */
   GroupItemResource resource;
 
 
@@ -1241,13 +1226,10 @@
  * youtubeAnalytics.groupApi.list request.
  */
 class GroupItemListResponse {
-  /** Not documented yet. */
   core.String etag;
 
-  /** Not documented yet. */
   core.List<GroupItem> items;
 
-  /** Not documented yet. */
   core.String kind;
 
 
@@ -1286,13 +1268,10 @@
  * youtubeAnalytics.groupApi.list request.
  */
 class GroupListResponse {
-  /** Not documented yet. */
   core.String etag;
 
-  /** Not documented yet. */
   core.List<Group> items;
 
-  /** Not documented yet. */
   core.String kind;
 
 
@@ -1326,7 +1305,6 @@
 }
 
 
-/** Not documented yet. */
 class ResultTableColumnHeaders {
   /** The type of the column (DIMENSION or METRIC). */
   core.String columnType;
@@ -1437,5 +1415,3 @@
     return _json;
   }
 }
-
-
diff --git a/generated/googleapis/pubspec.yaml b/generated/googleapis/pubspec.yaml
index 26c8b96..dd42124 100644
--- a/generated/googleapis/pubspec.yaml
+++ b/generated/googleapis/pubspec.yaml
@@ -1,11 +1,13 @@
 name: googleapis
-version: 0.6.1
+version: 0.7.0
 author: Dart Team <misc@dartlang.org>
-description: "Auto-generated client libraries for accessing the following APIs:adexchangebuyer:v1.3, adexchangeseller:v1.1, adexchangeseller:v2.0, admin:directory_v1, admin:email_migration_v2, admin:reports_v1, adsense:v1.4, adsensehost:v4.1, analytics:v3, androidpublisher:v2, appsactivity:v1, appstate:v1, bigquery:v2, blogger:v3, books:v1, calendar:v3, civicinfo:us_v1, civicinfo:v1, civicinfo:v2, compute:v1, content:v2, coordinate:v1, customsearch:v1, dfareporting:v1.3, dfareporting:v2.0, discovery:v1, doubleclickbidmanager:v1, doubleclicksearch:v2, drive:v2, fitness:v1, freebase:v1, fusiontables:v1, fusiontables:v2, games:v1, gamesConfiguration:v1configuration, gamesManagement:v1management, gmail:v1, groupsmigration:v1, groupssettings:v1, identitytoolkit:v3, licensing:v1, mapsengine:v1, mirror:v1, oauth2:v2, pagespeedonline:v1, pagespeedonline:v2, plus:v1, plusDomains:v1, prediction:v1.6, qpxExpress:v1, reseller:v1, siteVerification:v1, storage:v1, tagmanager:v1, tasks:v1, translate:v2, urlshortener:v1, webfonts:v1, webmasters:v3, youtube:v3, youtubeAnalytics:v1"
+description: "Auto-generated client libraries for accessing the following APIs:adexchangebuyer:v1.3, adexchangeseller:v1.1, adexchangeseller:v2.0, admin:directory_v1, admin:email_migration_v2, admin:reports_v1, adsense:v1.4, adsensehost:v4.1, analytics:v3, androidenterprise:v1, androidpublisher:v2, appsactivity:v1, appstate:v1, bigquery:v2, blogger:v3, books:v1, calendar:v3, civicinfo:v2, compute:v1, content:v2, coordinate:v1, customsearch:v1, dfareporting:v1.3, dfareporting:v2.0, discovery:v1, doubleclickbidmanager:v1, doubleclicksearch:v2, drive:v2, fitness:v1, freebase:v1, fusiontables:v1, fusiontables:v2, games:v1, gamesConfiguration:v1configuration, gamesManagement:v1management, gmail:v1, groupsmigration:v1, groupssettings:v1, identitytoolkit:v3, licensing:v1, mapsengine:v1, mirror:v1, oauth2:v2, pagespeedonline:v1, pagespeedonline:v2, plus:v1, plusDomains:v1, prediction:v1.6, qpxExpress:v1, reseller:v1, siteVerification:v1, storage:v1, tagmanager:v1, tasks:v1, translate:v2, urlshortener:v1, webfonts:v1, webmasters:v3, youtube:v3, youtubeAnalytics:v1, cloudsearch:v1"
 homepage: http://www.dartlang.org/googleapis/
 environment:
   sdk: '>=1.0.0 <2.0.0'
 dependencies:
+  # This is a private package dependency used by the generated client stubs.
+  _discoveryapis_commons: '>=0.1.0 <0.2.0'
   crypto: '>=0.9.0 <0.10.0'
   http: '>=0.11.1 <0.12.0'
 dev_dependencies:
diff --git a/generated/googleapis/test/adexchangebuyer/v1_3_test.dart b/generated/googleapis/test/adexchangebuyer/v1_3_test.dart
index 019af5d..01b2d2f 100644
--- a/generated/googleapis/test/adexchangebuyer/v1_3_test.dart
+++ b/generated/googleapis/test/adexchangebuyer/v1_3_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/adexchangebuyer/v1_3.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterAccountBidderLocation = 0;
 buildAccountBidderLocation() {
@@ -39,14 +74,14 @@
   buildCounterAccountBidderLocation--;
 }
 
-buildUnnamed849() {
+buildUnnamed0() {
   var o = new core.List<api.AccountBidderLocation>();
   o.add(buildAccountBidderLocation());
   o.add(buildAccountBidderLocation());
   return o;
 }
 
-checkUnnamed849(core.List<api.AccountBidderLocation> o) {
+checkUnnamed0(core.List<api.AccountBidderLocation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountBidderLocation(o[0]);
   checkAccountBidderLocation(o[1]);
@@ -57,7 +92,7 @@
   var o = new api.Account();
   buildCounterAccount++;
   if (buildCounterAccount < 3) {
-    o.bidderLocation = buildUnnamed849();
+    o.bidderLocation = buildUnnamed0();
     o.cookieMatchingNid = "foo";
     o.cookieMatchingUrl = "foo";
     o.id = 42;
@@ -73,7 +108,7 @@
 checkAccount(api.Account o) {
   buildCounterAccount++;
   if (buildCounterAccount < 3) {
-    checkUnnamed849(o.bidderLocation);
+    checkUnnamed0(o.bidderLocation);
     unittest.expect(o.cookieMatchingNid, unittest.equals('foo'));
     unittest.expect(o.cookieMatchingUrl, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals(42));
@@ -85,14 +120,14 @@
   buildCounterAccount--;
 }
 
-buildUnnamed850() {
+buildUnnamed1() {
   var o = new core.List<api.Account>();
   o.add(buildAccount());
   o.add(buildAccount());
   return o;
 }
 
-checkUnnamed850(core.List<api.Account> o) {
+checkUnnamed1(core.List<api.Account> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccount(o[0]);
   checkAccount(o[1]);
@@ -103,7 +138,7 @@
   var o = new api.AccountsList();
   buildCounterAccountsList++;
   if (buildCounterAccountsList < 3) {
-    o.items = buildUnnamed850();
+    o.items = buildUnnamed1();
     o.kind = "foo";
   }
   buildCounterAccountsList--;
@@ -113,20 +148,20 @@
 checkAccountsList(api.AccountsList o) {
   buildCounterAccountsList++;
   if (buildCounterAccountsList < 3) {
-    checkUnnamed850(o.items);
+    checkUnnamed1(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAccountsList--;
 }
 
-buildUnnamed851() {
+buildUnnamed2() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed851(core.List<core.String> o) {
+checkUnnamed2(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -139,7 +174,7 @@
   if (buildCounterBillingInfo < 3) {
     o.accountId = 42;
     o.accountName = "foo";
-    o.billingId = buildUnnamed851();
+    o.billingId = buildUnnamed2();
     o.kind = "foo";
   }
   buildCounterBillingInfo--;
@@ -151,20 +186,20 @@
   if (buildCounterBillingInfo < 3) {
     unittest.expect(o.accountId, unittest.equals(42));
     unittest.expect(o.accountName, unittest.equals('foo'));
-    checkUnnamed851(o.billingId);
+    checkUnnamed2(o.billingId);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterBillingInfo--;
 }
 
-buildUnnamed852() {
+buildUnnamed3() {
   var o = new core.List<api.BillingInfo>();
   o.add(buildBillingInfo());
   o.add(buildBillingInfo());
   return o;
 }
 
-checkUnnamed852(core.List<api.BillingInfo> o) {
+checkUnnamed3(core.List<api.BillingInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBillingInfo(o[0]);
   checkBillingInfo(o[1]);
@@ -175,7 +210,7 @@
   var o = new api.BillingInfoList();
   buildCounterBillingInfoList++;
   if (buildCounterBillingInfoList < 3) {
-    o.items = buildUnnamed852();
+    o.items = buildUnnamed3();
     o.kind = "foo";
   }
   buildCounterBillingInfoList--;
@@ -185,7 +220,7 @@
 checkBillingInfoList(api.BillingInfoList o) {
   buildCounterBillingInfoList++;
   if (buildCounterBillingInfoList < 3) {
-    checkUnnamed852(o.items);
+    checkUnnamed3(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterBillingInfoList--;
@@ -220,53 +255,53 @@
   buildCounterBudget--;
 }
 
-buildUnnamed853() {
+buildUnnamed4() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed853(core.List<core.String> o) {
+checkUnnamed4(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed854() {
+buildUnnamed5() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed854(core.List<core.int> o) {
+checkUnnamed5(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
-buildUnnamed855() {
+buildUnnamed6() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed855(core.List<core.String> o) {
+checkUnnamed6(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed856() {
+buildUnnamed7() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed856(core.List<core.String> o) {
+checkUnnamed7(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -277,7 +312,7 @@
   var o = new api.CreativeCorrections();
   buildCounterCreativeCorrections++;
   if (buildCounterCreativeCorrections < 3) {
-    o.details = buildUnnamed856();
+    o.details = buildUnnamed7();
     o.reason = "foo";
   }
   buildCounterCreativeCorrections--;
@@ -287,33 +322,33 @@
 checkCreativeCorrections(api.CreativeCorrections o) {
   buildCounterCreativeCorrections++;
   if (buildCounterCreativeCorrections < 3) {
-    checkUnnamed856(o.details);
+    checkUnnamed7(o.details);
     unittest.expect(o.reason, unittest.equals('foo'));
   }
   buildCounterCreativeCorrections--;
 }
 
-buildUnnamed857() {
+buildUnnamed8() {
   var o = new core.List<api.CreativeCorrections>();
   o.add(buildCreativeCorrections());
   o.add(buildCreativeCorrections());
   return o;
 }
 
-checkUnnamed857(core.List<api.CreativeCorrections> o) {
+checkUnnamed8(core.List<api.CreativeCorrections> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeCorrections(o[0]);
   checkCreativeCorrections(o[1]);
 }
 
-buildUnnamed858() {
+buildUnnamed9() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed858(core.List<core.String> o) {
+checkUnnamed9(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -324,7 +359,7 @@
   var o = new api.CreativeDisapprovalReasons();
   buildCounterCreativeDisapprovalReasons++;
   if (buildCounterCreativeDisapprovalReasons < 3) {
-    o.details = buildUnnamed858();
+    o.details = buildUnnamed9();
     o.reason = "foo";
   }
   buildCounterCreativeDisapprovalReasons--;
@@ -334,20 +369,20 @@
 checkCreativeDisapprovalReasons(api.CreativeDisapprovalReasons o) {
   buildCounterCreativeDisapprovalReasons++;
   if (buildCounterCreativeDisapprovalReasons < 3) {
-    checkUnnamed858(o.details);
+    checkUnnamed9(o.details);
     unittest.expect(o.reason, unittest.equals('foo'));
   }
   buildCounterCreativeDisapprovalReasons--;
 }
 
-buildUnnamed859() {
+buildUnnamed10() {
   var o = new core.List<api.CreativeDisapprovalReasons>();
   o.add(buildCreativeDisapprovalReasons());
   o.add(buildCreativeDisapprovalReasons());
   return o;
 }
 
-checkUnnamed859(core.List<api.CreativeDisapprovalReasons> o) {
+checkUnnamed10(core.List<api.CreativeDisapprovalReasons> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeDisapprovalReasons(o[0]);
   checkCreativeDisapprovalReasons(o[1]);
@@ -374,14 +409,14 @@
   buildCounterCreativeFilteringReasonsReasons--;
 }
 
-buildUnnamed860() {
+buildUnnamed11() {
   var o = new core.List<api.CreativeFilteringReasonsReasons>();
   o.add(buildCreativeFilteringReasonsReasons());
   o.add(buildCreativeFilteringReasonsReasons());
   return o;
 }
 
-checkUnnamed860(core.List<api.CreativeFilteringReasonsReasons> o) {
+checkUnnamed11(core.List<api.CreativeFilteringReasonsReasons> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeFilteringReasonsReasons(o[0]);
   checkCreativeFilteringReasonsReasons(o[1]);
@@ -393,7 +428,7 @@
   buildCounterCreativeFilteringReasons++;
   if (buildCounterCreativeFilteringReasons < 3) {
     o.date = "foo";
-    o.reasons = buildUnnamed860();
+    o.reasons = buildUnnamed11();
   }
   buildCounterCreativeFilteringReasons--;
   return o;
@@ -403,58 +438,58 @@
   buildCounterCreativeFilteringReasons++;
   if (buildCounterCreativeFilteringReasons < 3) {
     unittest.expect(o.date, unittest.equals('foo'));
-    checkUnnamed860(o.reasons);
+    checkUnnamed11(o.reasons);
   }
   buildCounterCreativeFilteringReasons--;
 }
 
-buildUnnamed861() {
+buildUnnamed12() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed861(core.List<core.int> o) {
+checkUnnamed12(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
-buildUnnamed862() {
+buildUnnamed13() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed862(core.List<core.int> o) {
+checkUnnamed13(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
-buildUnnamed863() {
+buildUnnamed14() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed863(core.List<core.int> o) {
+checkUnnamed14(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
-buildUnnamed864() {
+buildUnnamed15() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed864(core.List<core.int> o) {
+checkUnnamed15(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
@@ -467,22 +502,22 @@
   if (buildCounterCreative < 3) {
     o.HTMLSnippet = "foo";
     o.accountId = 42;
-    o.advertiserId = buildUnnamed853();
+    o.advertiserId = buildUnnamed4();
     o.advertiserName = "foo";
     o.agencyId = "foo";
-    o.attribute = buildUnnamed854();
+    o.attribute = buildUnnamed5();
     o.buyerCreativeId = "foo";
-    o.clickThroughUrl = buildUnnamed855();
-    o.corrections = buildUnnamed857();
-    o.disapprovalReasons = buildUnnamed859();
+    o.clickThroughUrl = buildUnnamed6();
+    o.corrections = buildUnnamed8();
+    o.disapprovalReasons = buildUnnamed10();
     o.filteringReasons = buildCreativeFilteringReasons();
     o.height = 42;
     o.kind = "foo";
-    o.productCategories = buildUnnamed861();
-    o.restrictedCategories = buildUnnamed862();
-    o.sensitiveCategories = buildUnnamed863();
+    o.productCategories = buildUnnamed12();
+    o.restrictedCategories = buildUnnamed13();
+    o.sensitiveCategories = buildUnnamed14();
     o.status = "foo";
-    o.vendorType = buildUnnamed864();
+    o.vendorType = buildUnnamed15();
     o.videoURL = "foo";
     o.width = 42;
   }
@@ -495,36 +530,36 @@
   if (buildCounterCreative < 3) {
     unittest.expect(o.HTMLSnippet, unittest.equals('foo'));
     unittest.expect(o.accountId, unittest.equals(42));
-    checkUnnamed853(o.advertiserId);
+    checkUnnamed4(o.advertiserId);
     unittest.expect(o.advertiserName, unittest.equals('foo'));
     unittest.expect(o.agencyId, unittest.equals('foo'));
-    checkUnnamed854(o.attribute);
+    checkUnnamed5(o.attribute);
     unittest.expect(o.buyerCreativeId, unittest.equals('foo'));
-    checkUnnamed855(o.clickThroughUrl);
-    checkUnnamed857(o.corrections);
-    checkUnnamed859(o.disapprovalReasons);
+    checkUnnamed6(o.clickThroughUrl);
+    checkUnnamed8(o.corrections);
+    checkUnnamed10(o.disapprovalReasons);
     checkCreativeFilteringReasons(o.filteringReasons);
     unittest.expect(o.height, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed861(o.productCategories);
-    checkUnnamed862(o.restrictedCategories);
-    checkUnnamed863(o.sensitiveCategories);
+    checkUnnamed12(o.productCategories);
+    checkUnnamed13(o.restrictedCategories);
+    checkUnnamed14(o.sensitiveCategories);
     unittest.expect(o.status, unittest.equals('foo'));
-    checkUnnamed864(o.vendorType);
+    checkUnnamed15(o.vendorType);
     unittest.expect(o.videoURL, unittest.equals('foo'));
     unittest.expect(o.width, unittest.equals(42));
   }
   buildCounterCreative--;
 }
 
-buildUnnamed865() {
+buildUnnamed16() {
   var o = new core.List<api.Creative>();
   o.add(buildCreative());
   o.add(buildCreative());
   return o;
 }
 
-checkUnnamed865(core.List<api.Creative> o) {
+checkUnnamed16(core.List<api.Creative> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreative(o[0]);
   checkCreative(o[1]);
@@ -535,7 +570,7 @@
   var o = new api.CreativesList();
   buildCounterCreativesList++;
   if (buildCounterCreativesList < 3) {
-    o.items = buildUnnamed865();
+    o.items = buildUnnamed16();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -546,7 +581,7 @@
 checkCreativesList(api.CreativesList o) {
   buildCounterCreativesList++;
   if (buildCounterCreativesList < 3) {
-    checkUnnamed865(o.items);
+    checkUnnamed16(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -594,14 +629,14 @@
   buildCounterDirectDeal--;
 }
 
-buildUnnamed866() {
+buildUnnamed17() {
   var o = new core.List<api.DirectDeal>();
   o.add(buildDirectDeal());
   o.add(buildDirectDeal());
   return o;
 }
 
-checkUnnamed866(core.List<api.DirectDeal> o) {
+checkUnnamed17(core.List<api.DirectDeal> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDirectDeal(o[0]);
   checkDirectDeal(o[1]);
@@ -612,7 +647,7 @@
   var o = new api.DirectDealsList();
   buildCounterDirectDealsList++;
   if (buildCounterDirectDealsList < 3) {
-    o.directDeals = buildUnnamed866();
+    o.directDeals = buildUnnamed17();
     o.kind = "foo";
   }
   buildCounterDirectDealsList--;
@@ -622,59 +657,59 @@
 checkDirectDealsList(api.DirectDealsList o) {
   buildCounterDirectDealsList++;
   if (buildCounterDirectDealsList < 3) {
-    checkUnnamed866(o.directDeals);
+    checkUnnamed17(o.directDeals);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterDirectDealsList--;
 }
 
-buildUnnamed867() {
+buildUnnamed18() {
   var o = new core.List<core.Object>();
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   return o;
 }
 
-checkUnnamed867(core.List<core.Object> o) {
+checkUnnamed18(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o[0]) as core.Map; unittest.expect(casted1, unittest.hasLength(3)); unittest.expect(casted1["list"], unittest.equals([1, 2, 3])); unittest.expect(casted1["bool"], unittest.equals(true)); unittest.expect(casted1["string"], unittest.equals('foo')); 
   var casted2 = (o[1]) as core.Map; unittest.expect(casted2, unittest.hasLength(3)); unittest.expect(casted2["list"], unittest.equals([1, 2, 3])); unittest.expect(casted2["bool"], unittest.equals(true)); unittest.expect(casted2["string"], unittest.equals('foo')); 
 }
 
-buildUnnamed868() {
+buildUnnamed19() {
   var o = new core.List<core.Object>();
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   return o;
 }
 
-checkUnnamed868(core.List<core.Object> o) {
+checkUnnamed19(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o[0]) as core.Map; unittest.expect(casted3, unittest.hasLength(3)); unittest.expect(casted3["list"], unittest.equals([1, 2, 3])); unittest.expect(casted3["bool"], unittest.equals(true)); unittest.expect(casted3["string"], unittest.equals('foo')); 
   var casted4 = (o[1]) as core.Map; unittest.expect(casted4, unittest.hasLength(3)); unittest.expect(casted4["list"], unittest.equals([1, 2, 3])); unittest.expect(casted4["bool"], unittest.equals(true)); unittest.expect(casted4["string"], unittest.equals('foo')); 
 }
 
-buildUnnamed869() {
+buildUnnamed20() {
   var o = new core.List<core.Object>();
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   return o;
 }
 
-checkUnnamed869(core.List<core.Object> o) {
+checkUnnamed20(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o[0]) as core.Map; unittest.expect(casted5, unittest.hasLength(3)); unittest.expect(casted5["list"], unittest.equals([1, 2, 3])); unittest.expect(casted5["bool"], unittest.equals(true)); unittest.expect(casted5["string"], unittest.equals('foo')); 
   var casted6 = (o[1]) as core.Map; unittest.expect(casted6, unittest.hasLength(3)); unittest.expect(casted6["list"], unittest.equals([1, 2, 3])); unittest.expect(casted6["bool"], unittest.equals(true)); unittest.expect(casted6["string"], unittest.equals('foo')); 
 }
 
-buildUnnamed870() {
+buildUnnamed21() {
   var o = new core.List<core.Object>();
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   return o;
 }
 
-checkUnnamed870(core.List<core.Object> o) {
+checkUnnamed21(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted7 = (o[0]) as core.Map; unittest.expect(casted7, unittest.hasLength(3)); unittest.expect(casted7["list"], unittest.equals([1, 2, 3])); unittest.expect(casted7["bool"], unittest.equals(true)); unittest.expect(casted7["string"], unittest.equals('foo')); 
   var casted8 = (o[1]) as core.Map; unittest.expect(casted8, unittest.hasLength(3)); unittest.expect(casted8["list"], unittest.equals([1, 2, 3])); unittest.expect(casted8["bool"], unittest.equals(true)); unittest.expect(casted8["string"], unittest.equals('foo')); 
@@ -685,10 +720,10 @@
   var o = new api.PerformanceReport();
   buildCounterPerformanceReport++;
   if (buildCounterPerformanceReport < 3) {
-    o.calloutStatusRate = buildUnnamed867();
-    o.cookieMatcherStatusRate = buildUnnamed868();
-    o.creativeStatusRate = buildUnnamed869();
-    o.hostedMatchStatusRate = buildUnnamed870();
+    o.calloutStatusRate = buildUnnamed18();
+    o.cookieMatcherStatusRate = buildUnnamed19();
+    o.creativeStatusRate = buildUnnamed20();
+    o.hostedMatchStatusRate = buildUnnamed21();
     o.kind = "foo";
     o.latency50thPercentile = 42.0;
     o.latency85thPercentile = 42.0;
@@ -709,10 +744,10 @@
 checkPerformanceReport(api.PerformanceReport o) {
   buildCounterPerformanceReport++;
   if (buildCounterPerformanceReport < 3) {
-    checkUnnamed867(o.calloutStatusRate);
-    checkUnnamed868(o.cookieMatcherStatusRate);
-    checkUnnamed869(o.creativeStatusRate);
-    checkUnnamed870(o.hostedMatchStatusRate);
+    checkUnnamed18(o.calloutStatusRate);
+    checkUnnamed19(o.cookieMatcherStatusRate);
+    checkUnnamed20(o.creativeStatusRate);
+    checkUnnamed21(o.hostedMatchStatusRate);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.latency50thPercentile, unittest.equals(42.0));
     unittest.expect(o.latency85thPercentile, unittest.equals(42.0));
@@ -729,14 +764,14 @@
   buildCounterPerformanceReport--;
 }
 
-buildUnnamed871() {
+buildUnnamed22() {
   var o = new core.List<api.PerformanceReport>();
   o.add(buildPerformanceReport());
   o.add(buildPerformanceReport());
   return o;
 }
 
-checkUnnamed871(core.List<api.PerformanceReport> o) {
+checkUnnamed22(core.List<api.PerformanceReport> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPerformanceReport(o[0]);
   checkPerformanceReport(o[1]);
@@ -748,7 +783,7 @@
   buildCounterPerformanceReportList++;
   if (buildCounterPerformanceReportList < 3) {
     o.kind = "foo";
-    o.performanceReport = buildUnnamed871();
+    o.performanceReport = buildUnnamed22();
   }
   buildCounterPerformanceReportList--;
   return o;
@@ -758,19 +793,19 @@
   buildCounterPerformanceReportList++;
   if (buildCounterPerformanceReportList < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed871(o.performanceReport);
+    checkUnnamed22(o.performanceReport);
   }
   buildCounterPerformanceReportList--;
 }
 
-buildUnnamed872() {
+buildUnnamed23() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed872(core.List<core.String> o) {
+checkUnnamed23(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -797,40 +832,40 @@
   buildCounterPretargetingConfigDimensions--;
 }
 
-buildUnnamed873() {
+buildUnnamed24() {
   var o = new core.List<api.PretargetingConfigDimensions>();
   o.add(buildPretargetingConfigDimensions());
   o.add(buildPretargetingConfigDimensions());
   return o;
 }
 
-checkUnnamed873(core.List<api.PretargetingConfigDimensions> o) {
+checkUnnamed24(core.List<api.PretargetingConfigDimensions> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPretargetingConfigDimensions(o[0]);
   checkPretargetingConfigDimensions(o[1]);
 }
 
-buildUnnamed874() {
+buildUnnamed25() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed874(core.List<core.String> o) {
+checkUnnamed25(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed875() {
+buildUnnamed26() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed875(core.List<core.String> o) {
+checkUnnamed26(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -857,105 +892,105 @@
   buildCounterPretargetingConfigExcludedPlacements--;
 }
 
-buildUnnamed876() {
+buildUnnamed27() {
   var o = new core.List<api.PretargetingConfigExcludedPlacements>();
   o.add(buildPretargetingConfigExcludedPlacements());
   o.add(buildPretargetingConfigExcludedPlacements());
   return o;
 }
 
-checkUnnamed876(core.List<api.PretargetingConfigExcludedPlacements> o) {
+checkUnnamed27(core.List<api.PretargetingConfigExcludedPlacements> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPretargetingConfigExcludedPlacements(o[0]);
   checkPretargetingConfigExcludedPlacements(o[1]);
 }
 
-buildUnnamed877() {
+buildUnnamed28() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed877(core.List<core.String> o) {
+checkUnnamed28(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed878() {
+buildUnnamed29() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed878(core.List<core.String> o) {
+checkUnnamed29(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed879() {
+buildUnnamed30() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed879(core.List<core.String> o) {
+checkUnnamed30(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed880() {
+buildUnnamed31() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed880(core.List<core.String> o) {
+checkUnnamed31(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed881() {
+buildUnnamed32() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed881(core.List<core.String> o) {
+checkUnnamed32(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed882() {
+buildUnnamed33() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed882(core.List<core.String> o) {
+checkUnnamed33(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed883() {
+buildUnnamed34() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed883(core.List<core.String> o) {
+checkUnnamed34(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -982,79 +1017,79 @@
   buildCounterPretargetingConfigPlacements--;
 }
 
-buildUnnamed884() {
+buildUnnamed35() {
   var o = new core.List<api.PretargetingConfigPlacements>();
   o.add(buildPretargetingConfigPlacements());
   o.add(buildPretargetingConfigPlacements());
   return o;
 }
 
-checkUnnamed884(core.List<api.PretargetingConfigPlacements> o) {
+checkUnnamed35(core.List<api.PretargetingConfigPlacements> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPretargetingConfigPlacements(o[0]);
   checkPretargetingConfigPlacements(o[1]);
 }
 
-buildUnnamed885() {
+buildUnnamed36() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed885(core.List<core.String> o) {
+checkUnnamed36(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed886() {
+buildUnnamed37() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed886(core.List<core.String> o) {
+checkUnnamed37(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed887() {
+buildUnnamed38() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed887(core.List<core.String> o) {
+checkUnnamed38(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed888() {
+buildUnnamed39() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed888(core.List<core.String> o) {
+checkUnnamed39(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed889() {
+buildUnnamed40() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed889(core.List<core.String> o) {
+checkUnnamed40(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1068,26 +1103,26 @@
     o.billingId = "foo";
     o.configId = "foo";
     o.configName = "foo";
-    o.creativeType = buildUnnamed872();
-    o.dimensions = buildUnnamed873();
-    o.excludedContentLabels = buildUnnamed874();
-    o.excludedGeoCriteriaIds = buildUnnamed875();
-    o.excludedPlacements = buildUnnamed876();
-    o.excludedUserLists = buildUnnamed877();
-    o.excludedVerticals = buildUnnamed878();
-    o.geoCriteriaIds = buildUnnamed879();
+    o.creativeType = buildUnnamed23();
+    o.dimensions = buildUnnamed24();
+    o.excludedContentLabels = buildUnnamed25();
+    o.excludedGeoCriteriaIds = buildUnnamed26();
+    o.excludedPlacements = buildUnnamed27();
+    o.excludedUserLists = buildUnnamed28();
+    o.excludedVerticals = buildUnnamed29();
+    o.geoCriteriaIds = buildUnnamed30();
     o.isActive = true;
     o.kind = "foo";
-    o.languages = buildUnnamed880();
-    o.mobileCarriers = buildUnnamed881();
-    o.mobileDevices = buildUnnamed882();
-    o.mobileOperatingSystemVersions = buildUnnamed883();
-    o.placements = buildUnnamed884();
-    o.platforms = buildUnnamed885();
-    o.supportedCreativeAttributes = buildUnnamed886();
-    o.userLists = buildUnnamed887();
-    o.vendorTypes = buildUnnamed888();
-    o.verticals = buildUnnamed889();
+    o.languages = buildUnnamed31();
+    o.mobileCarriers = buildUnnamed32();
+    o.mobileDevices = buildUnnamed33();
+    o.mobileOperatingSystemVersions = buildUnnamed34();
+    o.placements = buildUnnamed35();
+    o.platforms = buildUnnamed36();
+    o.supportedCreativeAttributes = buildUnnamed37();
+    o.userLists = buildUnnamed38();
+    o.vendorTypes = buildUnnamed39();
+    o.verticals = buildUnnamed40();
   }
   buildCounterPretargetingConfig--;
   return o;
@@ -1099,38 +1134,38 @@
     unittest.expect(o.billingId, unittest.equals('foo'));
     unittest.expect(o.configId, unittest.equals('foo'));
     unittest.expect(o.configName, unittest.equals('foo'));
-    checkUnnamed872(o.creativeType);
-    checkUnnamed873(o.dimensions);
-    checkUnnamed874(o.excludedContentLabels);
-    checkUnnamed875(o.excludedGeoCriteriaIds);
-    checkUnnamed876(o.excludedPlacements);
-    checkUnnamed877(o.excludedUserLists);
-    checkUnnamed878(o.excludedVerticals);
-    checkUnnamed879(o.geoCriteriaIds);
+    checkUnnamed23(o.creativeType);
+    checkUnnamed24(o.dimensions);
+    checkUnnamed25(o.excludedContentLabels);
+    checkUnnamed26(o.excludedGeoCriteriaIds);
+    checkUnnamed27(o.excludedPlacements);
+    checkUnnamed28(o.excludedUserLists);
+    checkUnnamed29(o.excludedVerticals);
+    checkUnnamed30(o.geoCriteriaIds);
     unittest.expect(o.isActive, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed880(o.languages);
-    checkUnnamed881(o.mobileCarriers);
-    checkUnnamed882(o.mobileDevices);
-    checkUnnamed883(o.mobileOperatingSystemVersions);
-    checkUnnamed884(o.placements);
-    checkUnnamed885(o.platforms);
-    checkUnnamed886(o.supportedCreativeAttributes);
-    checkUnnamed887(o.userLists);
-    checkUnnamed888(o.vendorTypes);
-    checkUnnamed889(o.verticals);
+    checkUnnamed31(o.languages);
+    checkUnnamed32(o.mobileCarriers);
+    checkUnnamed33(o.mobileDevices);
+    checkUnnamed34(o.mobileOperatingSystemVersions);
+    checkUnnamed35(o.placements);
+    checkUnnamed36(o.platforms);
+    checkUnnamed37(o.supportedCreativeAttributes);
+    checkUnnamed38(o.userLists);
+    checkUnnamed39(o.vendorTypes);
+    checkUnnamed40(o.verticals);
   }
   buildCounterPretargetingConfig--;
 }
 
-buildUnnamed890() {
+buildUnnamed41() {
   var o = new core.List<api.PretargetingConfig>();
   o.add(buildPretargetingConfig());
   o.add(buildPretargetingConfig());
   return o;
 }
 
-checkUnnamed890(core.List<api.PretargetingConfig> o) {
+checkUnnamed41(core.List<api.PretargetingConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPretargetingConfig(o[0]);
   checkPretargetingConfig(o[1]);
@@ -1141,7 +1176,7 @@
   var o = new api.PretargetingConfigList();
   buildCounterPretargetingConfigList++;
   if (buildCounterPretargetingConfigList < 3) {
-    o.items = buildUnnamed890();
+    o.items = buildUnnamed41();
     o.kind = "foo";
   }
   buildCounterPretargetingConfigList--;
@@ -1151,33 +1186,33 @@
 checkPretargetingConfigList(api.PretargetingConfigList o) {
   buildCounterPretargetingConfigList++;
   if (buildCounterPretargetingConfigList < 3) {
-    checkUnnamed890(o.items);
+    checkUnnamed41(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterPretargetingConfigList--;
 }
 
-buildUnnamed891() {
+buildUnnamed42() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed891(core.List<core.int> o) {
+checkUnnamed42(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
-buildUnnamed892() {
+buildUnnamed43() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed892(core.List<core.String> o) {
+checkUnnamed43(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1377,7 +1412,7 @@
   unittest.group("resource-AccountsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.AdexchangebuyerApi(mock).accounts;
       var arg_id = 42;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1417,7 +1452,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccount());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_id).then(unittest.expectAsync(((api.Account response) {
         checkAccount(response);
@@ -1426,7 +1461,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.AdexchangebuyerApi(mock).accounts;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1462,7 +1497,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountsList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list().then(unittest.expectAsync(((api.AccountsList response) {
         checkAccountsList(response);
@@ -1471,7 +1506,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.AdexchangebuyerApi(mock).accounts;
       var arg_request = buildAccount();
       var arg_id = 42;
@@ -1515,7 +1550,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccount());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_id).then(unittest.expectAsync(((api.Account response) {
         checkAccount(response);
@@ -1524,7 +1559,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.AdexchangebuyerApi(mock).accounts;
       var arg_request = buildAccount();
       var arg_id = 42;
@@ -1568,7 +1603,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccount());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_id).then(unittest.expectAsync(((api.Account response) {
         checkAccount(response);
@@ -1581,7 +1616,7 @@
   unittest.group("resource-BillingInfoResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BillingInfoResourceApi res = new api.AdexchangebuyerApi(mock).billingInfo;
       var arg_accountId = 42;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1621,7 +1656,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBillingInfo());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId).then(unittest.expectAsync(((api.BillingInfo response) {
         checkBillingInfo(response);
@@ -1630,7 +1665,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BillingInfoResourceApi res = new api.AdexchangebuyerApi(mock).billingInfo;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1666,7 +1701,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBillingInfoList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list().then(unittest.expectAsync(((api.BillingInfoList response) {
         checkBillingInfoList(response);
@@ -1679,7 +1714,7 @@
   unittest.group("resource-BudgetResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BudgetResourceApi res = new api.AdexchangebuyerApi(mock).budget;
       var arg_accountId = "foo";
       var arg_billingId = "foo";
@@ -1727,7 +1762,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBudget());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_billingId).then(unittest.expectAsync(((api.Budget response) {
         checkBudget(response);
@@ -1736,7 +1771,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BudgetResourceApi res = new api.AdexchangebuyerApi(mock).budget;
       var arg_request = buildBudget();
       var arg_accountId = "foo";
@@ -1788,7 +1823,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBudget());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_accountId, arg_billingId).then(unittest.expectAsync(((api.Budget response) {
         checkBudget(response);
@@ -1797,7 +1832,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BudgetResourceApi res = new api.AdexchangebuyerApi(mock).budget;
       var arg_request = buildBudget();
       var arg_accountId = "foo";
@@ -1849,7 +1884,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBudget());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_accountId, arg_billingId).then(unittest.expectAsync(((api.Budget response) {
         checkBudget(response);
@@ -1862,7 +1897,7 @@
   unittest.group("resource-CreativesResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativesResourceApi res = new api.AdexchangebuyerApi(mock).creatives;
       var arg_accountId = 42;
       var arg_buyerCreativeId = "foo";
@@ -1910,7 +1945,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreative());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_buyerCreativeId).then(unittest.expectAsync(((api.Creative response) {
         checkCreative(response);
@@ -1919,7 +1954,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativesResourceApi res = new api.AdexchangebuyerApi(mock).creatives;
       var arg_request = buildCreative();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1959,7 +1994,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreative());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request).then(unittest.expectAsync(((api.Creative response) {
         checkCreative(response);
@@ -1968,10 +2003,10 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativesResourceApi res = new api.AdexchangebuyerApi(mock).creatives;
-      var arg_accountId = buildUnnamed891();
-      var arg_buyerCreativeId = buildUnnamed892();
+      var arg_accountId = buildUnnamed42();
+      var arg_buyerCreativeId = buildUnnamed43();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_statusFilter = "foo";
@@ -2014,7 +2049,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreativesList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(accountId: arg_accountId, buyerCreativeId: arg_buyerCreativeId, maxResults: arg_maxResults, pageToken: arg_pageToken, statusFilter: arg_statusFilter).then(unittest.expectAsync(((api.CreativesList response) {
         checkCreativesList(response);
@@ -2027,7 +2062,7 @@
   unittest.group("resource-DirectDealsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DirectDealsResourceApi res = new api.AdexchangebuyerApi(mock).directDeals;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2067,7 +2102,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDirectDeal());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_id).then(unittest.expectAsync(((api.DirectDeal response) {
         checkDirectDeal(response);
@@ -2076,7 +2111,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DirectDealsResourceApi res = new api.AdexchangebuyerApi(mock).directDeals;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -2112,7 +2147,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDirectDealsList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list().then(unittest.expectAsync(((api.DirectDealsList response) {
         checkDirectDealsList(response);
@@ -2125,7 +2160,7 @@
   unittest.group("resource-PerformanceReportResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PerformanceReportResourceApi res = new api.AdexchangebuyerApi(mock).performanceReport;
       var arg_accountId = "foo";
       var arg_endDateTime = "foo";
@@ -2171,7 +2206,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPerformanceReportList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_endDateTime, arg_startDateTime, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.PerformanceReportList response) {
         checkPerformanceReportList(response);
@@ -2184,7 +2219,7 @@
   unittest.group("resource-PretargetingConfigResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PretargetingConfigResourceApi res = new api.AdexchangebuyerApi(mock).pretargetingConfig;
       var arg_accountId = "foo";
       var arg_configId = "foo";
@@ -2232,14 +2267,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_accountId, arg_configId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PretargetingConfigResourceApi res = new api.AdexchangebuyerApi(mock).pretargetingConfig;
       var arg_accountId = "foo";
       var arg_configId = "foo";
@@ -2287,7 +2322,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPretargetingConfig());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_configId).then(unittest.expectAsync(((api.PretargetingConfig response) {
         checkPretargetingConfig(response);
@@ -2296,7 +2331,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PretargetingConfigResourceApi res = new api.AdexchangebuyerApi(mock).pretargetingConfig;
       var arg_request = buildPretargetingConfig();
       var arg_accountId = "foo";
@@ -2340,7 +2375,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPretargetingConfig());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_accountId).then(unittest.expectAsync(((api.PretargetingConfig response) {
         checkPretargetingConfig(response);
@@ -2349,7 +2384,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PretargetingConfigResourceApi res = new api.AdexchangebuyerApi(mock).pretargetingConfig;
       var arg_accountId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2389,7 +2424,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPretargetingConfigList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId).then(unittest.expectAsync(((api.PretargetingConfigList response) {
         checkPretargetingConfigList(response);
@@ -2398,7 +2433,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PretargetingConfigResourceApi res = new api.AdexchangebuyerApi(mock).pretargetingConfig;
       var arg_request = buildPretargetingConfig();
       var arg_accountId = "foo";
@@ -2450,7 +2485,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPretargetingConfig());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_accountId, arg_configId).then(unittest.expectAsync(((api.PretargetingConfig response) {
         checkPretargetingConfig(response);
@@ -2459,7 +2494,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PretargetingConfigResourceApi res = new api.AdexchangebuyerApi(mock).pretargetingConfig;
       var arg_request = buildPretargetingConfig();
       var arg_accountId = "foo";
@@ -2511,7 +2546,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPretargetingConfig());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_accountId, arg_configId).then(unittest.expectAsync(((api.PretargetingConfig response) {
         checkPretargetingConfig(response);
diff --git a/generated/googleapis/test/adexchangeseller/v1_1_test.dart b/generated/googleapis/test/adexchangeseller/v1_1_test.dart
index 80ab232..254a2e3 100644
--- a/generated/googleapis/test/adexchangeseller/v1_1_test.dart
+++ b/generated/googleapis/test/adexchangeseller/v1_1_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/adexchangeseller/v1_1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterAccount = 0;
 buildAccount() {
@@ -66,14 +101,14 @@
   buildCounterAdClient--;
 }
 
-buildUnnamed250() {
+buildUnnamed44() {
   var o = new core.List<api.AdClient>();
   o.add(buildAdClient());
   o.add(buildAdClient());
   return o;
 }
 
-checkUnnamed250(core.List<api.AdClient> o) {
+checkUnnamed44(core.List<api.AdClient> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdClient(o[0]);
   checkAdClient(o[1]);
@@ -85,7 +120,7 @@
   buildCounterAdClients++;
   if (buildCounterAdClients < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed250();
+    o.items = buildUnnamed44();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -97,7 +132,7 @@
   buildCounterAdClients++;
   if (buildCounterAdClients < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed250(o.items);
+    checkUnnamed44(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -131,14 +166,14 @@
   buildCounterAdUnit--;
 }
 
-buildUnnamed251() {
+buildUnnamed45() {
   var o = new core.List<api.AdUnit>();
   o.add(buildAdUnit());
   o.add(buildAdUnit());
   return o;
 }
 
-checkUnnamed251(core.List<api.AdUnit> o) {
+checkUnnamed45(core.List<api.AdUnit> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdUnit(o[0]);
   checkAdUnit(o[1]);
@@ -150,7 +185,7 @@
   buildCounterAdUnits++;
   if (buildCounterAdUnits < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed251();
+    o.items = buildUnnamed45();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -162,7 +197,7 @@
   buildCounterAdUnits++;
   if (buildCounterAdUnits < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed251(o.items);
+    checkUnnamed45(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -196,14 +231,14 @@
   buildCounterAlert--;
 }
 
-buildUnnamed252() {
+buildUnnamed46() {
   var o = new core.List<api.Alert>();
   o.add(buildAlert());
   o.add(buildAlert());
   return o;
 }
 
-checkUnnamed252(core.List<api.Alert> o) {
+checkUnnamed46(core.List<api.Alert> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAlert(o[0]);
   checkAlert(o[1]);
@@ -214,7 +249,7 @@
   var o = new api.Alerts();
   buildCounterAlerts++;
   if (buildCounterAlerts < 3) {
-    o.items = buildUnnamed252();
+    o.items = buildUnnamed46();
     o.kind = "foo";
   }
   buildCounterAlerts--;
@@ -224,7 +259,7 @@
 checkAlerts(api.Alerts o) {
   buildCounterAlerts++;
   if (buildCounterAlerts < 3) {
-    checkUnnamed252(o.items);
+    checkUnnamed46(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAlerts--;
@@ -282,14 +317,14 @@
   buildCounterCustomChannel--;
 }
 
-buildUnnamed253() {
+buildUnnamed47() {
   var o = new core.List<api.CustomChannel>();
   o.add(buildCustomChannel());
   o.add(buildCustomChannel());
   return o;
 }
 
-checkUnnamed253(core.List<api.CustomChannel> o) {
+checkUnnamed47(core.List<api.CustomChannel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomChannel(o[0]);
   checkCustomChannel(o[1]);
@@ -301,7 +336,7 @@
   buildCounterCustomChannels++;
   if (buildCounterCustomChannels < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed253();
+    o.items = buildUnnamed47();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -313,21 +348,21 @@
   buildCounterCustomChannels++;
   if (buildCounterCustomChannels < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed253(o.items);
+    checkUnnamed47(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterCustomChannels--;
 }
 
-buildUnnamed254() {
+buildUnnamed48() {
   var o = new core.List<api.ReportingMetadataEntry>();
   o.add(buildReportingMetadataEntry());
   o.add(buildReportingMetadataEntry());
   return o;
 }
 
-checkUnnamed254(core.List<api.ReportingMetadataEntry> o) {
+checkUnnamed48(core.List<api.ReportingMetadataEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportingMetadataEntry(o[0]);
   checkReportingMetadataEntry(o[1]);
@@ -338,7 +373,7 @@
   var o = new api.Metadata();
   buildCounterMetadata++;
   if (buildCounterMetadata < 3) {
-    o.items = buildUnnamed254();
+    o.items = buildUnnamed48();
     o.kind = "foo";
   }
   buildCounterMetadata--;
@@ -348,7 +383,7 @@
 checkMetadata(api.Metadata o) {
   buildCounterMetadata++;
   if (buildCounterMetadata < 3) {
-    checkUnnamed254(o.items);
+    checkUnnamed48(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterMetadata--;
@@ -387,14 +422,14 @@
   buildCounterPreferredDeal--;
 }
 
-buildUnnamed255() {
+buildUnnamed49() {
   var o = new core.List<api.PreferredDeal>();
   o.add(buildPreferredDeal());
   o.add(buildPreferredDeal());
   return o;
 }
 
-checkUnnamed255(core.List<api.PreferredDeal> o) {
+checkUnnamed49(core.List<api.PreferredDeal> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPreferredDeal(o[0]);
   checkPreferredDeal(o[1]);
@@ -405,7 +440,7 @@
   var o = new api.PreferredDeals();
   buildCounterPreferredDeals++;
   if (buildCounterPreferredDeals < 3) {
-    o.items = buildUnnamed255();
+    o.items = buildUnnamed49();
     o.kind = "foo";
   }
   buildCounterPreferredDeals--;
@@ -415,20 +450,20 @@
 checkPreferredDeals(api.PreferredDeals o) {
   buildCounterPreferredDeals++;
   if (buildCounterPreferredDeals < 3) {
-    checkUnnamed255(o.items);
+    checkUnnamed49(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterPreferredDeals--;
 }
 
-buildUnnamed256() {
+buildUnnamed50() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed256(core.List<core.String> o) {
+checkUnnamed50(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -457,66 +492,66 @@
   buildCounterReportHeaders--;
 }
 
-buildUnnamed257() {
+buildUnnamed51() {
   var o = new core.List<api.ReportHeaders>();
   o.add(buildReportHeaders());
   o.add(buildReportHeaders());
   return o;
 }
 
-checkUnnamed257(core.List<api.ReportHeaders> o) {
+checkUnnamed51(core.List<api.ReportHeaders> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportHeaders(o[0]);
   checkReportHeaders(o[1]);
 }
 
-buildUnnamed258() {
+buildUnnamed52() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed258(core.List<core.String> o) {
+checkUnnamed52(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed259() {
+buildUnnamed53() {
   var o = new core.List<core.List<core.String>>();
-  o.add(buildUnnamed258());
-  o.add(buildUnnamed258());
+  o.add(buildUnnamed52());
+  o.add(buildUnnamed52());
   return o;
 }
 
-checkUnnamed259(core.List<core.List<core.String>> o) {
+checkUnnamed53(core.List<core.List<core.String>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed258(o[0]);
-  checkUnnamed258(o[1]);
+  checkUnnamed52(o[0]);
+  checkUnnamed52(o[1]);
 }
 
-buildUnnamed260() {
+buildUnnamed54() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed260(core.List<core.String> o) {
+checkUnnamed54(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed261() {
+buildUnnamed55() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed261(core.List<core.String> o) {
+checkUnnamed55(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -527,13 +562,13 @@
   var o = new api.Report();
   buildCounterReport++;
   if (buildCounterReport < 3) {
-    o.averages = buildUnnamed256();
-    o.headers = buildUnnamed257();
+    o.averages = buildUnnamed50();
+    o.headers = buildUnnamed51();
     o.kind = "foo";
-    o.rows = buildUnnamed259();
+    o.rows = buildUnnamed53();
     o.totalMatchedRows = "foo";
-    o.totals = buildUnnamed260();
-    o.warnings = buildUnnamed261();
+    o.totals = buildUnnamed54();
+    o.warnings = buildUnnamed55();
   }
   buildCounterReport--;
   return o;
@@ -542,77 +577,77 @@
 checkReport(api.Report o) {
   buildCounterReport++;
   if (buildCounterReport < 3) {
-    checkUnnamed256(o.averages);
-    checkUnnamed257(o.headers);
+    checkUnnamed50(o.averages);
+    checkUnnamed51(o.headers);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed259(o.rows);
+    checkUnnamed53(o.rows);
     unittest.expect(o.totalMatchedRows, unittest.equals('foo'));
-    checkUnnamed260(o.totals);
-    checkUnnamed261(o.warnings);
+    checkUnnamed54(o.totals);
+    checkUnnamed55(o.warnings);
   }
   buildCounterReport--;
 }
 
-buildUnnamed262() {
+buildUnnamed56() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed262(core.List<core.String> o) {
+checkUnnamed56(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed263() {
+buildUnnamed57() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed263(core.List<core.String> o) {
+checkUnnamed57(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed264() {
+buildUnnamed58() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed264(core.List<core.String> o) {
+checkUnnamed58(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed265() {
+buildUnnamed59() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed265(core.List<core.String> o) {
+checkUnnamed59(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed266() {
+buildUnnamed60() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed266(core.List<core.String> o) {
+checkUnnamed60(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -623,13 +658,13 @@
   var o = new api.ReportingMetadataEntry();
   buildCounterReportingMetadataEntry++;
   if (buildCounterReportingMetadataEntry < 3) {
-    o.compatibleDimensions = buildUnnamed262();
-    o.compatibleMetrics = buildUnnamed263();
+    o.compatibleDimensions = buildUnnamed56();
+    o.compatibleMetrics = buildUnnamed57();
     o.id = "foo";
     o.kind = "foo";
-    o.requiredDimensions = buildUnnamed264();
-    o.requiredMetrics = buildUnnamed265();
-    o.supportedProducts = buildUnnamed266();
+    o.requiredDimensions = buildUnnamed58();
+    o.requiredMetrics = buildUnnamed59();
+    o.supportedProducts = buildUnnamed60();
   }
   buildCounterReportingMetadataEntry--;
   return o;
@@ -638,13 +673,13 @@
 checkReportingMetadataEntry(api.ReportingMetadataEntry o) {
   buildCounterReportingMetadataEntry++;
   if (buildCounterReportingMetadataEntry < 3) {
-    checkUnnamed262(o.compatibleDimensions);
-    checkUnnamed263(o.compatibleMetrics);
+    checkUnnamed56(o.compatibleDimensions);
+    checkUnnamed57(o.compatibleMetrics);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed264(o.requiredDimensions);
-    checkUnnamed265(o.requiredMetrics);
-    checkUnnamed266(o.supportedProducts);
+    checkUnnamed58(o.requiredDimensions);
+    checkUnnamed59(o.requiredMetrics);
+    checkUnnamed60(o.supportedProducts);
   }
   buildCounterReportingMetadataEntry--;
 }
@@ -672,14 +707,14 @@
   buildCounterSavedReport--;
 }
 
-buildUnnamed267() {
+buildUnnamed61() {
   var o = new core.List<api.SavedReport>();
   o.add(buildSavedReport());
   o.add(buildSavedReport());
   return o;
 }
 
-checkUnnamed267(core.List<api.SavedReport> o) {
+checkUnnamed61(core.List<api.SavedReport> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSavedReport(o[0]);
   checkSavedReport(o[1]);
@@ -691,7 +726,7 @@
   buildCounterSavedReports++;
   if (buildCounterSavedReports < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed267();
+    o.items = buildUnnamed61();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -703,7 +738,7 @@
   buildCounterSavedReports++;
   if (buildCounterSavedReports < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed267(o.items);
+    checkUnnamed61(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -733,14 +768,14 @@
   buildCounterUrlChannel--;
 }
 
-buildUnnamed268() {
+buildUnnamed62() {
   var o = new core.List<api.UrlChannel>();
   o.add(buildUrlChannel());
   o.add(buildUrlChannel());
   return o;
 }
 
-checkUnnamed268(core.List<api.UrlChannel> o) {
+checkUnnamed62(core.List<api.UrlChannel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlChannel(o[0]);
   checkUrlChannel(o[1]);
@@ -752,7 +787,7 @@
   buildCounterUrlChannels++;
   if (buildCounterUrlChannels < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed268();
+    o.items = buildUnnamed62();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -764,60 +799,60 @@
   buildCounterUrlChannels++;
   if (buildCounterUrlChannels < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed268(o.items);
+    checkUnnamed62(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterUrlChannels--;
 }
 
-buildUnnamed269() {
+buildUnnamed63() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed269(core.List<core.String> o) {
+checkUnnamed63(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed270() {
+buildUnnamed64() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed270(core.List<core.String> o) {
+checkUnnamed64(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed271() {
+buildUnnamed65() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed271(core.List<core.String> o) {
+checkUnnamed65(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed272() {
+buildUnnamed66() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed272(core.List<core.String> o) {
+checkUnnamed66(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1008,7 +1043,7 @@
   unittest.group("resource-AccountsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.AdexchangesellerApi(mock).accounts;
       var arg_accountId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1048,7 +1083,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccount());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId).then(unittest.expectAsync(((api.Account response) {
         checkAccount(response);
@@ -1061,7 +1096,7 @@
   unittest.group("resource-AdclientsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdclientsResourceApi res = new api.AdexchangesellerApi(mock).adclients;
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
@@ -1101,7 +1136,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdClients());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.AdClients response) {
         checkAdClients(response);
@@ -1114,7 +1149,7 @@
   unittest.group("resource-AdunitsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdunitsResourceApi res = new api.AdexchangesellerApi(mock).adunits;
       var arg_adClientId = "foo";
       var arg_adUnitId = "foo";
@@ -1162,7 +1197,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdUnit());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_adClientId, arg_adUnitId).then(unittest.expectAsync(((api.AdUnit response) {
         checkAdUnit(response);
@@ -1171,7 +1206,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdunitsResourceApi res = new api.AdexchangesellerApi(mock).adunits;
       var arg_adClientId = "foo";
       var arg_includeInactive = true;
@@ -1221,7 +1256,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdUnits());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_adClientId, includeInactive: arg_includeInactive, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.AdUnits response) {
         checkAdUnits(response);
@@ -1234,7 +1269,7 @@
   unittest.group("resource-AdunitsCustomchannelsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdunitsCustomchannelsResourceApi res = new api.AdexchangesellerApi(mock).adunits.customchannels;
       var arg_adClientId = "foo";
       var arg_adUnitId = "foo";
@@ -1290,7 +1325,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomChannels());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_adClientId, arg_adUnitId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.CustomChannels response) {
         checkCustomChannels(response);
@@ -1303,7 +1338,7 @@
   unittest.group("resource-AlertsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AlertsResourceApi res = new api.AdexchangesellerApi(mock).alerts;
       var arg_locale = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1341,7 +1376,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAlerts());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(locale: arg_locale).then(unittest.expectAsync(((api.Alerts response) {
         checkAlerts(response);
@@ -1354,7 +1389,7 @@
   unittest.group("resource-CustomchannelsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CustomchannelsResourceApi res = new api.AdexchangesellerApi(mock).customchannels;
       var arg_adClientId = "foo";
       var arg_customChannelId = "foo";
@@ -1402,7 +1437,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomChannel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_adClientId, arg_customChannelId).then(unittest.expectAsync(((api.CustomChannel response) {
         checkCustomChannel(response);
@@ -1411,7 +1446,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CustomchannelsResourceApi res = new api.AdexchangesellerApi(mock).customchannels;
       var arg_adClientId = "foo";
       var arg_maxResults = 42;
@@ -1459,7 +1494,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomChannels());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_adClientId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.CustomChannels response) {
         checkCustomChannels(response);
@@ -1472,7 +1507,7 @@
   unittest.group("resource-CustomchannelsAdunitsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CustomchannelsAdunitsResourceApi res = new api.AdexchangesellerApi(mock).customchannels.adunits;
       var arg_adClientId = "foo";
       var arg_customChannelId = "foo";
@@ -1530,7 +1565,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdUnits());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_adClientId, arg_customChannelId, includeInactive: arg_includeInactive, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.AdUnits response) {
         checkAdUnits(response);
@@ -1543,7 +1578,7 @@
   unittest.group("resource-MetadataDimensionsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MetadataDimensionsResourceApi res = new api.AdexchangesellerApi(mock).metadata.dimensions;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1579,7 +1614,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMetadata());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list().then(unittest.expectAsync(((api.Metadata response) {
         checkMetadata(response);
@@ -1592,7 +1627,7 @@
   unittest.group("resource-MetadataMetricsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MetadataMetricsResourceApi res = new api.AdexchangesellerApi(mock).metadata.metrics;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1628,7 +1663,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMetadata());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list().then(unittest.expectAsync(((api.Metadata response) {
         checkMetadata(response);
@@ -1641,7 +1676,7 @@
   unittest.group("resource-PreferreddealsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PreferreddealsResourceApi res = new api.AdexchangesellerApi(mock).preferreddeals;
       var arg_dealId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1681,7 +1716,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPreferredDeal());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_dealId).then(unittest.expectAsync(((api.PreferredDeal response) {
         checkPreferredDeal(response);
@@ -1690,7 +1725,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PreferreddealsResourceApi res = new api.AdexchangesellerApi(mock).preferreddeals;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1726,7 +1761,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPreferredDeals());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list().then(unittest.expectAsync(((api.PreferredDeals response) {
         checkPreferredDeals(response);
@@ -1741,16 +1776,16 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsResourceApi res = new api.AdexchangesellerApi(mock).reports;
       var arg_startDate = "foo";
       var arg_endDate = "foo";
-      var arg_dimension = buildUnnamed269();
-      var arg_filter = buildUnnamed270();
+      var arg_dimension = buildUnnamed63();
+      var arg_filter = buildUnnamed64();
       var arg_locale = "foo";
       var arg_maxResults = 42;
-      var arg_metric = buildUnnamed271();
-      var arg_sort = buildUnnamed272();
+      var arg_metric = buildUnnamed65();
+      var arg_sort = buildUnnamed66();
       var arg_startIndex = 42;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1795,7 +1830,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildReport());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.generate(arg_startDate, arg_endDate, dimension: arg_dimension, filter: arg_filter, locale: arg_locale, maxResults: arg_maxResults, metric: arg_metric, sort: arg_sort, startIndex: arg_startIndex).then(unittest.expectAsync(((api.Report response) {
         checkReport(response);
@@ -1808,7 +1843,7 @@
   unittest.group("resource-ReportsSavedResourceApi", () {
     unittest.test("method--generate", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsSavedResourceApi res = new api.AdexchangesellerApi(mock).reports.saved;
       var arg_savedReportId = "foo";
       var arg_locale = "foo";
@@ -1854,7 +1889,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildReport());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.generate(arg_savedReportId, locale: arg_locale, maxResults: arg_maxResults, startIndex: arg_startIndex).then(unittest.expectAsync(((api.Report response) {
         checkReport(response);
@@ -1863,7 +1898,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsSavedResourceApi res = new api.AdexchangesellerApi(mock).reports.saved;
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
@@ -1903,7 +1938,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSavedReports());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.SavedReports response) {
         checkSavedReports(response);
@@ -1916,7 +1951,7 @@
   unittest.group("resource-UrlchannelsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UrlchannelsResourceApi res = new api.AdexchangesellerApi(mock).urlchannels;
       var arg_adClientId = "foo";
       var arg_maxResults = 42;
@@ -1964,7 +1999,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUrlChannels());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_adClientId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.UrlChannels response) {
         checkUrlChannels(response);
diff --git a/generated/googleapis/test/adexchangeseller/v2_0_test.dart b/generated/googleapis/test/adexchangeseller/v2_0_test.dart
index a0c8b78..c88eb65 100644
--- a/generated/googleapis/test/adexchangeseller/v2_0_test.dart
+++ b/generated/googleapis/test/adexchangeseller/v2_0_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/adexchangeseller/v2_0.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterAccount = 0;
 buildAccount() {
@@ -39,14 +74,14 @@
   buildCounterAccount--;
 }
 
-buildUnnamed1130() {
+buildUnnamed67() {
   var o = new core.List<api.Account>();
   o.add(buildAccount());
   o.add(buildAccount());
   return o;
 }
 
-checkUnnamed1130(core.List<api.Account> o) {
+checkUnnamed67(core.List<api.Account> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccount(o[0]);
   checkAccount(o[1]);
@@ -58,7 +93,7 @@
   buildCounterAccounts++;
   if (buildCounterAccounts < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1130();
+    o.items = buildUnnamed67();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -70,7 +105,7 @@
   buildCounterAccounts++;
   if (buildCounterAccounts < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1130(o.items);
+    checkUnnamed67(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -104,14 +139,14 @@
   buildCounterAdClient--;
 }
 
-buildUnnamed1131() {
+buildUnnamed68() {
   var o = new core.List<api.AdClient>();
   o.add(buildAdClient());
   o.add(buildAdClient());
   return o;
 }
 
-checkUnnamed1131(core.List<api.AdClient> o) {
+checkUnnamed68(core.List<api.AdClient> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdClient(o[0]);
   checkAdClient(o[1]);
@@ -123,7 +158,7 @@
   buildCounterAdClients++;
   if (buildCounterAdClients < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1131();
+    o.items = buildUnnamed68();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -135,7 +170,7 @@
   buildCounterAdClients++;
   if (buildCounterAdClients < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1131(o.items);
+    checkUnnamed68(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -169,14 +204,14 @@
   buildCounterAlert--;
 }
 
-buildUnnamed1132() {
+buildUnnamed69() {
   var o = new core.List<api.Alert>();
   o.add(buildAlert());
   o.add(buildAlert());
   return o;
 }
 
-checkUnnamed1132(core.List<api.Alert> o) {
+checkUnnamed69(core.List<api.Alert> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAlert(o[0]);
   checkAlert(o[1]);
@@ -187,7 +222,7 @@
   var o = new api.Alerts();
   buildCounterAlerts++;
   if (buildCounterAlerts < 3) {
-    o.items = buildUnnamed1132();
+    o.items = buildUnnamed69();
     o.kind = "foo";
   }
   buildCounterAlerts--;
@@ -197,7 +232,7 @@
 checkAlerts(api.Alerts o) {
   buildCounterAlerts++;
   if (buildCounterAlerts < 3) {
-    checkUnnamed1132(o.items);
+    checkUnnamed69(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAlerts--;
@@ -255,14 +290,14 @@
   buildCounterCustomChannel--;
 }
 
-buildUnnamed1133() {
+buildUnnamed70() {
   var o = new core.List<api.CustomChannel>();
   o.add(buildCustomChannel());
   o.add(buildCustomChannel());
   return o;
 }
 
-checkUnnamed1133(core.List<api.CustomChannel> o) {
+checkUnnamed70(core.List<api.CustomChannel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomChannel(o[0]);
   checkCustomChannel(o[1]);
@@ -274,7 +309,7 @@
   buildCounterCustomChannels++;
   if (buildCounterCustomChannels < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1133();
+    o.items = buildUnnamed70();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -286,21 +321,21 @@
   buildCounterCustomChannels++;
   if (buildCounterCustomChannels < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1133(o.items);
+    checkUnnamed70(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterCustomChannels--;
 }
 
-buildUnnamed1134() {
+buildUnnamed71() {
   var o = new core.List<api.ReportingMetadataEntry>();
   o.add(buildReportingMetadataEntry());
   o.add(buildReportingMetadataEntry());
   return o;
 }
 
-checkUnnamed1134(core.List<api.ReportingMetadataEntry> o) {
+checkUnnamed71(core.List<api.ReportingMetadataEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportingMetadataEntry(o[0]);
   checkReportingMetadataEntry(o[1]);
@@ -311,7 +346,7 @@
   var o = new api.Metadata();
   buildCounterMetadata++;
   if (buildCounterMetadata < 3) {
-    o.items = buildUnnamed1134();
+    o.items = buildUnnamed71();
     o.kind = "foo";
   }
   buildCounterMetadata--;
@@ -321,7 +356,7 @@
 checkMetadata(api.Metadata o) {
   buildCounterMetadata++;
   if (buildCounterMetadata < 3) {
-    checkUnnamed1134(o.items);
+    checkUnnamed71(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterMetadata--;
@@ -360,14 +395,14 @@
   buildCounterPreferredDeal--;
 }
 
-buildUnnamed1135() {
+buildUnnamed72() {
   var o = new core.List<api.PreferredDeal>();
   o.add(buildPreferredDeal());
   o.add(buildPreferredDeal());
   return o;
 }
 
-checkUnnamed1135(core.List<api.PreferredDeal> o) {
+checkUnnamed72(core.List<api.PreferredDeal> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPreferredDeal(o[0]);
   checkPreferredDeal(o[1]);
@@ -378,7 +413,7 @@
   var o = new api.PreferredDeals();
   buildCounterPreferredDeals++;
   if (buildCounterPreferredDeals < 3) {
-    o.items = buildUnnamed1135();
+    o.items = buildUnnamed72();
     o.kind = "foo";
   }
   buildCounterPreferredDeals--;
@@ -388,20 +423,20 @@
 checkPreferredDeals(api.PreferredDeals o) {
   buildCounterPreferredDeals++;
   if (buildCounterPreferredDeals < 3) {
-    checkUnnamed1135(o.items);
+    checkUnnamed72(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterPreferredDeals--;
 }
 
-buildUnnamed1136() {
+buildUnnamed73() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1136(core.List<core.String> o) {
+checkUnnamed73(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -430,66 +465,66 @@
   buildCounterReportHeaders--;
 }
 
-buildUnnamed1137() {
+buildUnnamed74() {
   var o = new core.List<api.ReportHeaders>();
   o.add(buildReportHeaders());
   o.add(buildReportHeaders());
   return o;
 }
 
-checkUnnamed1137(core.List<api.ReportHeaders> o) {
+checkUnnamed74(core.List<api.ReportHeaders> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportHeaders(o[0]);
   checkReportHeaders(o[1]);
 }
 
-buildUnnamed1138() {
+buildUnnamed75() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1138(core.List<core.String> o) {
+checkUnnamed75(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1139() {
+buildUnnamed76() {
   var o = new core.List<core.List<core.String>>();
-  o.add(buildUnnamed1138());
-  o.add(buildUnnamed1138());
+  o.add(buildUnnamed75());
+  o.add(buildUnnamed75());
   return o;
 }
 
-checkUnnamed1139(core.List<core.List<core.String>> o) {
+checkUnnamed76(core.List<core.List<core.String>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1138(o[0]);
-  checkUnnamed1138(o[1]);
+  checkUnnamed75(o[0]);
+  checkUnnamed75(o[1]);
 }
 
-buildUnnamed1140() {
+buildUnnamed77() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1140(core.List<core.String> o) {
+checkUnnamed77(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1141() {
+buildUnnamed78() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1141(core.List<core.String> o) {
+checkUnnamed78(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -500,13 +535,13 @@
   var o = new api.Report();
   buildCounterReport++;
   if (buildCounterReport < 3) {
-    o.averages = buildUnnamed1136();
-    o.headers = buildUnnamed1137();
+    o.averages = buildUnnamed73();
+    o.headers = buildUnnamed74();
     o.kind = "foo";
-    o.rows = buildUnnamed1139();
+    o.rows = buildUnnamed76();
     o.totalMatchedRows = "foo";
-    o.totals = buildUnnamed1140();
-    o.warnings = buildUnnamed1141();
+    o.totals = buildUnnamed77();
+    o.warnings = buildUnnamed78();
   }
   buildCounterReport--;
   return o;
@@ -515,77 +550,77 @@
 checkReport(api.Report o) {
   buildCounterReport++;
   if (buildCounterReport < 3) {
-    checkUnnamed1136(o.averages);
-    checkUnnamed1137(o.headers);
+    checkUnnamed73(o.averages);
+    checkUnnamed74(o.headers);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1139(o.rows);
+    checkUnnamed76(o.rows);
     unittest.expect(o.totalMatchedRows, unittest.equals('foo'));
-    checkUnnamed1140(o.totals);
-    checkUnnamed1141(o.warnings);
+    checkUnnamed77(o.totals);
+    checkUnnamed78(o.warnings);
   }
   buildCounterReport--;
 }
 
-buildUnnamed1142() {
+buildUnnamed79() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1142(core.List<core.String> o) {
+checkUnnamed79(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1143() {
+buildUnnamed80() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1143(core.List<core.String> o) {
+checkUnnamed80(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1144() {
+buildUnnamed81() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1144(core.List<core.String> o) {
+checkUnnamed81(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1145() {
+buildUnnamed82() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1145(core.List<core.String> o) {
+checkUnnamed82(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1146() {
+buildUnnamed83() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1146(core.List<core.String> o) {
+checkUnnamed83(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -596,13 +631,13 @@
   var o = new api.ReportingMetadataEntry();
   buildCounterReportingMetadataEntry++;
   if (buildCounterReportingMetadataEntry < 3) {
-    o.compatibleDimensions = buildUnnamed1142();
-    o.compatibleMetrics = buildUnnamed1143();
+    o.compatibleDimensions = buildUnnamed79();
+    o.compatibleMetrics = buildUnnamed80();
     o.id = "foo";
     o.kind = "foo";
-    o.requiredDimensions = buildUnnamed1144();
-    o.requiredMetrics = buildUnnamed1145();
-    o.supportedProducts = buildUnnamed1146();
+    o.requiredDimensions = buildUnnamed81();
+    o.requiredMetrics = buildUnnamed82();
+    o.supportedProducts = buildUnnamed83();
   }
   buildCounterReportingMetadataEntry--;
   return o;
@@ -611,13 +646,13 @@
 checkReportingMetadataEntry(api.ReportingMetadataEntry o) {
   buildCounterReportingMetadataEntry++;
   if (buildCounterReportingMetadataEntry < 3) {
-    checkUnnamed1142(o.compatibleDimensions);
-    checkUnnamed1143(o.compatibleMetrics);
+    checkUnnamed79(o.compatibleDimensions);
+    checkUnnamed80(o.compatibleMetrics);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1144(o.requiredDimensions);
-    checkUnnamed1145(o.requiredMetrics);
-    checkUnnamed1146(o.supportedProducts);
+    checkUnnamed81(o.requiredDimensions);
+    checkUnnamed82(o.requiredMetrics);
+    checkUnnamed83(o.supportedProducts);
   }
   buildCounterReportingMetadataEntry--;
 }
@@ -645,14 +680,14 @@
   buildCounterSavedReport--;
 }
 
-buildUnnamed1147() {
+buildUnnamed84() {
   var o = new core.List<api.SavedReport>();
   o.add(buildSavedReport());
   o.add(buildSavedReport());
   return o;
 }
 
-checkUnnamed1147(core.List<api.SavedReport> o) {
+checkUnnamed84(core.List<api.SavedReport> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSavedReport(o[0]);
   checkSavedReport(o[1]);
@@ -664,7 +699,7 @@
   buildCounterSavedReports++;
   if (buildCounterSavedReports < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1147();
+    o.items = buildUnnamed84();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -676,7 +711,7 @@
   buildCounterSavedReports++;
   if (buildCounterSavedReports < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1147(o.items);
+    checkUnnamed84(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -706,14 +741,14 @@
   buildCounterUrlChannel--;
 }
 
-buildUnnamed1148() {
+buildUnnamed85() {
   var o = new core.List<api.UrlChannel>();
   o.add(buildUrlChannel());
   o.add(buildUrlChannel());
   return o;
 }
 
-checkUnnamed1148(core.List<api.UrlChannel> o) {
+checkUnnamed85(core.List<api.UrlChannel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlChannel(o[0]);
   checkUrlChannel(o[1]);
@@ -725,7 +760,7 @@
   buildCounterUrlChannels++;
   if (buildCounterUrlChannels < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1148();
+    o.items = buildUnnamed85();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -737,60 +772,60 @@
   buildCounterUrlChannels++;
   if (buildCounterUrlChannels < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1148(o.items);
+    checkUnnamed85(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterUrlChannels--;
 }
 
-buildUnnamed1149() {
+buildUnnamed86() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1149(core.List<core.String> o) {
+checkUnnamed86(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1150() {
+buildUnnamed87() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1150(core.List<core.String> o) {
+checkUnnamed87(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1151() {
+buildUnnamed88() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1151(core.List<core.String> o) {
+checkUnnamed88(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1152() {
+buildUnnamed89() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1152(core.List<core.String> o) {
+checkUnnamed89(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -972,7 +1007,7 @@
   unittest.group("resource-AccountsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.AdexchangesellerApi(mock).accounts;
       var arg_accountId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1012,7 +1047,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccount());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId).then(unittest.expectAsync(((api.Account response) {
         checkAccount(response);
@@ -1021,7 +1056,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.AdexchangesellerApi(mock).accounts;
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
@@ -1061,7 +1096,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccounts());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.Accounts response) {
         checkAccounts(response);
@@ -1074,7 +1109,7 @@
   unittest.group("resource-AccountsAdclientsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsAdclientsResourceApi res = new api.AdexchangesellerApi(mock).accounts.adclients;
       var arg_accountId = "foo";
       var arg_maxResults = 42;
@@ -1122,7 +1157,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdClients());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.AdClients response) {
         checkAdClients(response);
@@ -1135,7 +1170,7 @@
   unittest.group("resource-AccountsAlertsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsAlertsResourceApi res = new api.AdexchangesellerApi(mock).accounts.alerts;
       var arg_accountId = "foo";
       var arg_locale = "foo";
@@ -1181,7 +1216,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAlerts());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, locale: arg_locale).then(unittest.expectAsync(((api.Alerts response) {
         checkAlerts(response);
@@ -1194,7 +1229,7 @@
   unittest.group("resource-AccountsCustomchannelsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsCustomchannelsResourceApi res = new api.AdexchangesellerApi(mock).accounts.customchannels;
       var arg_accountId = "foo";
       var arg_adClientId = "foo";
@@ -1250,7 +1285,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomChannel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_adClientId, arg_customChannelId).then(unittest.expectAsync(((api.CustomChannel response) {
         checkCustomChannel(response);
@@ -1259,7 +1294,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsCustomchannelsResourceApi res = new api.AdexchangesellerApi(mock).accounts.customchannels;
       var arg_accountId = "foo";
       var arg_adClientId = "foo";
@@ -1315,7 +1350,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomChannels());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_adClientId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.CustomChannels response) {
         checkCustomChannels(response);
@@ -1328,7 +1363,7 @@
   unittest.group("resource-AccountsMetadataDimensionsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsMetadataDimensionsResourceApi res = new api.AdexchangesellerApi(mock).accounts.metadata.dimensions;
       var arg_accountId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1372,7 +1407,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMetadata());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId).then(unittest.expectAsync(((api.Metadata response) {
         checkMetadata(response);
@@ -1385,7 +1420,7 @@
   unittest.group("resource-AccountsMetadataMetricsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsMetadataMetricsResourceApi res = new api.AdexchangesellerApi(mock).accounts.metadata.metrics;
       var arg_accountId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1429,7 +1464,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMetadata());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId).then(unittest.expectAsync(((api.Metadata response) {
         checkMetadata(response);
@@ -1442,7 +1477,7 @@
   unittest.group("resource-AccountsPreferreddealsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsPreferreddealsResourceApi res = new api.AdexchangesellerApi(mock).accounts.preferreddeals;
       var arg_accountId = "foo";
       var arg_dealId = "foo";
@@ -1490,7 +1525,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPreferredDeal());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_dealId).then(unittest.expectAsync(((api.PreferredDeal response) {
         checkPreferredDeal(response);
@@ -1499,7 +1534,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsPreferreddealsResourceApi res = new api.AdexchangesellerApi(mock).accounts.preferreddeals;
       var arg_accountId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1543,7 +1578,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPreferredDeals());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId).then(unittest.expectAsync(((api.PreferredDeals response) {
         checkPreferredDeals(response);
@@ -1558,17 +1593,17 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsReportsResourceApi res = new api.AdexchangesellerApi(mock).accounts.reports;
       var arg_accountId = "foo";
       var arg_startDate = "foo";
       var arg_endDate = "foo";
-      var arg_dimension = buildUnnamed1149();
-      var arg_filter = buildUnnamed1150();
+      var arg_dimension = buildUnnamed86();
+      var arg_filter = buildUnnamed87();
       var arg_locale = "foo";
       var arg_maxResults = 42;
-      var arg_metric = buildUnnamed1151();
-      var arg_sort = buildUnnamed1152();
+      var arg_metric = buildUnnamed88();
+      var arg_sort = buildUnnamed89();
       var arg_startIndex = 42;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1620,7 +1655,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildReport());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.generate(arg_accountId, arg_startDate, arg_endDate, dimension: arg_dimension, filter: arg_filter, locale: arg_locale, maxResults: arg_maxResults, metric: arg_metric, sort: arg_sort, startIndex: arg_startIndex).then(unittest.expectAsync(((api.Report response) {
         checkReport(response);
@@ -1633,7 +1668,7 @@
   unittest.group("resource-AccountsReportsSavedResourceApi", () {
     unittest.test("method--generate", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsReportsSavedResourceApi res = new api.AdexchangesellerApi(mock).accounts.reports.saved;
       var arg_accountId = "foo";
       var arg_savedReportId = "foo";
@@ -1687,7 +1722,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildReport());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.generate(arg_accountId, arg_savedReportId, locale: arg_locale, maxResults: arg_maxResults, startIndex: arg_startIndex).then(unittest.expectAsync(((api.Report response) {
         checkReport(response);
@@ -1696,7 +1731,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsReportsSavedResourceApi res = new api.AdexchangesellerApi(mock).accounts.reports.saved;
       var arg_accountId = "foo";
       var arg_maxResults = 42;
@@ -1744,7 +1779,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSavedReports());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.SavedReports response) {
         checkSavedReports(response);
@@ -1757,7 +1792,7 @@
   unittest.group("resource-AccountsUrlchannelsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsUrlchannelsResourceApi res = new api.AdexchangesellerApi(mock).accounts.urlchannels;
       var arg_accountId = "foo";
       var arg_adClientId = "foo";
@@ -1813,7 +1848,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUrlChannels());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_adClientId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.UrlChannels response) {
         checkUrlChannels(response);
diff --git a/generated/googleapis/test/admin/directory_v1_test.dart b/generated/googleapis/test/admin/directory_v1_test.dart
index c74bbd4..604122d 100644
--- a/generated/googleapis/test/admin/directory_v1_test.dart
+++ b/generated/googleapis/test/admin/directory_v1_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/admin/directory_v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterAlias = 0;
 buildAlias() {
@@ -43,14 +78,14 @@
   buildCounterAlias--;
 }
 
-buildUnnamed760() {
+buildUnnamed90() {
   var o = new core.List<api.Alias>();
   o.add(buildAlias());
   o.add(buildAlias());
   return o;
 }
 
-checkUnnamed760(core.List<api.Alias> o) {
+checkUnnamed90(core.List<api.Alias> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAlias(o[0]);
   checkAlias(o[1]);
@@ -61,7 +96,7 @@
   var o = new api.Aliases();
   buildCounterAliases++;
   if (buildCounterAliases < 3) {
-    o.aliases = buildUnnamed760();
+    o.aliases = buildUnnamed90();
     o.etag = "foo";
     o.kind = "foo";
   }
@@ -72,7 +107,7 @@
 checkAliases(api.Aliases o) {
   buildCounterAliases++;
   if (buildCounterAliases < 3) {
-    checkUnnamed760(o.aliases);
+    checkUnnamed90(o.aliases);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
   }
@@ -110,14 +145,14 @@
   buildCounterAsp--;
 }
 
-buildUnnamed761() {
+buildUnnamed91() {
   var o = new core.List<api.Asp>();
   o.add(buildAsp());
   o.add(buildAsp());
   return o;
 }
 
-checkUnnamed761(core.List<api.Asp> o) {
+checkUnnamed91(core.List<api.Asp> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAsp(o[0]);
   checkAsp(o[1]);
@@ -129,7 +164,7 @@
   buildCounterAsps++;
   if (buildCounterAsps < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed761();
+    o.items = buildUnnamed91();
     o.kind = "foo";
   }
   buildCounterAsps--;
@@ -140,20 +175,20 @@
   buildCounterAsps++;
   if (buildCounterAsps < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed761(o.items);
+    checkUnnamed91(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAsps--;
 }
 
-buildUnnamed762() {
+buildUnnamed92() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed762(core.Map<core.String, core.String> o) {
+checkUnnamed92(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -168,7 +203,7 @@
     o.expiration = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.params = buildUnnamed762();
+    o.params = buildUnnamed92();
     o.payload = true;
     o.resourceId = "foo";
     o.resourceUri = "foo";
@@ -186,7 +221,7 @@
     unittest.expect(o.expiration, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed762(o.params);
+    checkUnnamed92(o.params);
     unittest.expect(o.payload, unittest.isTrue);
     unittest.expect(o.resourceId, unittest.equals('foo'));
     unittest.expect(o.resourceUri, unittest.equals('foo'));
@@ -217,14 +252,14 @@
   buildCounterChromeOsDeviceActiveTimeRanges--;
 }
 
-buildUnnamed763() {
+buildUnnamed93() {
   var o = new core.List<api.ChromeOsDeviceActiveTimeRanges>();
   o.add(buildChromeOsDeviceActiveTimeRanges());
   o.add(buildChromeOsDeviceActiveTimeRanges());
   return o;
 }
 
-checkUnnamed763(core.List<api.ChromeOsDeviceActiveTimeRanges> o) {
+checkUnnamed93(core.List<api.ChromeOsDeviceActiveTimeRanges> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChromeOsDeviceActiveTimeRanges(o[0]);
   checkChromeOsDeviceActiveTimeRanges(o[1]);
@@ -251,14 +286,14 @@
   buildCounterChromeOsDeviceRecentUsers--;
 }
 
-buildUnnamed764() {
+buildUnnamed94() {
   var o = new core.List<api.ChromeOsDeviceRecentUsers>();
   o.add(buildChromeOsDeviceRecentUsers());
   o.add(buildChromeOsDeviceRecentUsers());
   return o;
 }
 
-checkUnnamed764(core.List<api.ChromeOsDeviceRecentUsers> o) {
+checkUnnamed94(core.List<api.ChromeOsDeviceRecentUsers> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChromeOsDeviceRecentUsers(o[0]);
   checkChromeOsDeviceRecentUsers(o[1]);
@@ -269,7 +304,7 @@
   var o = new api.ChromeOsDevice();
   buildCounterChromeOsDevice++;
   if (buildCounterChromeOsDevice < 3) {
-    o.activeTimeRanges = buildUnnamed763();
+    o.activeTimeRanges = buildUnnamed93();
     o.annotatedLocation = "foo";
     o.annotatedUser = "foo";
     o.bootMode = "foo";
@@ -288,7 +323,7 @@
     o.orgUnitPath = "foo";
     o.osVersion = "foo";
     o.platformVersion = "foo";
-    o.recentUsers = buildUnnamed764();
+    o.recentUsers = buildUnnamed94();
     o.serialNumber = "foo";
     o.status = "foo";
     o.supportEndDate = core.DateTime.parse("2002-02-27T14:01:02");
@@ -301,7 +336,7 @@
 checkChromeOsDevice(api.ChromeOsDevice o) {
   buildCounterChromeOsDevice++;
   if (buildCounterChromeOsDevice < 3) {
-    checkUnnamed763(o.activeTimeRanges);
+    checkUnnamed93(o.activeTimeRanges);
     unittest.expect(o.annotatedLocation, unittest.equals('foo'));
     unittest.expect(o.annotatedUser, unittest.equals('foo'));
     unittest.expect(o.bootMode, unittest.equals('foo'));
@@ -320,7 +355,7 @@
     unittest.expect(o.orgUnitPath, unittest.equals('foo'));
     unittest.expect(o.osVersion, unittest.equals('foo'));
     unittest.expect(o.platformVersion, unittest.equals('foo'));
-    checkUnnamed764(o.recentUsers);
+    checkUnnamed94(o.recentUsers);
     unittest.expect(o.serialNumber, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.supportEndDate, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
@@ -329,14 +364,14 @@
   buildCounterChromeOsDevice--;
 }
 
-buildUnnamed765() {
+buildUnnamed95() {
   var o = new core.List<api.ChromeOsDevice>();
   o.add(buildChromeOsDevice());
   o.add(buildChromeOsDevice());
   return o;
 }
 
-checkUnnamed765(core.List<api.ChromeOsDevice> o) {
+checkUnnamed95(core.List<api.ChromeOsDevice> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChromeOsDevice(o[0]);
   checkChromeOsDevice(o[1]);
@@ -347,7 +382,7 @@
   var o = new api.ChromeOsDevices();
   buildCounterChromeOsDevices++;
   if (buildCounterChromeOsDevices < 3) {
-    o.chromeosdevices = buildUnnamed765();
+    o.chromeosdevices = buildUnnamed95();
     o.etag = "foo";
     o.kind = "foo";
     o.nextPageToken = "foo";
@@ -359,7 +394,7 @@
 checkChromeOsDevices(api.ChromeOsDevices o) {
   buildCounterChromeOsDevices++;
   if (buildCounterChromeOsDevices < 3) {
-    checkUnnamed765(o.chromeosdevices);
+    checkUnnamed95(o.chromeosdevices);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -367,27 +402,27 @@
   buildCounterChromeOsDevices--;
 }
 
-buildUnnamed766() {
+buildUnnamed96() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed766(core.List<core.String> o) {
+checkUnnamed96(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed767() {
+buildUnnamed97() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed767(core.List<core.String> o) {
+checkUnnamed97(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -399,7 +434,7 @@
   buildCounterGroup++;
   if (buildCounterGroup < 3) {
     o.adminCreated = true;
-    o.aliases = buildUnnamed766();
+    o.aliases = buildUnnamed96();
     o.description = "foo";
     o.directMembersCount = "foo";
     o.email = "foo";
@@ -407,7 +442,7 @@
     o.id = "foo";
     o.kind = "foo";
     o.name = "foo";
-    o.nonEditableAliases = buildUnnamed767();
+    o.nonEditableAliases = buildUnnamed97();
   }
   buildCounterGroup--;
   return o;
@@ -417,7 +452,7 @@
   buildCounterGroup++;
   if (buildCounterGroup < 3) {
     unittest.expect(o.adminCreated, unittest.isTrue);
-    checkUnnamed766(o.aliases);
+    checkUnnamed96(o.aliases);
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.directMembersCount, unittest.equals('foo'));
     unittest.expect(o.email, unittest.equals('foo'));
@@ -425,19 +460,19 @@
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed767(o.nonEditableAliases);
+    checkUnnamed97(o.nonEditableAliases);
   }
   buildCounterGroup--;
 }
 
-buildUnnamed768() {
+buildUnnamed98() {
   var o = new core.List<api.Group>();
   o.add(buildGroup());
   o.add(buildGroup());
   return o;
 }
 
-checkUnnamed768(core.List<api.Group> o) {
+checkUnnamed98(core.List<api.Group> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGroup(o[0]);
   checkGroup(o[1]);
@@ -449,7 +484,7 @@
   buildCounterGroups++;
   if (buildCounterGroups < 3) {
     o.etag = "foo";
-    o.groups = buildUnnamed768();
+    o.groups = buildUnnamed98();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -461,7 +496,7 @@
   buildCounterGroups++;
   if (buildCounterGroups < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed768(o.groups);
+    checkUnnamed98(o.groups);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -497,14 +532,14 @@
   buildCounterMember--;
 }
 
-buildUnnamed769() {
+buildUnnamed99() {
   var o = new core.List<api.Member>();
   o.add(buildMember());
   o.add(buildMember());
   return o;
 }
 
-checkUnnamed769(core.List<api.Member> o) {
+checkUnnamed99(core.List<api.Member> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMember(o[0]);
   checkMember(o[1]);
@@ -517,7 +552,7 @@
   if (buildCounterMembers < 3) {
     o.etag = "foo";
     o.kind = "foo";
-    o.members = buildUnnamed769();
+    o.members = buildUnnamed99();
     o.nextPageToken = "foo";
   }
   buildCounterMembers--;
@@ -529,20 +564,20 @@
   if (buildCounterMembers < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed769(o.members);
+    checkUnnamed99(o.members);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterMembers--;
 }
 
-buildUnnamed770() {
+buildUnnamed100() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed770(core.List<core.String> o) {
+checkUnnamed100(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -555,7 +590,7 @@
   if (buildCounterMobileDeviceApplications < 3) {
     o.displayName = "foo";
     o.packageName = "foo";
-    o.permission = buildUnnamed770();
+    o.permission = buildUnnamed100();
     o.versionCode = 42;
     o.versionName = "foo";
   }
@@ -568,47 +603,47 @@
   if (buildCounterMobileDeviceApplications < 3) {
     unittest.expect(o.displayName, unittest.equals('foo'));
     unittest.expect(o.packageName, unittest.equals('foo'));
-    checkUnnamed770(o.permission);
+    checkUnnamed100(o.permission);
     unittest.expect(o.versionCode, unittest.equals(42));
     unittest.expect(o.versionName, unittest.equals('foo'));
   }
   buildCounterMobileDeviceApplications--;
 }
 
-buildUnnamed771() {
+buildUnnamed101() {
   var o = new core.List<api.MobileDeviceApplications>();
   o.add(buildMobileDeviceApplications());
   o.add(buildMobileDeviceApplications());
   return o;
 }
 
-checkUnnamed771(core.List<api.MobileDeviceApplications> o) {
+checkUnnamed101(core.List<api.MobileDeviceApplications> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMobileDeviceApplications(o[0]);
   checkMobileDeviceApplications(o[1]);
 }
 
-buildUnnamed772() {
+buildUnnamed102() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed772(core.List<core.String> o) {
+checkUnnamed102(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed773() {
+buildUnnamed103() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed773(core.List<core.String> o) {
+checkUnnamed103(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -619,13 +654,13 @@
   var o = new api.MobileDevice();
   buildCounterMobileDevice++;
   if (buildCounterMobileDevice < 3) {
-    o.applications = buildUnnamed771();
+    o.applications = buildUnnamed101();
     o.basebandVersion = "foo";
     o.buildNumber = "foo";
     o.defaultLanguage = "foo";
     o.deviceCompromisedStatus = "foo";
     o.deviceId = "foo";
-    o.email = buildUnnamed772();
+    o.email = buildUnnamed102();
     o.etag = "foo";
     o.firstSync = core.DateTime.parse("2002-02-27T14:01:02");
     o.hardwareId = "foo";
@@ -636,7 +671,7 @@
     o.managedAccountIsOnOwnerProfile = true;
     o.meid = "foo";
     o.model = "foo";
-    o.name = buildUnnamed773();
+    o.name = buildUnnamed103();
     o.networkOperator = "foo";
     o.os = "foo";
     o.resourceId = "foo";
@@ -653,13 +688,13 @@
 checkMobileDevice(api.MobileDevice o) {
   buildCounterMobileDevice++;
   if (buildCounterMobileDevice < 3) {
-    checkUnnamed771(o.applications);
+    checkUnnamed101(o.applications);
     unittest.expect(o.basebandVersion, unittest.equals('foo'));
     unittest.expect(o.buildNumber, unittest.equals('foo'));
     unittest.expect(o.defaultLanguage, unittest.equals('foo'));
     unittest.expect(o.deviceCompromisedStatus, unittest.equals('foo'));
     unittest.expect(o.deviceId, unittest.equals('foo'));
-    checkUnnamed772(o.email);
+    checkUnnamed102(o.email);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.firstSync, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.hardwareId, unittest.equals('foo'));
@@ -670,7 +705,7 @@
     unittest.expect(o.managedAccountIsOnOwnerProfile, unittest.isTrue);
     unittest.expect(o.meid, unittest.equals('foo'));
     unittest.expect(o.model, unittest.equals('foo'));
-    checkUnnamed773(o.name);
+    checkUnnamed103(o.name);
     unittest.expect(o.networkOperator, unittest.equals('foo'));
     unittest.expect(o.os, unittest.equals('foo'));
     unittest.expect(o.resourceId, unittest.equals('foo'));
@@ -702,14 +737,14 @@
   buildCounterMobileDeviceAction--;
 }
 
-buildUnnamed774() {
+buildUnnamed104() {
   var o = new core.List<api.MobileDevice>();
   o.add(buildMobileDevice());
   o.add(buildMobileDevice());
   return o;
 }
 
-checkUnnamed774(core.List<api.MobileDevice> o) {
+checkUnnamed104(core.List<api.MobileDevice> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMobileDevice(o[0]);
   checkMobileDevice(o[1]);
@@ -722,7 +757,7 @@
   if (buildCounterMobileDevices < 3) {
     o.etag = "foo";
     o.kind = "foo";
-    o.mobiledevices = buildUnnamed774();
+    o.mobiledevices = buildUnnamed104();
     o.nextPageToken = "foo";
   }
   buildCounterMobileDevices--;
@@ -734,7 +769,7 @@
   if (buildCounterMobileDevices < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed774(o.mobiledevices);
+    checkUnnamed104(o.mobiledevices);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterMobileDevices--;
@@ -773,14 +808,14 @@
   buildCounterNotification--;
 }
 
-buildUnnamed775() {
+buildUnnamed105() {
   var o = new core.List<api.Notification>();
   o.add(buildNotification());
   o.add(buildNotification());
   return o;
 }
 
-checkUnnamed775(core.List<api.Notification> o) {
+checkUnnamed105(core.List<api.Notification> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNotification(o[0]);
   checkNotification(o[1]);
@@ -792,7 +827,7 @@
   buildCounterNotifications++;
   if (buildCounterNotifications < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed775();
+    o.items = buildUnnamed105();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.unreadNotificationsCount = 42;
@@ -805,7 +840,7 @@
   buildCounterNotifications++;
   if (buildCounterNotifications < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed775(o.items);
+    checkUnnamed105(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.unreadNotificationsCount, unittest.equals(42));
@@ -823,7 +858,9 @@
     o.etag = "foo";
     o.kind = "foo";
     o.name = "foo";
+    o.orgUnitId = "foo";
     o.orgUnitPath = "foo";
+    o.parentOrgUnitId = "foo";
     o.parentOrgUnitPath = "foo";
   }
   buildCounterOrgUnit--;
@@ -838,20 +875,22 @@
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
+    unittest.expect(o.orgUnitId, unittest.equals('foo'));
     unittest.expect(o.orgUnitPath, unittest.equals('foo'));
+    unittest.expect(o.parentOrgUnitId, unittest.equals('foo'));
     unittest.expect(o.parentOrgUnitPath, unittest.equals('foo'));
   }
   buildCounterOrgUnit--;
 }
 
-buildUnnamed776() {
+buildUnnamed106() {
   var o = new core.List<api.OrgUnit>();
   o.add(buildOrgUnit());
   o.add(buildOrgUnit());
   return o;
 }
 
-checkUnnamed776(core.List<api.OrgUnit> o) {
+checkUnnamed106(core.List<api.OrgUnit> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrgUnit(o[0]);
   checkOrgUnit(o[1]);
@@ -864,7 +903,7 @@
   if (buildCounterOrgUnits < 3) {
     o.etag = "foo";
     o.kind = "foo";
-    o.organizationUnits = buildUnnamed776();
+    o.organizationUnits = buildUnnamed106();
   }
   buildCounterOrgUnits--;
   return o;
@@ -875,19 +914,19 @@
   if (buildCounterOrgUnits < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed776(o.organizationUnits);
+    checkUnnamed106(o.organizationUnits);
   }
   buildCounterOrgUnits--;
 }
 
-buildUnnamed777() {
+buildUnnamed107() {
   var o = new core.List<api.SchemaFieldSpec>();
   o.add(buildSchemaFieldSpec());
   o.add(buildSchemaFieldSpec());
   return o;
 }
 
-checkUnnamed777(core.List<api.SchemaFieldSpec> o) {
+checkUnnamed107(core.List<api.SchemaFieldSpec> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSchemaFieldSpec(o[0]);
   checkSchemaFieldSpec(o[1]);
@@ -899,7 +938,7 @@
   buildCounterSchema++;
   if (buildCounterSchema < 3) {
     o.etag = "foo";
-    o.fields = buildUnnamed777();
+    o.fields = buildUnnamed107();
     o.kind = "foo";
     o.schemaId = "foo";
     o.schemaName = "foo";
@@ -912,7 +951,7 @@
   buildCounterSchema++;
   if (buildCounterSchema < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed777(o.fields);
+    checkUnnamed107(o.fields);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.schemaId, unittest.equals('foo'));
     unittest.expect(o.schemaName, unittest.equals('foo'));
@@ -976,14 +1015,14 @@
   buildCounterSchemaFieldSpec--;
 }
 
-buildUnnamed778() {
+buildUnnamed108() {
   var o = new core.List<api.Schema>();
   o.add(buildSchema());
   o.add(buildSchema());
   return o;
 }
 
-checkUnnamed778(core.List<api.Schema> o) {
+checkUnnamed108(core.List<api.Schema> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSchema(o[0]);
   checkSchema(o[1]);
@@ -996,7 +1035,7 @@
   if (buildCounterSchemas < 3) {
     o.etag = "foo";
     o.kind = "foo";
-    o.schemas = buildUnnamed778();
+    o.schemas = buildUnnamed108();
   }
   buildCounterSchemas--;
   return o;
@@ -1007,19 +1046,19 @@
   if (buildCounterSchemas < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed778(o.schemas);
+    checkUnnamed108(o.schemas);
   }
   buildCounterSchemas--;
 }
 
-buildUnnamed779() {
+buildUnnamed109() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed779(core.List<core.String> o) {
+checkUnnamed109(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1036,7 +1075,7 @@
     o.etag = "foo";
     o.kind = "foo";
     o.nativeApp = true;
-    o.scopes = buildUnnamed779();
+    o.scopes = buildUnnamed109();
     o.userKey = "foo";
   }
   buildCounterToken--;
@@ -1052,20 +1091,20 @@
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nativeApp, unittest.isTrue);
-    checkUnnamed779(o.scopes);
+    checkUnnamed109(o.scopes);
     unittest.expect(o.userKey, unittest.equals('foo'));
   }
   buildCounterToken--;
 }
 
-buildUnnamed780() {
+buildUnnamed110() {
   var o = new core.List<api.Token>();
   o.add(buildToken());
   o.add(buildToken());
   return o;
 }
 
-checkUnnamed780(core.List<api.Token> o) {
+checkUnnamed110(core.List<api.Token> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkToken(o[0]);
   checkToken(o[1]);
@@ -1077,7 +1116,7 @@
   buildCounterTokens++;
   if (buildCounterTokens < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed780();
+    o.items = buildUnnamed110();
     o.kind = "foo";
   }
   buildCounterTokens--;
@@ -1088,46 +1127,46 @@
   buildCounterTokens++;
   if (buildCounterTokens < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed780(o.items);
+    checkUnnamed110(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterTokens--;
 }
 
-buildUnnamed781() {
+buildUnnamed111() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed781(core.List<core.String> o) {
+checkUnnamed111(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed782() {
+buildUnnamed112() {
   var o = new core.Map<core.String, api.UserCustomProperties>();
   o["x"] = buildUserCustomProperties();
   o["y"] = buildUserCustomProperties();
   return o;
 }
 
-checkUnnamed782(core.Map<core.String, api.UserCustomProperties> o) {
+checkUnnamed112(core.Map<core.String, api.UserCustomProperties> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserCustomProperties(o["x"]);
   checkUserCustomProperties(o["y"]);
 }
 
-buildUnnamed783() {
+buildUnnamed113() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed783(core.List<core.String> o) {
+checkUnnamed113(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1140,10 +1179,10 @@
   if (buildCounterUser < 3) {
     o.addresses = {'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'};
     o.agreedToTerms = true;
-    o.aliases = buildUnnamed781();
+    o.aliases = buildUnnamed111();
     o.changePasswordAtNextLogin = true;
     o.creationTime = core.DateTime.parse("2002-02-27T14:01:02");
-    o.customSchemas = buildUnnamed782();
+    o.customSchemas = buildUnnamed112();
     o.customerId = "foo";
     o.deletionTime = core.DateTime.parse("2002-02-27T14:01:02");
     o.emails = {'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'};
@@ -1160,7 +1199,7 @@
     o.kind = "foo";
     o.lastLoginTime = core.DateTime.parse("2002-02-27T14:01:02");
     o.name = buildUserName();
-    o.nonEditableAliases = buildUnnamed783();
+    o.nonEditableAliases = buildUnnamed113();
     o.notes = {'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'};
     o.orgUnitPath = "foo";
     o.organizations = {'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'};
@@ -1182,10 +1221,10 @@
   if (buildCounterUser < 3) {
     var casted1 = (o.addresses) as core.Map; unittest.expect(casted1, unittest.hasLength(3)); unittest.expect(casted1["list"], unittest.equals([1, 2, 3])); unittest.expect(casted1["bool"], unittest.equals(true)); unittest.expect(casted1["string"], unittest.equals('foo')); 
     unittest.expect(o.agreedToTerms, unittest.isTrue);
-    checkUnnamed781(o.aliases);
+    checkUnnamed111(o.aliases);
     unittest.expect(o.changePasswordAtNextLogin, unittest.isTrue);
     unittest.expect(o.creationTime, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
-    checkUnnamed782(o.customSchemas);
+    checkUnnamed112(o.customSchemas);
     unittest.expect(o.customerId, unittest.equals('foo'));
     unittest.expect(o.deletionTime, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     var casted2 = (o.emails) as core.Map; unittest.expect(casted2, unittest.hasLength(3)); unittest.expect(casted2["list"], unittest.equals([1, 2, 3])); unittest.expect(casted2["bool"], unittest.equals(true)); unittest.expect(casted2["string"], unittest.equals('foo')); 
@@ -1202,7 +1241,7 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.lastLoginTime, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     checkUserName(o.name);
-    checkUnnamed783(o.nonEditableAliases);
+    checkUnnamed113(o.nonEditableAliases);
     var casted5 = (o.notes) as core.Map; unittest.expect(casted5, unittest.hasLength(3)); unittest.expect(casted5["list"], unittest.equals([1, 2, 3])); unittest.expect(casted5["bool"], unittest.equals(true)); unittest.expect(casted5["string"], unittest.equals('foo')); 
     unittest.expect(o.orgUnitPath, unittest.equals('foo'));
     var casted6 = (o.organizations) as core.Map; unittest.expect(casted6, unittest.hasLength(3)); unittest.expect(casted6["list"], unittest.equals([1, 2, 3])); unittest.expect(casted6["bool"], unittest.equals(true)); unittest.expect(casted6["string"], unittest.equals('foo')); 
@@ -1578,14 +1617,14 @@
   buildCounterUserWebsite--;
 }
 
-buildUnnamed784() {
+buildUnnamed114() {
   var o = new core.List<api.User>();
   o.add(buildUser());
   o.add(buildUser());
   return o;
 }
 
-checkUnnamed784(core.List<api.User> o) {
+checkUnnamed114(core.List<api.User> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUser(o[0]);
   checkUser(o[1]);
@@ -1600,7 +1639,7 @@
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.triggerEvent = "foo";
-    o.users = buildUnnamed784();
+    o.users = buildUnnamed114();
   }
   buildCounterUsers--;
   return o;
@@ -1613,7 +1652,7 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.triggerEvent, unittest.equals('foo'));
-    checkUnnamed784(o.users);
+    checkUnnamed114(o.users);
   }
   buildCounterUsers--;
 }
@@ -1643,14 +1682,14 @@
   buildCounterVerificationCode--;
 }
 
-buildUnnamed785() {
+buildUnnamed115() {
   var o = new core.List<api.VerificationCode>();
   o.add(buildVerificationCode());
   o.add(buildVerificationCode());
   return o;
 }
 
-checkUnnamed785(core.List<api.VerificationCode> o) {
+checkUnnamed115(core.List<api.VerificationCode> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVerificationCode(o[0]);
   checkVerificationCode(o[1]);
@@ -1662,7 +1701,7 @@
   buildCounterVerificationCodes++;
   if (buildCounterVerificationCodes < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed785();
+    o.items = buildUnnamed115();
     o.kind = "foo";
   }
   buildCounterVerificationCodes--;
@@ -1673,59 +1712,59 @@
   buildCounterVerificationCodes++;
   if (buildCounterVerificationCodes < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed785(o.items);
+    checkUnnamed115(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterVerificationCodes--;
 }
 
-buildUnnamed786() {
+buildUnnamed116() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed786(core.List<core.String> o) {
+checkUnnamed116(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed787() {
+buildUnnamed117() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed787(core.List<core.String> o) {
+checkUnnamed117(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed788() {
+buildUnnamed118() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed788(core.List<core.String> o) {
+checkUnnamed118(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed789() {
+buildUnnamed119() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed789(core.List<core.String> o) {
+checkUnnamed119(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2141,7 +2180,7 @@
   unittest.group("resource-AspsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AspsResourceApi res = new api.AdminApi(mock).asps;
       var arg_userKey = "foo";
       var arg_codeId = 42;
@@ -2189,14 +2228,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_userKey, arg_codeId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AspsResourceApi res = new api.AdminApi(mock).asps;
       var arg_userKey = "foo";
       var arg_codeId = 42;
@@ -2244,7 +2283,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAsp());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_userKey, arg_codeId).then(unittest.expectAsync(((api.Asp response) {
         checkAsp(response);
@@ -2253,7 +2292,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AspsResourceApi res = new api.AdminApi(mock).asps;
       var arg_userKey = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2297,7 +2336,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAsps());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userKey).then(unittest.expectAsync(((api.Asps response) {
         checkAsps(response);
@@ -2310,7 +2349,7 @@
   unittest.group("resource-ChannelsResourceApi", () {
     unittest.test("method--stop", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ChannelsResourceApi res = new api.AdminApi(mock).channels;
       var arg_request = buildChannel();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2348,7 +2387,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.stop(arg_request).then(unittest.expectAsync((_) {}));
     });
@@ -2359,7 +2398,7 @@
   unittest.group("resource-ChromeosdevicesResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ChromeosdevicesResourceApi res = new api.AdminApi(mock).chromeosdevices;
       var arg_customerId = "foo";
       var arg_deviceId = "foo";
@@ -2409,7 +2448,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChromeOsDevice());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_customerId, arg_deviceId, projection: arg_projection).then(unittest.expectAsync(((api.ChromeOsDevice response) {
         checkChromeOsDevice(response);
@@ -2418,7 +2457,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ChromeosdevicesResourceApi res = new api.AdminApi(mock).chromeosdevices;
       var arg_customerId = "foo";
       var arg_maxResults = 42;
@@ -2474,7 +2513,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChromeOsDevices());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_customerId, maxResults: arg_maxResults, orderBy: arg_orderBy, pageToken: arg_pageToken, projection: arg_projection, query: arg_query, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.ChromeOsDevices response) {
         checkChromeOsDevices(response);
@@ -2483,7 +2522,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ChromeosdevicesResourceApi res = new api.AdminApi(mock).chromeosdevices;
       var arg_request = buildChromeOsDevice();
       var arg_customerId = "foo";
@@ -2537,7 +2576,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChromeOsDevice());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_customerId, arg_deviceId, projection: arg_projection).then(unittest.expectAsync(((api.ChromeOsDevice response) {
         checkChromeOsDevice(response);
@@ -2546,7 +2585,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ChromeosdevicesResourceApi res = new api.AdminApi(mock).chromeosdevices;
       var arg_request = buildChromeOsDevice();
       var arg_customerId = "foo";
@@ -2600,7 +2639,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChromeOsDevice());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_customerId, arg_deviceId, projection: arg_projection).then(unittest.expectAsync(((api.ChromeOsDevice response) {
         checkChromeOsDevice(response);
@@ -2613,7 +2652,7 @@
   unittest.group("resource-GroupsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GroupsResourceApi res = new api.AdminApi(mock).groups;
       var arg_groupKey = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2653,14 +2692,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_groupKey).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GroupsResourceApi res = new api.AdminApi(mock).groups;
       var arg_groupKey = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2700,7 +2739,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGroup());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_groupKey).then(unittest.expectAsync(((api.Group response) {
         checkGroup(response);
@@ -2709,7 +2748,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GroupsResourceApi res = new api.AdminApi(mock).groups;
       var arg_request = buildGroup();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2749,7 +2788,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGroup());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request).then(unittest.expectAsync(((api.Group response) {
         checkGroup(response);
@@ -2758,7 +2797,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GroupsResourceApi res = new api.AdminApi(mock).groups;
       var arg_customer = "foo";
       var arg_domain = "foo";
@@ -2804,7 +2843,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGroups());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(customer: arg_customer, domain: arg_domain, maxResults: arg_maxResults, pageToken: arg_pageToken, userKey: arg_userKey).then(unittest.expectAsync(((api.Groups response) {
         checkGroups(response);
@@ -2813,7 +2852,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GroupsResourceApi res = new api.AdminApi(mock).groups;
       var arg_request = buildGroup();
       var arg_groupKey = "foo";
@@ -2857,7 +2896,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGroup());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_groupKey).then(unittest.expectAsync(((api.Group response) {
         checkGroup(response);
@@ -2866,7 +2905,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GroupsResourceApi res = new api.AdminApi(mock).groups;
       var arg_request = buildGroup();
       var arg_groupKey = "foo";
@@ -2910,7 +2949,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGroup());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_groupKey).then(unittest.expectAsync(((api.Group response) {
         checkGroup(response);
@@ -2923,7 +2962,7 @@
   unittest.group("resource-GroupsAliasesResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GroupsAliasesResourceApi res = new api.AdminApi(mock).groups.aliases;
       var arg_groupKey = "foo";
       var arg_alias = "foo";
@@ -2971,14 +3010,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_groupKey, arg_alias).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GroupsAliasesResourceApi res = new api.AdminApi(mock).groups.aliases;
       var arg_request = buildAlias();
       var arg_groupKey = "foo";
@@ -3026,7 +3065,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAlias());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_groupKey).then(unittest.expectAsync(((api.Alias response) {
         checkAlias(response);
@@ -3035,7 +3074,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GroupsAliasesResourceApi res = new api.AdminApi(mock).groups.aliases;
       var arg_groupKey = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -3079,7 +3118,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAliases());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_groupKey).then(unittest.expectAsync(((api.Aliases response) {
         checkAliases(response);
@@ -3092,7 +3131,7 @@
   unittest.group("resource-MembersResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MembersResourceApi res = new api.AdminApi(mock).members;
       var arg_groupKey = "foo";
       var arg_memberKey = "foo";
@@ -3140,14 +3179,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_groupKey, arg_memberKey).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MembersResourceApi res = new api.AdminApi(mock).members;
       var arg_groupKey = "foo";
       var arg_memberKey = "foo";
@@ -3195,7 +3234,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMember());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_groupKey, arg_memberKey).then(unittest.expectAsync(((api.Member response) {
         checkMember(response);
@@ -3204,7 +3243,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MembersResourceApi res = new api.AdminApi(mock).members;
       var arg_request = buildMember();
       var arg_groupKey = "foo";
@@ -3252,7 +3291,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMember());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_groupKey).then(unittest.expectAsync(((api.Member response) {
         checkMember(response);
@@ -3261,7 +3300,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MembersResourceApi res = new api.AdminApi(mock).members;
       var arg_groupKey = "foo";
       var arg_maxResults = 42;
@@ -3311,7 +3350,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMembers());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_groupKey, maxResults: arg_maxResults, pageToken: arg_pageToken, roles: arg_roles).then(unittest.expectAsync(((api.Members response) {
         checkMembers(response);
@@ -3320,7 +3359,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MembersResourceApi res = new api.AdminApi(mock).members;
       var arg_request = buildMember();
       var arg_groupKey = "foo";
@@ -3372,7 +3411,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMember());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_groupKey, arg_memberKey).then(unittest.expectAsync(((api.Member response) {
         checkMember(response);
@@ -3381,7 +3420,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MembersResourceApi res = new api.AdminApi(mock).members;
       var arg_request = buildMember();
       var arg_groupKey = "foo";
@@ -3433,7 +3472,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMember());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_groupKey, arg_memberKey).then(unittest.expectAsync(((api.Member response) {
         checkMember(response);
@@ -3446,7 +3485,7 @@
   unittest.group("resource-MobiledevicesResourceApi", () {
     unittest.test("method--action", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MobiledevicesResourceApi res = new api.AdminApi(mock).mobiledevices;
       var arg_request = buildMobileDeviceAction();
       var arg_customerId = "foo";
@@ -3502,14 +3541,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.action(arg_request, arg_customerId, arg_resourceId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MobiledevicesResourceApi res = new api.AdminApi(mock).mobiledevices;
       var arg_customerId = "foo";
       var arg_resourceId = "foo";
@@ -3557,14 +3596,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_customerId, arg_resourceId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MobiledevicesResourceApi res = new api.AdminApi(mock).mobiledevices;
       var arg_customerId = "foo";
       var arg_resourceId = "foo";
@@ -3614,7 +3653,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMobileDevice());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_customerId, arg_resourceId, projection: arg_projection).then(unittest.expectAsync(((api.MobileDevice response) {
         checkMobileDevice(response);
@@ -3623,7 +3662,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MobiledevicesResourceApi res = new api.AdminApi(mock).mobiledevices;
       var arg_customerId = "foo";
       var arg_maxResults = 42;
@@ -3679,7 +3718,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMobileDevices());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_customerId, maxResults: arg_maxResults, orderBy: arg_orderBy, pageToken: arg_pageToken, projection: arg_projection, query: arg_query, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.MobileDevices response) {
         checkMobileDevices(response);
@@ -3692,7 +3731,7 @@
   unittest.group("resource-NotificationsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.NotificationsResourceApi res = new api.AdminApi(mock).notifications;
       var arg_customer = "foo";
       var arg_notificationId = "foo";
@@ -3740,14 +3779,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_customer, arg_notificationId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.NotificationsResourceApi res = new api.AdminApi(mock).notifications;
       var arg_customer = "foo";
       var arg_notificationId = "foo";
@@ -3795,7 +3834,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildNotification());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_customer, arg_notificationId).then(unittest.expectAsync(((api.Notification response) {
         checkNotification(response);
@@ -3804,7 +3843,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.NotificationsResourceApi res = new api.AdminApi(mock).notifications;
       var arg_customer = "foo";
       var arg_language = "foo";
@@ -3854,7 +3893,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildNotifications());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_customer, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.Notifications response) {
         checkNotifications(response);
@@ -3863,7 +3902,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.NotificationsResourceApi res = new api.AdminApi(mock).notifications;
       var arg_request = buildNotification();
       var arg_customer = "foo";
@@ -3915,7 +3954,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildNotification());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_customer, arg_notificationId).then(unittest.expectAsync(((api.Notification response) {
         checkNotification(response);
@@ -3924,7 +3963,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.NotificationsResourceApi res = new api.AdminApi(mock).notifications;
       var arg_request = buildNotification();
       var arg_customer = "foo";
@@ -3976,7 +4015,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildNotification());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_customer, arg_notificationId).then(unittest.expectAsync(((api.Notification response) {
         checkNotification(response);
@@ -3989,10 +4028,10 @@
   unittest.group("resource-OrgunitsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.OrgunitsResourceApi res = new api.AdminApi(mock).orgunits;
       var arg_customerId = "foo";
-      var arg_orgUnitPath = buildUnnamed786();
+      var arg_orgUnitPath = buildUnnamed116();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -4036,17 +4075,17 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_customerId, arg_orgUnitPath).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.OrgunitsResourceApi res = new api.AdminApi(mock).orgunits;
       var arg_customerId = "foo";
-      var arg_orgUnitPath = buildUnnamed787();
+      var arg_orgUnitPath = buildUnnamed117();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -4090,7 +4129,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOrgUnit());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_customerId, arg_orgUnitPath).then(unittest.expectAsync(((api.OrgUnit response) {
         checkOrgUnit(response);
@@ -4099,7 +4138,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.OrgunitsResourceApi res = new api.AdminApi(mock).orgunits;
       var arg_request = buildOrgUnit();
       var arg_customerId = "foo";
@@ -4147,7 +4186,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOrgUnit());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_customerId).then(unittest.expectAsync(((api.OrgUnit response) {
         checkOrgUnit(response);
@@ -4156,7 +4195,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.OrgunitsResourceApi res = new api.AdminApi(mock).orgunits;
       var arg_customerId = "foo";
       var arg_orgUnitPath = "foo";
@@ -4204,7 +4243,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOrgUnits());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_customerId, orgUnitPath: arg_orgUnitPath, type: arg_type).then(unittest.expectAsync(((api.OrgUnits response) {
         checkOrgUnits(response);
@@ -4213,11 +4252,11 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.OrgunitsResourceApi res = new api.AdminApi(mock).orgunits;
       var arg_request = buildOrgUnit();
       var arg_customerId = "foo";
-      var arg_orgUnitPath = buildUnnamed788();
+      var arg_orgUnitPath = buildUnnamed118();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var obj = new api.OrgUnit.fromJson(json);
         checkOrgUnit(obj);
@@ -4264,7 +4303,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOrgUnit());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_customerId, arg_orgUnitPath).then(unittest.expectAsync(((api.OrgUnit response) {
         checkOrgUnit(response);
@@ -4273,11 +4312,11 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.OrgunitsResourceApi res = new api.AdminApi(mock).orgunits;
       var arg_request = buildOrgUnit();
       var arg_customerId = "foo";
-      var arg_orgUnitPath = buildUnnamed789();
+      var arg_orgUnitPath = buildUnnamed119();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var obj = new api.OrgUnit.fromJson(json);
         checkOrgUnit(obj);
@@ -4324,7 +4363,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOrgUnit());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_customerId, arg_orgUnitPath).then(unittest.expectAsync(((api.OrgUnit response) {
         checkOrgUnit(response);
@@ -4337,7 +4376,7 @@
   unittest.group("resource-SchemasResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SchemasResourceApi res = new api.AdminApi(mock).schemas;
       var arg_customerId = "foo";
       var arg_schemaKey = "foo";
@@ -4385,14 +4424,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_customerId, arg_schemaKey).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SchemasResourceApi res = new api.AdminApi(mock).schemas;
       var arg_customerId = "foo";
       var arg_schemaKey = "foo";
@@ -4440,7 +4479,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSchema());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_customerId, arg_schemaKey).then(unittest.expectAsync(((api.Schema response) {
         checkSchema(response);
@@ -4449,7 +4488,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SchemasResourceApi res = new api.AdminApi(mock).schemas;
       var arg_request = buildSchema();
       var arg_customerId = "foo";
@@ -4497,7 +4536,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSchema());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_customerId).then(unittest.expectAsync(((api.Schema response) {
         checkSchema(response);
@@ -4506,7 +4545,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SchemasResourceApi res = new api.AdminApi(mock).schemas;
       var arg_customerId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -4550,7 +4589,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSchemas());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_customerId).then(unittest.expectAsync(((api.Schemas response) {
         checkSchemas(response);
@@ -4559,7 +4598,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SchemasResourceApi res = new api.AdminApi(mock).schemas;
       var arg_request = buildSchema();
       var arg_customerId = "foo";
@@ -4611,7 +4650,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSchema());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_customerId, arg_schemaKey).then(unittest.expectAsync(((api.Schema response) {
         checkSchema(response);
@@ -4620,7 +4659,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SchemasResourceApi res = new api.AdminApi(mock).schemas;
       var arg_request = buildSchema();
       var arg_customerId = "foo";
@@ -4672,7 +4711,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSchema());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_customerId, arg_schemaKey).then(unittest.expectAsync(((api.Schema response) {
         checkSchema(response);
@@ -4685,7 +4724,7 @@
   unittest.group("resource-TokensResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TokensResourceApi res = new api.AdminApi(mock).tokens;
       var arg_userKey = "foo";
       var arg_clientId = "foo";
@@ -4733,14 +4772,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_userKey, arg_clientId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TokensResourceApi res = new api.AdminApi(mock).tokens;
       var arg_userKey = "foo";
       var arg_clientId = "foo";
@@ -4788,7 +4827,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildToken());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_userKey, arg_clientId).then(unittest.expectAsync(((api.Token response) {
         checkToken(response);
@@ -4797,7 +4836,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TokensResourceApi res = new api.AdminApi(mock).tokens;
       var arg_userKey = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -4841,7 +4880,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTokens());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userKey).then(unittest.expectAsync(((api.Tokens response) {
         checkTokens(response);
@@ -4854,7 +4893,7 @@
   unittest.group("resource-UsersResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersResourceApi res = new api.AdminApi(mock).users;
       var arg_userKey = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -4894,14 +4933,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_userKey).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersResourceApi res = new api.AdminApi(mock).users;
       var arg_userKey = "foo";
       var arg_customFieldMask = "foo";
@@ -4947,7 +4986,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUser());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_userKey, customFieldMask: arg_customFieldMask, projection: arg_projection, viewType: arg_viewType).then(unittest.expectAsync(((api.User response) {
         checkUser(response);
@@ -4956,7 +4995,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersResourceApi res = new api.AdminApi(mock).users;
       var arg_request = buildUser();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -4996,7 +5035,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUser());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request).then(unittest.expectAsync(((api.User response) {
         checkUser(response);
@@ -5005,7 +5044,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersResourceApi res = new api.AdminApi(mock).users;
       var arg_customFieldMask = "foo";
       var arg_customer = "foo";
@@ -5065,7 +5104,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUsers());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(customFieldMask: arg_customFieldMask, customer: arg_customer, domain: arg_domain, event: arg_event, maxResults: arg_maxResults, orderBy: arg_orderBy, pageToken: arg_pageToken, projection: arg_projection, query: arg_query, showDeleted: arg_showDeleted, sortOrder: arg_sortOrder, viewType: arg_viewType).then(unittest.expectAsync(((api.Users response) {
         checkUsers(response);
@@ -5074,7 +5113,7 @@
 
     unittest.test("method--makeAdmin", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersResourceApi res = new api.AdminApi(mock).users;
       var arg_request = buildUserMakeAdmin();
       var arg_userKey = "foo";
@@ -5122,14 +5161,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.makeAdmin(arg_request, arg_userKey).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersResourceApi res = new api.AdminApi(mock).users;
       var arg_request = buildUser();
       var arg_userKey = "foo";
@@ -5173,7 +5212,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUser());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_userKey).then(unittest.expectAsync(((api.User response) {
         checkUser(response);
@@ -5182,7 +5221,7 @@
 
     unittest.test("method--undelete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersResourceApi res = new api.AdminApi(mock).users;
       var arg_request = buildUserUndelete();
       var arg_userKey = "foo";
@@ -5230,14 +5269,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.undelete(arg_request, arg_userKey).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersResourceApi res = new api.AdminApi(mock).users;
       var arg_request = buildUser();
       var arg_userKey = "foo";
@@ -5281,7 +5320,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUser());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_userKey).then(unittest.expectAsync(((api.User response) {
         checkUser(response);
@@ -5290,7 +5329,7 @@
 
     unittest.test("method--watch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersResourceApi res = new api.AdminApi(mock).users;
       var arg_request = buildChannel();
       var arg_customFieldMask = "foo";
@@ -5354,7 +5393,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChannel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.watch(arg_request, customFieldMask: arg_customFieldMask, customer: arg_customer, domain: arg_domain, event: arg_event, maxResults: arg_maxResults, orderBy: arg_orderBy, pageToken: arg_pageToken, projection: arg_projection, query: arg_query, showDeleted: arg_showDeleted, sortOrder: arg_sortOrder, viewType: arg_viewType).then(unittest.expectAsync(((api.Channel response) {
         checkChannel(response);
@@ -5367,7 +5406,7 @@
   unittest.group("resource-UsersAliasesResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersAliasesResourceApi res = new api.AdminApi(mock).users.aliases;
       var arg_userKey = "foo";
       var arg_alias = "foo";
@@ -5415,14 +5454,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_userKey, arg_alias).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersAliasesResourceApi res = new api.AdminApi(mock).users.aliases;
       var arg_request = buildAlias();
       var arg_userKey = "foo";
@@ -5470,7 +5509,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAlias());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_userKey).then(unittest.expectAsync(((api.Alias response) {
         checkAlias(response);
@@ -5479,7 +5518,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersAliasesResourceApi res = new api.AdminApi(mock).users.aliases;
       var arg_userKey = "foo";
       var arg_event = "foo";
@@ -5525,7 +5564,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAliases());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userKey, event: arg_event).then(unittest.expectAsync(((api.Aliases response) {
         checkAliases(response);
@@ -5534,7 +5573,7 @@
 
     unittest.test("method--watch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersAliasesResourceApi res = new api.AdminApi(mock).users.aliases;
       var arg_request = buildChannel();
       var arg_userKey = "foo";
@@ -5584,7 +5623,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChannel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.watch(arg_request, arg_userKey, event: arg_event).then(unittest.expectAsync(((api.Channel response) {
         checkChannel(response);
@@ -5597,7 +5636,7 @@
   unittest.group("resource-UsersPhotosResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersPhotosResourceApi res = new api.AdminApi(mock).users.photos;
       var arg_userKey = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -5641,14 +5680,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_userKey).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersPhotosResourceApi res = new api.AdminApi(mock).users.photos;
       var arg_userKey = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -5692,7 +5731,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUserPhoto());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_userKey).then(unittest.expectAsync(((api.UserPhoto response) {
         checkUserPhoto(response);
@@ -5701,7 +5740,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersPhotosResourceApi res = new api.AdminApi(mock).users.photos;
       var arg_request = buildUserPhoto();
       var arg_userKey = "foo";
@@ -5749,7 +5788,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUserPhoto());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_userKey).then(unittest.expectAsync(((api.UserPhoto response) {
         checkUserPhoto(response);
@@ -5758,7 +5797,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersPhotosResourceApi res = new api.AdminApi(mock).users.photos;
       var arg_request = buildUserPhoto();
       var arg_userKey = "foo";
@@ -5806,7 +5845,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUserPhoto());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_userKey).then(unittest.expectAsync(((api.UserPhoto response) {
         checkUserPhoto(response);
@@ -5819,7 +5858,7 @@
   unittest.group("resource-VerificationCodesResourceApi", () {
     unittest.test("method--generate", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.VerificationCodesResourceApi res = new api.AdminApi(mock).verificationCodes;
       var arg_userKey = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -5863,14 +5902,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.generate(arg_userKey).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--invalidate", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.VerificationCodesResourceApi res = new api.AdminApi(mock).verificationCodes;
       var arg_userKey = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -5914,14 +5953,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.invalidate(arg_userKey).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.VerificationCodesResourceApi res = new api.AdminApi(mock).verificationCodes;
       var arg_userKey = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -5965,7 +6004,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildVerificationCodes());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userKey).then(unittest.expectAsync(((api.VerificationCodes response) {
         checkVerificationCodes(response);
diff --git a/generated/googleapis/test/admin/email_migration_v2_test.dart b/generated/googleapis/test/admin/email_migration_v2_test.dart
index 8bb3315..1a3ef5d 100644
--- a/generated/googleapis/test/admin/email_migration_v2_test.dart
+++ b/generated/googleapis/test/admin/email_migration_v2_test.dart
@@ -8,22 +8,57 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/admin/email_migration_v2.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
 
-buildUnnamed0() {
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+buildUnnamed120() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed0(core.List<core.String> o) {
+checkUnnamed120(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -42,7 +77,7 @@
     o.isTrash = true;
     o.isUnread = true;
     o.kind = "foo";
-    o.labels = buildUnnamed0();
+    o.labels = buildUnnamed120();
   }
   buildCounterMailItem--;
   return o;
@@ -59,7 +94,7 @@
     unittest.expect(o.isTrash, unittest.isTrue);
     unittest.expect(o.isUnread, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed0(o.labels);
+    checkUnnamed120(o.labels);
   }
   buildCounterMailItem--;
 }
@@ -80,7 +115,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MailResourceApi res = new api.AdminApi(mock).mail;
       var arg_request = buildMailItem();
       var arg_userKey = "foo";
@@ -117,7 +152,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_userKey).then(unittest.expectAsync((_) {}));
     });
diff --git a/generated/googleapis/test/admin/reports_v1_test.dart b/generated/googleapis/test/admin/reports_v1_test.dart
index f9e8909..f685569 100644
--- a/generated/googleapis/test/admin/reports_v1_test.dart
+++ b/generated/googleapis/test/admin/reports_v1_test.dart
@@ -8,22 +8,57 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/admin/reports_v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
 
-buildUnnamed675() {
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+buildUnnamed121() {
   var o = new core.List<api.Activity>();
   o.add(buildActivity());
   o.add(buildActivity());
   return o;
 }
 
-checkUnnamed675(core.List<api.Activity> o) {
+checkUnnamed121(core.List<api.Activity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivity(o[0]);
   checkActivity(o[1]);
@@ -35,7 +70,7 @@
   buildCounterActivities++;
   if (buildCounterActivities < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed675();
+    o.items = buildUnnamed121();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -47,7 +82,7 @@
   buildCounterActivities++;
   if (buildCounterActivities < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed675(o.items);
+    checkUnnamed121(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -79,27 +114,27 @@
   buildCounterActivityActor--;
 }
 
-buildUnnamed676() {
+buildUnnamed122() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed676(core.List<core.String> o) {
+checkUnnamed122(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed677() {
+buildUnnamed123() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed677(core.List<core.String> o) {
+checkUnnamed123(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -112,8 +147,8 @@
   if (buildCounterActivityEventsParameters < 3) {
     o.boolValue = true;
     o.intValue = "foo";
-    o.multiIntValue = buildUnnamed676();
-    o.multiValue = buildUnnamed677();
+    o.multiIntValue = buildUnnamed122();
+    o.multiValue = buildUnnamed123();
     o.name = "foo";
     o.value = "foo";
   }
@@ -126,22 +161,22 @@
   if (buildCounterActivityEventsParameters < 3) {
     unittest.expect(o.boolValue, unittest.isTrue);
     unittest.expect(o.intValue, unittest.equals('foo'));
-    checkUnnamed676(o.multiIntValue);
-    checkUnnamed677(o.multiValue);
+    checkUnnamed122(o.multiIntValue);
+    checkUnnamed123(o.multiValue);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.value, unittest.equals('foo'));
   }
   buildCounterActivityEventsParameters--;
 }
 
-buildUnnamed678() {
+buildUnnamed124() {
   var o = new core.List<api.ActivityEventsParameters>();
   o.add(buildActivityEventsParameters());
   o.add(buildActivityEventsParameters());
   return o;
 }
 
-checkUnnamed678(core.List<api.ActivityEventsParameters> o) {
+checkUnnamed124(core.List<api.ActivityEventsParameters> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivityEventsParameters(o[0]);
   checkActivityEventsParameters(o[1]);
@@ -153,7 +188,7 @@
   buildCounterActivityEvents++;
   if (buildCounterActivityEvents < 3) {
     o.name = "foo";
-    o.parameters = buildUnnamed678();
+    o.parameters = buildUnnamed124();
     o.type = "foo";
   }
   buildCounterActivityEvents--;
@@ -164,20 +199,20 @@
   buildCounterActivityEvents++;
   if (buildCounterActivityEvents < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed678(o.parameters);
+    checkUnnamed124(o.parameters);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterActivityEvents--;
 }
 
-buildUnnamed679() {
+buildUnnamed125() {
   var o = new core.List<api.ActivityEvents>();
   o.add(buildActivityEvents());
   o.add(buildActivityEvents());
   return o;
 }
 
-checkUnnamed679(core.List<api.ActivityEvents> o) {
+checkUnnamed125(core.List<api.ActivityEvents> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivityEvents(o[0]);
   checkActivityEvents(o[1]);
@@ -215,7 +250,7 @@
   if (buildCounterActivity < 3) {
     o.actor = buildActivityActor();
     o.etag = "foo";
-    o.events = buildUnnamed679();
+    o.events = buildUnnamed125();
     o.id = buildActivityId();
     o.ipAddress = "foo";
     o.kind = "foo";
@@ -230,7 +265,7 @@
   if (buildCounterActivity < 3) {
     checkActivityActor(o.actor);
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed679(o.events);
+    checkUnnamed125(o.events);
     checkActivityId(o.id);
     unittest.expect(o.ipAddress, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
@@ -239,14 +274,14 @@
   buildCounterActivity--;
 }
 
-buildUnnamed680() {
+buildUnnamed126() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed680(core.Map<core.String, core.String> o) {
+checkUnnamed126(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -261,7 +296,7 @@
     o.expiration = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.params = buildUnnamed680();
+    o.params = buildUnnamed126();
     o.payload = true;
     o.resourceId = "foo";
     o.resourceUri = "foo";
@@ -279,7 +314,7 @@
     unittest.expect(o.expiration, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed680(o.params);
+    checkUnnamed126(o.params);
     unittest.expect(o.payload, unittest.isTrue);
     unittest.expect(o.resourceId, unittest.equals('foo'));
     unittest.expect(o.resourceUri, unittest.equals('foo'));
@@ -314,30 +349,30 @@
   buildCounterUsageReportEntity--;
 }
 
-buildUnnamed681() {
+buildUnnamed127() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'};
   o["y"] = {'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'};
   return o;
 }
 
-checkUnnamed681(core.Map<core.String, core.Object> o) {
+checkUnnamed127(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map; unittest.expect(casted1, unittest.hasLength(3)); unittest.expect(casted1["list"], unittest.equals([1, 2, 3])); unittest.expect(casted1["bool"], unittest.equals(true)); unittest.expect(casted1["string"], unittest.equals('foo')); 
   var casted2 = (o["y"]) as core.Map; unittest.expect(casted2, unittest.hasLength(3)); unittest.expect(casted2["list"], unittest.equals([1, 2, 3])); unittest.expect(casted2["bool"], unittest.equals(true)); unittest.expect(casted2["string"], unittest.equals('foo')); 
 }
 
-buildUnnamed682() {
+buildUnnamed128() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed681());
-  o.add(buildUnnamed681());
+  o.add(buildUnnamed127());
+  o.add(buildUnnamed127());
   return o;
 }
 
-checkUnnamed682(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed128(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed681(o[0]);
-  checkUnnamed681(o[1]);
+  checkUnnamed127(o[0]);
+  checkUnnamed127(o[1]);
 }
 
 core.int buildCounterUsageReportParameters = 0;
@@ -348,7 +383,7 @@
     o.boolValue = true;
     o.datetimeValue = core.DateTime.parse("2002-02-27T14:01:02");
     o.intValue = "foo";
-    o.msgValue = buildUnnamed682();
+    o.msgValue = buildUnnamed128();
     o.name = "foo";
     o.stringValue = "foo";
   }
@@ -362,21 +397,21 @@
     unittest.expect(o.boolValue, unittest.isTrue);
     unittest.expect(o.datetimeValue, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.intValue, unittest.equals('foo'));
-    checkUnnamed682(o.msgValue);
+    checkUnnamed128(o.msgValue);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.stringValue, unittest.equals('foo'));
   }
   buildCounterUsageReportParameters--;
 }
 
-buildUnnamed683() {
+buildUnnamed129() {
   var o = new core.List<api.UsageReportParameters>();
   o.add(buildUsageReportParameters());
   o.add(buildUsageReportParameters());
   return o;
 }
 
-checkUnnamed683(core.List<api.UsageReportParameters> o) {
+checkUnnamed129(core.List<api.UsageReportParameters> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUsageReportParameters(o[0]);
   checkUsageReportParameters(o[1]);
@@ -391,7 +426,7 @@
     o.entity = buildUsageReportEntity();
     o.etag = "foo";
     o.kind = "foo";
-    o.parameters = buildUnnamed683();
+    o.parameters = buildUnnamed129();
   }
   buildCounterUsageReport--;
   return o;
@@ -404,19 +439,19 @@
     checkUsageReportEntity(o.entity);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed683(o.parameters);
+    checkUnnamed129(o.parameters);
   }
   buildCounterUsageReport--;
 }
 
-buildUnnamed684() {
+buildUnnamed130() {
   var o = new core.List<api.UsageReport>();
   o.add(buildUsageReport());
   o.add(buildUsageReport());
   return o;
 }
 
-checkUnnamed684(core.List<api.UsageReport> o) {
+checkUnnamed130(core.List<api.UsageReport> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUsageReport(o[0]);
   checkUsageReport(o[1]);
@@ -443,14 +478,14 @@
   buildCounterUsageReportsWarningsData--;
 }
 
-buildUnnamed685() {
+buildUnnamed131() {
   var o = new core.List<api.UsageReportsWarningsData>();
   o.add(buildUsageReportsWarningsData());
   o.add(buildUsageReportsWarningsData());
   return o;
 }
 
-checkUnnamed685(core.List<api.UsageReportsWarningsData> o) {
+checkUnnamed131(core.List<api.UsageReportsWarningsData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUsageReportsWarningsData(o[0]);
   checkUsageReportsWarningsData(o[1]);
@@ -462,7 +497,7 @@
   buildCounterUsageReportsWarnings++;
   if (buildCounterUsageReportsWarnings < 3) {
     o.code = "foo";
-    o.data = buildUnnamed685();
+    o.data = buildUnnamed131();
     o.message = "foo";
   }
   buildCounterUsageReportsWarnings--;
@@ -473,20 +508,20 @@
   buildCounterUsageReportsWarnings++;
   if (buildCounterUsageReportsWarnings < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed685(o.data);
+    checkUnnamed131(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterUsageReportsWarnings--;
 }
 
-buildUnnamed686() {
+buildUnnamed132() {
   var o = new core.List<api.UsageReportsWarnings>();
   o.add(buildUsageReportsWarnings());
   o.add(buildUsageReportsWarnings());
   return o;
 }
 
-checkUnnamed686(core.List<api.UsageReportsWarnings> o) {
+checkUnnamed132(core.List<api.UsageReportsWarnings> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUsageReportsWarnings(o[0]);
   checkUsageReportsWarnings(o[1]);
@@ -500,8 +535,8 @@
     o.etag = "foo";
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.usageReports = buildUnnamed684();
-    o.warnings = buildUnnamed686();
+    o.usageReports = buildUnnamed130();
+    o.warnings = buildUnnamed132();
   }
   buildCounterUsageReports--;
   return o;
@@ -513,8 +548,8 @@
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed684(o.usageReports);
-    checkUnnamed686(o.warnings);
+    checkUnnamed130(o.usageReports);
+    checkUnnamed132(o.warnings);
   }
   buildCounterUsageReports--;
 }
@@ -641,7 +676,7 @@
   unittest.group("resource-ActivitiesResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ActivitiesResourceApi res = new api.AdminApi(mock).activities;
       var arg_userKey = "foo";
       var arg_applicationName = "foo";
@@ -705,7 +740,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildActivities());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userKey, arg_applicationName, actorIpAddress: arg_actorIpAddress, customerId: arg_customerId, endTime: arg_endTime, eventName: arg_eventName, filters: arg_filters, maxResults: arg_maxResults, pageToken: arg_pageToken, startTime: arg_startTime).then(unittest.expectAsync(((api.Activities response) {
         checkActivities(response);
@@ -714,7 +749,7 @@
 
     unittest.test("method--watch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ActivitiesResourceApi res = new api.AdminApi(mock).activities;
       var arg_request = buildChannel();
       var arg_userKey = "foo";
@@ -786,7 +821,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChannel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.watch(arg_request, arg_userKey, arg_applicationName, actorIpAddress: arg_actorIpAddress, customerId: arg_customerId, endTime: arg_endTime, eventName: arg_eventName, filters: arg_filters, maxResults: arg_maxResults, pageToken: arg_pageToken, startTime: arg_startTime).then(unittest.expectAsync(((api.Channel response) {
         checkChannel(response);
@@ -799,7 +834,7 @@
   unittest.group("resource-ChannelsResourceApi", () {
     unittest.test("method--stop", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ChannelsResourceApi res = new api.AdminApi(mock).channels;
       var arg_request = buildChannel();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -837,7 +872,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.stop(arg_request).then(unittest.expectAsync((_) {}));
     });
@@ -848,7 +883,7 @@
   unittest.group("resource-CustomerUsageReportsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CustomerUsageReportsResourceApi res = new api.AdminApi(mock).customerUsageReports;
       var arg_date = "foo";
       var arg_customerId = "foo";
@@ -894,7 +929,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUsageReports());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_date, customerId: arg_customerId, pageToken: arg_pageToken, parameters: arg_parameters).then(unittest.expectAsync(((api.UsageReports response) {
         checkUsageReports(response);
@@ -907,7 +942,7 @@
   unittest.group("resource-UserUsageReportResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UserUsageReportResourceApi res = new api.AdminApi(mock).userUsageReport;
       var arg_userKey = "foo";
       var arg_date = "foo";
@@ -965,7 +1000,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUsageReports());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_userKey, arg_date, customerId: arg_customerId, filters: arg_filters, maxResults: arg_maxResults, pageToken: arg_pageToken, parameters: arg_parameters).then(unittest.expectAsync(((api.UsageReports response) {
         checkUsageReports(response);
diff --git a/generated/googleapis/test/adsense/v1_4_test.dart b/generated/googleapis/test/adsense/v1_4_test.dart
index 2995824..c2597ef 100644
--- a/generated/googleapis/test/adsense/v1_4_test.dart
+++ b/generated/googleapis/test/adsense/v1_4_test.dart
@@ -8,22 +8,57 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/adsense/v1_4.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
 
-buildUnnamed1196() {
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+buildUnnamed133() {
   var o = new core.List<api.Account>();
   o.add(buildAccount());
   o.add(buildAccount());
   return o;
 }
 
-checkUnnamed1196(core.List<api.Account> o) {
+checkUnnamed133(core.List<api.Account> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccount(o[0]);
   checkAccount(o[1]);
@@ -38,7 +73,7 @@
     o.kind = "foo";
     o.name = "foo";
     o.premium = true;
-    o.subAccounts = buildUnnamed1196();
+    o.subAccounts = buildUnnamed133();
     o.timezone = "foo";
   }
   buildCounterAccount--;
@@ -52,20 +87,20 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.premium, unittest.isTrue);
-    checkUnnamed1196(o.subAccounts);
+    checkUnnamed133(o.subAccounts);
     unittest.expect(o.timezone, unittest.equals('foo'));
   }
   buildCounterAccount--;
 }
 
-buildUnnamed1197() {
+buildUnnamed134() {
   var o = new core.List<api.Account>();
   o.add(buildAccount());
   o.add(buildAccount());
   return o;
 }
 
-checkUnnamed1197(core.List<api.Account> o) {
+checkUnnamed134(core.List<api.Account> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccount(o[0]);
   checkAccount(o[1]);
@@ -77,7 +112,7 @@
   buildCounterAccounts++;
   if (buildCounterAccounts < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1197();
+    o.items = buildUnnamed134();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -89,7 +124,7 @@
   buildCounterAccounts++;
   if (buildCounterAccounts < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1197(o.items);
+    checkUnnamed134(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -125,14 +160,14 @@
   buildCounterAdClient--;
 }
 
-buildUnnamed1198() {
+buildUnnamed135() {
   var o = new core.List<api.AdClient>();
   o.add(buildAdClient());
   o.add(buildAdClient());
   return o;
 }
 
-checkUnnamed1198(core.List<api.AdClient> o) {
+checkUnnamed135(core.List<api.AdClient> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdClient(o[0]);
   checkAdClient(o[1]);
@@ -144,7 +179,7 @@
   buildCounterAdClients++;
   if (buildCounterAdClients < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1198();
+    o.items = buildUnnamed135();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -156,7 +191,7 @@
   buildCounterAdClients++;
   if (buildCounterAdClients < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1198(o.items);
+    checkUnnamed135(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -390,14 +425,14 @@
   buildCounterAdUnit--;
 }
 
-buildUnnamed1199() {
+buildUnnamed136() {
   var o = new core.List<api.AdUnit>();
   o.add(buildAdUnit());
   o.add(buildAdUnit());
   return o;
 }
 
-checkUnnamed1199(core.List<api.AdUnit> o) {
+checkUnnamed136(core.List<api.AdUnit> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdUnit(o[0]);
   checkAdUnit(o[1]);
@@ -409,7 +444,7 @@
   buildCounterAdUnits++;
   if (buildCounterAdUnits < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1199();
+    o.items = buildUnnamed136();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -421,21 +456,21 @@
   buildCounterAdUnits++;
   if (buildCounterAdUnits < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1199(o.items);
+    checkUnnamed136(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterAdUnits--;
 }
 
-buildUnnamed1200() {
+buildUnnamed137() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1200(core.List<core.String> o) {
+checkUnnamed137(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -464,66 +499,66 @@
   buildCounterAdsenseReportsGenerateResponseHeaders--;
 }
 
-buildUnnamed1201() {
+buildUnnamed138() {
   var o = new core.List<api.AdsenseReportsGenerateResponseHeaders>();
   o.add(buildAdsenseReportsGenerateResponseHeaders());
   o.add(buildAdsenseReportsGenerateResponseHeaders());
   return o;
 }
 
-checkUnnamed1201(core.List<api.AdsenseReportsGenerateResponseHeaders> o) {
+checkUnnamed138(core.List<api.AdsenseReportsGenerateResponseHeaders> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdsenseReportsGenerateResponseHeaders(o[0]);
   checkAdsenseReportsGenerateResponseHeaders(o[1]);
 }
 
-buildUnnamed1202() {
+buildUnnamed139() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1202(core.List<core.String> o) {
+checkUnnamed139(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1203() {
+buildUnnamed140() {
   var o = new core.List<core.List<core.String>>();
-  o.add(buildUnnamed1202());
-  o.add(buildUnnamed1202());
+  o.add(buildUnnamed139());
+  o.add(buildUnnamed139());
   return o;
 }
 
-checkUnnamed1203(core.List<core.List<core.String>> o) {
+checkUnnamed140(core.List<core.List<core.String>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1202(o[0]);
-  checkUnnamed1202(o[1]);
+  checkUnnamed139(o[0]);
+  checkUnnamed139(o[1]);
 }
 
-buildUnnamed1204() {
+buildUnnamed141() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1204(core.List<core.String> o) {
+checkUnnamed141(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1205() {
+buildUnnamed142() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1205(core.List<core.String> o) {
+checkUnnamed142(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -534,15 +569,15 @@
   var o = new api.AdsenseReportsGenerateResponse();
   buildCounterAdsenseReportsGenerateResponse++;
   if (buildCounterAdsenseReportsGenerateResponse < 3) {
-    o.averages = buildUnnamed1200();
+    o.averages = buildUnnamed137();
     o.endDate = "foo";
-    o.headers = buildUnnamed1201();
+    o.headers = buildUnnamed138();
     o.kind = "foo";
-    o.rows = buildUnnamed1203();
+    o.rows = buildUnnamed140();
     o.startDate = "foo";
     o.totalMatchedRows = "foo";
-    o.totals = buildUnnamed1204();
-    o.warnings = buildUnnamed1205();
+    o.totals = buildUnnamed141();
+    o.warnings = buildUnnamed142();
   }
   buildCounterAdsenseReportsGenerateResponse--;
   return o;
@@ -551,15 +586,15 @@
 checkAdsenseReportsGenerateResponse(api.AdsenseReportsGenerateResponse o) {
   buildCounterAdsenseReportsGenerateResponse++;
   if (buildCounterAdsenseReportsGenerateResponse < 3) {
-    checkUnnamed1200(o.averages);
+    checkUnnamed137(o.averages);
     unittest.expect(o.endDate, unittest.equals('foo'));
-    checkUnnamed1201(o.headers);
+    checkUnnamed138(o.headers);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1203(o.rows);
+    checkUnnamed140(o.rows);
     unittest.expect(o.startDate, unittest.equals('foo'));
     unittest.expect(o.totalMatchedRows, unittest.equals('foo'));
-    checkUnnamed1204(o.totals);
-    checkUnnamed1205(o.warnings);
+    checkUnnamed141(o.totals);
+    checkUnnamed142(o.warnings);
   }
   buildCounterAdsenseReportsGenerateResponse--;
 }
@@ -593,14 +628,14 @@
   buildCounterAlert--;
 }
 
-buildUnnamed1206() {
+buildUnnamed143() {
   var o = new core.List<api.Alert>();
   o.add(buildAlert());
   o.add(buildAlert());
   return o;
 }
 
-checkUnnamed1206(core.List<api.Alert> o) {
+checkUnnamed143(core.List<api.Alert> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAlert(o[0]);
   checkAlert(o[1]);
@@ -611,7 +646,7 @@
   var o = new api.Alerts();
   buildCounterAlerts++;
   if (buildCounterAlerts < 3) {
-    o.items = buildUnnamed1206();
+    o.items = buildUnnamed143();
     o.kind = "foo";
   }
   buildCounterAlerts--;
@@ -621,7 +656,7 @@
 checkAlerts(api.Alerts o) {
   buildCounterAlerts++;
   if (buildCounterAlerts < 3) {
-    checkUnnamed1206(o.items);
+    checkUnnamed143(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAlerts--;
@@ -679,14 +714,14 @@
   buildCounterCustomChannel--;
 }
 
-buildUnnamed1207() {
+buildUnnamed144() {
   var o = new core.List<api.CustomChannel>();
   o.add(buildCustomChannel());
   o.add(buildCustomChannel());
   return o;
 }
 
-checkUnnamed1207(core.List<api.CustomChannel> o) {
+checkUnnamed144(core.List<api.CustomChannel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomChannel(o[0]);
   checkCustomChannel(o[1]);
@@ -698,7 +733,7 @@
   buildCounterCustomChannels++;
   if (buildCounterCustomChannels < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1207();
+    o.items = buildUnnamed144();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -710,21 +745,21 @@
   buildCounterCustomChannels++;
   if (buildCounterCustomChannels < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1207(o.items);
+    checkUnnamed144(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterCustomChannels--;
 }
 
-buildUnnamed1208() {
+buildUnnamed145() {
   var o = new core.List<api.ReportingMetadataEntry>();
   o.add(buildReportingMetadataEntry());
   o.add(buildReportingMetadataEntry());
   return o;
 }
 
-checkUnnamed1208(core.List<api.ReportingMetadataEntry> o) {
+checkUnnamed145(core.List<api.ReportingMetadataEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportingMetadataEntry(o[0]);
   checkReportingMetadataEntry(o[1]);
@@ -735,7 +770,7 @@
   var o = new api.Metadata();
   buildCounterMetadata++;
   if (buildCounterMetadata < 3) {
-    o.items = buildUnnamed1208();
+    o.items = buildUnnamed145();
     o.kind = "foo";
   }
   buildCounterMetadata--;
@@ -745,7 +780,7 @@
 checkMetadata(api.Metadata o) {
   buildCounterMetadata++;
   if (buildCounterMetadata < 3) {
-    checkUnnamed1208(o.items);
+    checkUnnamed145(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterMetadata--;
@@ -778,14 +813,14 @@
   buildCounterPayment--;
 }
 
-buildUnnamed1209() {
+buildUnnamed146() {
   var o = new core.List<api.Payment>();
   o.add(buildPayment());
   o.add(buildPayment());
   return o;
 }
 
-checkUnnamed1209(core.List<api.Payment> o) {
+checkUnnamed146(core.List<api.Payment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPayment(o[0]);
   checkPayment(o[1]);
@@ -796,7 +831,7 @@
   var o = new api.Payments();
   buildCounterPayments++;
   if (buildCounterPayments < 3) {
-    o.items = buildUnnamed1209();
+    o.items = buildUnnamed146();
     o.kind = "foo";
   }
   buildCounterPayments--;
@@ -806,72 +841,72 @@
 checkPayments(api.Payments o) {
   buildCounterPayments++;
   if (buildCounterPayments < 3) {
-    checkUnnamed1209(o.items);
+    checkUnnamed146(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterPayments--;
 }
 
-buildUnnamed1210() {
+buildUnnamed147() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1210(core.List<core.String> o) {
+checkUnnamed147(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1211() {
+buildUnnamed148() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1211(core.List<core.String> o) {
+checkUnnamed148(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1212() {
+buildUnnamed149() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1212(core.List<core.String> o) {
+checkUnnamed149(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1213() {
+buildUnnamed150() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1213(core.List<core.String> o) {
+checkUnnamed150(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1214() {
+buildUnnamed151() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1214(core.List<core.String> o) {
+checkUnnamed151(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -882,13 +917,13 @@
   var o = new api.ReportingMetadataEntry();
   buildCounterReportingMetadataEntry++;
   if (buildCounterReportingMetadataEntry < 3) {
-    o.compatibleDimensions = buildUnnamed1210();
-    o.compatibleMetrics = buildUnnamed1211();
+    o.compatibleDimensions = buildUnnamed147();
+    o.compatibleMetrics = buildUnnamed148();
     o.id = "foo";
     o.kind = "foo";
-    o.requiredDimensions = buildUnnamed1212();
-    o.requiredMetrics = buildUnnamed1213();
-    o.supportedProducts = buildUnnamed1214();
+    o.requiredDimensions = buildUnnamed149();
+    o.requiredMetrics = buildUnnamed150();
+    o.supportedProducts = buildUnnamed151();
   }
   buildCounterReportingMetadataEntry--;
   return o;
@@ -897,13 +932,13 @@
 checkReportingMetadataEntry(api.ReportingMetadataEntry o) {
   buildCounterReportingMetadataEntry++;
   if (buildCounterReportingMetadataEntry < 3) {
-    checkUnnamed1210(o.compatibleDimensions);
-    checkUnnamed1211(o.compatibleMetrics);
+    checkUnnamed147(o.compatibleDimensions);
+    checkUnnamed148(o.compatibleMetrics);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1212(o.requiredDimensions);
-    checkUnnamed1213(o.requiredMetrics);
-    checkUnnamed1214(o.supportedProducts);
+    checkUnnamed149(o.requiredDimensions);
+    checkUnnamed150(o.requiredMetrics);
+    checkUnnamed151(o.supportedProducts);
   }
   buildCounterReportingMetadataEntry--;
 }
@@ -933,14 +968,14 @@
   buildCounterSavedAdStyle--;
 }
 
-buildUnnamed1215() {
+buildUnnamed152() {
   var o = new core.List<api.SavedAdStyle>();
   o.add(buildSavedAdStyle());
   o.add(buildSavedAdStyle());
   return o;
 }
 
-checkUnnamed1215(core.List<api.SavedAdStyle> o) {
+checkUnnamed152(core.List<api.SavedAdStyle> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSavedAdStyle(o[0]);
   checkSavedAdStyle(o[1]);
@@ -952,7 +987,7 @@
   buildCounterSavedAdStyles++;
   if (buildCounterSavedAdStyles < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1215();
+    o.items = buildUnnamed152();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -964,7 +999,7 @@
   buildCounterSavedAdStyles++;
   if (buildCounterSavedAdStyles < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1215(o.items);
+    checkUnnamed152(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -994,14 +1029,14 @@
   buildCounterSavedReport--;
 }
 
-buildUnnamed1216() {
+buildUnnamed153() {
   var o = new core.List<api.SavedReport>();
   o.add(buildSavedReport());
   o.add(buildSavedReport());
   return o;
 }
 
-checkUnnamed1216(core.List<api.SavedReport> o) {
+checkUnnamed153(core.List<api.SavedReport> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSavedReport(o[0]);
   checkSavedReport(o[1]);
@@ -1013,7 +1048,7 @@
   buildCounterSavedReports++;
   if (buildCounterSavedReports < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1216();
+    o.items = buildUnnamed153();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1025,7 +1060,7 @@
   buildCounterSavedReports++;
   if (buildCounterSavedReports < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1216(o.items);
+    checkUnnamed153(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1055,14 +1090,14 @@
   buildCounterUrlChannel--;
 }
 
-buildUnnamed1217() {
+buildUnnamed154() {
   var o = new core.List<api.UrlChannel>();
   o.add(buildUrlChannel());
   o.add(buildUrlChannel());
   return o;
 }
 
-checkUnnamed1217(core.List<api.UrlChannel> o) {
+checkUnnamed154(core.List<api.UrlChannel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlChannel(o[0]);
   checkUrlChannel(o[1]);
@@ -1074,7 +1109,7 @@
   buildCounterUrlChannels++;
   if (buildCounterUrlChannels < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1217();
+    o.items = buildUnnamed154();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1086,125 +1121,125 @@
   buildCounterUrlChannels++;
   if (buildCounterUrlChannels < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1217(o.items);
+    checkUnnamed154(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterUrlChannels--;
 }
 
-buildUnnamed1218() {
+buildUnnamed155() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1218(core.List<core.String> o) {
+checkUnnamed155(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1219() {
+buildUnnamed156() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1219(core.List<core.String> o) {
+checkUnnamed156(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1220() {
+buildUnnamed157() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1220(core.List<core.String> o) {
+checkUnnamed157(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1221() {
+buildUnnamed158() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1221(core.List<core.String> o) {
+checkUnnamed158(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1222() {
+buildUnnamed159() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1222(core.List<core.String> o) {
+checkUnnamed159(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1223() {
+buildUnnamed160() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1223(core.List<core.String> o) {
+checkUnnamed160(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1224() {
+buildUnnamed161() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1224(core.List<core.String> o) {
+checkUnnamed161(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1225() {
+buildUnnamed162() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1225(core.List<core.String> o) {
+checkUnnamed162(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1226() {
+buildUnnamed163() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1226(core.List<core.String> o) {
+checkUnnamed163(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1494,7 +1529,7 @@
   unittest.group("resource-AccountsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.AdsenseApi(mock).accounts;
       var arg_accountId = "foo";
       var arg_tree = true;
@@ -1536,7 +1571,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccount());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, tree: arg_tree).then(unittest.expectAsync(((api.Account response) {
         checkAccount(response);
@@ -1545,7 +1580,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.AdsenseApi(mock).accounts;
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
@@ -1585,7 +1620,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccounts());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.Accounts response) {
         checkAccounts(response);
@@ -1598,7 +1633,7 @@
   unittest.group("resource-AccountsAdclientsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsAdclientsResourceApi res = new api.AdsenseApi(mock).accounts.adclients;
       var arg_accountId = "foo";
       var arg_maxResults = 42;
@@ -1646,7 +1681,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdClients());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.AdClients response) {
         checkAdClients(response);
@@ -1659,7 +1694,7 @@
   unittest.group("resource-AccountsAdunitsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsAdunitsResourceApi res = new api.AdsenseApi(mock).accounts.adunits;
       var arg_accountId = "foo";
       var arg_adClientId = "foo";
@@ -1715,7 +1750,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdUnit());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_adClientId, arg_adUnitId).then(unittest.expectAsync(((api.AdUnit response) {
         checkAdUnit(response);
@@ -1724,7 +1759,7 @@
 
     unittest.test("method--getAdCode", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsAdunitsResourceApi res = new api.AdsenseApi(mock).accounts.adunits;
       var arg_accountId = "foo";
       var arg_adClientId = "foo";
@@ -1784,7 +1819,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdCode());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.getAdCode(arg_accountId, arg_adClientId, arg_adUnitId).then(unittest.expectAsync(((api.AdCode response) {
         checkAdCode(response);
@@ -1793,7 +1828,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsAdunitsResourceApi res = new api.AdsenseApi(mock).accounts.adunits;
       var arg_accountId = "foo";
       var arg_adClientId = "foo";
@@ -1851,7 +1886,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdUnits());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_adClientId, includeInactive: arg_includeInactive, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.AdUnits response) {
         checkAdUnits(response);
@@ -1864,7 +1899,7 @@
   unittest.group("resource-AccountsAdunitsCustomchannelsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsAdunitsCustomchannelsResourceApi res = new api.AdsenseApi(mock).accounts.adunits.customchannels;
       var arg_accountId = "foo";
       var arg_adClientId = "foo";
@@ -1928,7 +1963,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomChannels());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_adClientId, arg_adUnitId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.CustomChannels response) {
         checkCustomChannels(response);
@@ -1941,7 +1976,7 @@
   unittest.group("resource-AccountsAlertsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsAlertsResourceApi res = new api.AdsenseApi(mock).accounts.alerts;
       var arg_accountId = "foo";
       var arg_alertId = "foo";
@@ -1989,14 +2024,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_accountId, arg_alertId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsAlertsResourceApi res = new api.AdsenseApi(mock).accounts.alerts;
       var arg_accountId = "foo";
       var arg_locale = "foo";
@@ -2042,7 +2077,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAlerts());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, locale: arg_locale).then(unittest.expectAsync(((api.Alerts response) {
         checkAlerts(response);
@@ -2055,7 +2090,7 @@
   unittest.group("resource-AccountsCustomchannelsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsCustomchannelsResourceApi res = new api.AdsenseApi(mock).accounts.customchannels;
       var arg_accountId = "foo";
       var arg_adClientId = "foo";
@@ -2111,7 +2146,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomChannel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_adClientId, arg_customChannelId).then(unittest.expectAsync(((api.CustomChannel response) {
         checkCustomChannel(response);
@@ -2120,7 +2155,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsCustomchannelsResourceApi res = new api.AdsenseApi(mock).accounts.customchannels;
       var arg_accountId = "foo";
       var arg_adClientId = "foo";
@@ -2176,7 +2211,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomChannels());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_adClientId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.CustomChannels response) {
         checkCustomChannels(response);
@@ -2189,7 +2224,7 @@
   unittest.group("resource-AccountsCustomchannelsAdunitsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsCustomchannelsAdunitsResourceApi res = new api.AdsenseApi(mock).accounts.customchannels.adunits;
       var arg_accountId = "foo";
       var arg_adClientId = "foo";
@@ -2255,7 +2290,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdUnits());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_adClientId, arg_customChannelId, includeInactive: arg_includeInactive, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.AdUnits response) {
         checkAdUnits(response);
@@ -2268,7 +2303,7 @@
   unittest.group("resource-AccountsPaymentsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsPaymentsResourceApi res = new api.AdsenseApi(mock).accounts.payments;
       var arg_accountId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2312,7 +2347,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPayments());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId).then(unittest.expectAsync(((api.Payments response) {
         checkPayments(response);
@@ -2327,18 +2362,18 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsReportsResourceApi res = new api.AdsenseApi(mock).accounts.reports;
       var arg_accountId = "foo";
       var arg_startDate = "foo";
       var arg_endDate = "foo";
       var arg_currency = "foo";
-      var arg_dimension = buildUnnamed1218();
-      var arg_filter = buildUnnamed1219();
+      var arg_dimension = buildUnnamed155();
+      var arg_filter = buildUnnamed156();
       var arg_locale = "foo";
       var arg_maxResults = 42;
-      var arg_metric = buildUnnamed1220();
-      var arg_sort = buildUnnamed1221();
+      var arg_metric = buildUnnamed157();
+      var arg_sort = buildUnnamed158();
       var arg_startIndex = 42;
       var arg_useTimezoneReporting = true;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2393,7 +2428,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdsenseReportsGenerateResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.generate(arg_accountId, arg_startDate, arg_endDate, currency: arg_currency, dimension: arg_dimension, filter: arg_filter, locale: arg_locale, maxResults: arg_maxResults, metric: arg_metric, sort: arg_sort, startIndex: arg_startIndex, useTimezoneReporting: arg_useTimezoneReporting).then(unittest.expectAsync(((api.AdsenseReportsGenerateResponse response) {
         checkAdsenseReportsGenerateResponse(response);
@@ -2406,7 +2441,7 @@
   unittest.group("resource-AccountsReportsSavedResourceApi", () {
     unittest.test("method--generate", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsReportsSavedResourceApi res = new api.AdsenseApi(mock).accounts.reports.saved;
       var arg_accountId = "foo";
       var arg_savedReportId = "foo";
@@ -2460,7 +2495,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdsenseReportsGenerateResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.generate(arg_accountId, arg_savedReportId, locale: arg_locale, maxResults: arg_maxResults, startIndex: arg_startIndex).then(unittest.expectAsync(((api.AdsenseReportsGenerateResponse response) {
         checkAdsenseReportsGenerateResponse(response);
@@ -2469,7 +2504,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsReportsSavedResourceApi res = new api.AdsenseApi(mock).accounts.reports.saved;
       var arg_accountId = "foo";
       var arg_maxResults = 42;
@@ -2517,7 +2552,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSavedReports());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.SavedReports response) {
         checkSavedReports(response);
@@ -2530,7 +2565,7 @@
   unittest.group("resource-AccountsSavedadstylesResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsSavedadstylesResourceApi res = new api.AdsenseApi(mock).accounts.savedadstyles;
       var arg_accountId = "foo";
       var arg_savedAdStyleId = "foo";
@@ -2578,7 +2613,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSavedAdStyle());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_savedAdStyleId).then(unittest.expectAsync(((api.SavedAdStyle response) {
         checkSavedAdStyle(response);
@@ -2587,7 +2622,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsSavedadstylesResourceApi res = new api.AdsenseApi(mock).accounts.savedadstyles;
       var arg_accountId = "foo";
       var arg_maxResults = 42;
@@ -2635,7 +2670,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSavedAdStyles());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.SavedAdStyles response) {
         checkSavedAdStyles(response);
@@ -2648,7 +2683,7 @@
   unittest.group("resource-AccountsUrlchannelsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsUrlchannelsResourceApi res = new api.AdsenseApi(mock).accounts.urlchannels;
       var arg_accountId = "foo";
       var arg_adClientId = "foo";
@@ -2704,7 +2739,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUrlChannels());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_adClientId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.UrlChannels response) {
         checkUrlChannels(response);
@@ -2717,7 +2752,7 @@
   unittest.group("resource-AdclientsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdclientsResourceApi res = new api.AdsenseApi(mock).adclients;
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
@@ -2757,7 +2792,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdClients());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.AdClients response) {
         checkAdClients(response);
@@ -2770,7 +2805,7 @@
   unittest.group("resource-AdunitsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdunitsResourceApi res = new api.AdsenseApi(mock).adunits;
       var arg_adClientId = "foo";
       var arg_adUnitId = "foo";
@@ -2818,7 +2853,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdUnit());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_adClientId, arg_adUnitId).then(unittest.expectAsync(((api.AdUnit response) {
         checkAdUnit(response);
@@ -2827,7 +2862,7 @@
 
     unittest.test("method--getAdCode", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdunitsResourceApi res = new api.AdsenseApi(mock).adunits;
       var arg_adClientId = "foo";
       var arg_adUnitId = "foo";
@@ -2879,7 +2914,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdCode());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.getAdCode(arg_adClientId, arg_adUnitId).then(unittest.expectAsync(((api.AdCode response) {
         checkAdCode(response);
@@ -2888,7 +2923,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdunitsResourceApi res = new api.AdsenseApi(mock).adunits;
       var arg_adClientId = "foo";
       var arg_includeInactive = true;
@@ -2938,7 +2973,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdUnits());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_adClientId, includeInactive: arg_includeInactive, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.AdUnits response) {
         checkAdUnits(response);
@@ -2951,7 +2986,7 @@
   unittest.group("resource-AdunitsCustomchannelsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdunitsCustomchannelsResourceApi res = new api.AdsenseApi(mock).adunits.customchannels;
       var arg_adClientId = "foo";
       var arg_adUnitId = "foo";
@@ -3007,7 +3042,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomChannels());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_adClientId, arg_adUnitId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.CustomChannels response) {
         checkCustomChannels(response);
@@ -3020,7 +3055,7 @@
   unittest.group("resource-AlertsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AlertsResourceApi res = new api.AdsenseApi(mock).alerts;
       var arg_alertId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -3060,14 +3095,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_alertId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AlertsResourceApi res = new api.AdsenseApi(mock).alerts;
       var arg_locale = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -3105,7 +3140,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAlerts());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(locale: arg_locale).then(unittest.expectAsync(((api.Alerts response) {
         checkAlerts(response);
@@ -3118,7 +3153,7 @@
   unittest.group("resource-CustomchannelsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CustomchannelsResourceApi res = new api.AdsenseApi(mock).customchannels;
       var arg_adClientId = "foo";
       var arg_customChannelId = "foo";
@@ -3166,7 +3201,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomChannel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_adClientId, arg_customChannelId).then(unittest.expectAsync(((api.CustomChannel response) {
         checkCustomChannel(response);
@@ -3175,7 +3210,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CustomchannelsResourceApi res = new api.AdsenseApi(mock).customchannels;
       var arg_adClientId = "foo";
       var arg_maxResults = 42;
@@ -3223,7 +3258,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomChannels());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_adClientId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.CustomChannels response) {
         checkCustomChannels(response);
@@ -3236,7 +3271,7 @@
   unittest.group("resource-CustomchannelsAdunitsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CustomchannelsAdunitsResourceApi res = new api.AdsenseApi(mock).customchannels.adunits;
       var arg_adClientId = "foo";
       var arg_customChannelId = "foo";
@@ -3294,7 +3329,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdUnits());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_adClientId, arg_customChannelId, includeInactive: arg_includeInactive, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.AdUnits response) {
         checkAdUnits(response);
@@ -3307,7 +3342,7 @@
   unittest.group("resource-MetadataDimensionsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MetadataDimensionsResourceApi res = new api.AdsenseApi(mock).metadata.dimensions;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -3343,7 +3378,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMetadata());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list().then(unittest.expectAsync(((api.Metadata response) {
         checkMetadata(response);
@@ -3356,7 +3391,7 @@
   unittest.group("resource-MetadataMetricsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MetadataMetricsResourceApi res = new api.AdsenseApi(mock).metadata.metrics;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -3392,7 +3427,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMetadata());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list().then(unittest.expectAsync(((api.Metadata response) {
         checkMetadata(response);
@@ -3405,7 +3440,7 @@
   unittest.group("resource-PaymentsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PaymentsResourceApi res = new api.AdsenseApi(mock).payments;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -3441,7 +3476,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPayments());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list().then(unittest.expectAsync(((api.Payments response) {
         checkPayments(response);
@@ -3456,18 +3491,18 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsResourceApi res = new api.AdsenseApi(mock).reports;
       var arg_startDate = "foo";
       var arg_endDate = "foo";
-      var arg_accountId = buildUnnamed1222();
+      var arg_accountId = buildUnnamed159();
       var arg_currency = "foo";
-      var arg_dimension = buildUnnamed1223();
-      var arg_filter = buildUnnamed1224();
+      var arg_dimension = buildUnnamed160();
+      var arg_filter = buildUnnamed161();
       var arg_locale = "foo";
       var arg_maxResults = 42;
-      var arg_metric = buildUnnamed1225();
-      var arg_sort = buildUnnamed1226();
+      var arg_metric = buildUnnamed162();
+      var arg_sort = buildUnnamed163();
       var arg_startIndex = 42;
       var arg_useTimezoneReporting = true;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -3516,7 +3551,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdsenseReportsGenerateResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.generate(arg_startDate, arg_endDate, accountId: arg_accountId, currency: arg_currency, dimension: arg_dimension, filter: arg_filter, locale: arg_locale, maxResults: arg_maxResults, metric: arg_metric, sort: arg_sort, startIndex: arg_startIndex, useTimezoneReporting: arg_useTimezoneReporting).then(unittest.expectAsync(((api.AdsenseReportsGenerateResponse response) {
         checkAdsenseReportsGenerateResponse(response);
@@ -3529,7 +3564,7 @@
   unittest.group("resource-ReportsSavedResourceApi", () {
     unittest.test("method--generate", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsSavedResourceApi res = new api.AdsenseApi(mock).reports.saved;
       var arg_savedReportId = "foo";
       var arg_locale = "foo";
@@ -3575,7 +3610,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdsenseReportsGenerateResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.generate(arg_savedReportId, locale: arg_locale, maxResults: arg_maxResults, startIndex: arg_startIndex).then(unittest.expectAsync(((api.AdsenseReportsGenerateResponse response) {
         checkAdsenseReportsGenerateResponse(response);
@@ -3584,7 +3619,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsSavedResourceApi res = new api.AdsenseApi(mock).reports.saved;
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
@@ -3624,7 +3659,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSavedReports());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.SavedReports response) {
         checkSavedReports(response);
@@ -3637,7 +3672,7 @@
   unittest.group("resource-SavedadstylesResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SavedadstylesResourceApi res = new api.AdsenseApi(mock).savedadstyles;
       var arg_savedAdStyleId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -3677,7 +3712,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSavedAdStyle());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_savedAdStyleId).then(unittest.expectAsync(((api.SavedAdStyle response) {
         checkSavedAdStyle(response);
@@ -3686,7 +3721,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SavedadstylesResourceApi res = new api.AdsenseApi(mock).savedadstyles;
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
@@ -3726,7 +3761,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSavedAdStyles());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.SavedAdStyles response) {
         checkSavedAdStyles(response);
@@ -3739,7 +3774,7 @@
   unittest.group("resource-UrlchannelsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UrlchannelsResourceApi res = new api.AdsenseApi(mock).urlchannels;
       var arg_adClientId = "foo";
       var arg_maxResults = 42;
@@ -3787,7 +3822,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUrlChannels());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_adClientId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.UrlChannels response) {
         checkUrlChannels(response);
diff --git a/generated/googleapis/test/adsensehost/v4_1_test.dart b/generated/googleapis/test/adsensehost/v4_1_test.dart
index ccc14a9..3da6673 100644
--- a/generated/googleapis/test/adsensehost/v4_1_test.dart
+++ b/generated/googleapis/test/adsensehost/v4_1_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/adsensehost/v4_1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterAccount = 0;
 buildAccount() {
@@ -41,14 +76,14 @@
   buildCounterAccount--;
 }
 
-buildUnnamed1411() {
+buildUnnamed164() {
   var o = new core.List<api.Account>();
   o.add(buildAccount());
   o.add(buildAccount());
   return o;
 }
 
-checkUnnamed1411(core.List<api.Account> o) {
+checkUnnamed164(core.List<api.Account> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccount(o[0]);
   checkAccount(o[1]);
@@ -60,7 +95,7 @@
   buildCounterAccounts++;
   if (buildCounterAccounts < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1411();
+    o.items = buildUnnamed164();
     o.kind = "foo";
   }
   buildCounterAccounts--;
@@ -71,7 +106,7 @@
   buildCounterAccounts++;
   if (buildCounterAccounts < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1411(o.items);
+    checkUnnamed164(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAccounts--;
@@ -104,14 +139,14 @@
   buildCounterAdClient--;
 }
 
-buildUnnamed1412() {
+buildUnnamed165() {
   var o = new core.List<api.AdClient>();
   o.add(buildAdClient());
   o.add(buildAdClient());
   return o;
 }
 
-checkUnnamed1412(core.List<api.AdClient> o) {
+checkUnnamed165(core.List<api.AdClient> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdClient(o[0]);
   checkAdClient(o[1]);
@@ -123,7 +158,7 @@
   buildCounterAdClients++;
   if (buildCounterAdClients < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1412();
+    o.items = buildUnnamed165();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -135,7 +170,7 @@
   buildCounterAdClients++;
   if (buildCounterAdClients < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1412(o.items);
+    checkUnnamed165(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -340,14 +375,14 @@
   buildCounterAdUnit--;
 }
 
-buildUnnamed1413() {
+buildUnnamed166() {
   var o = new core.List<api.AdUnit>();
   o.add(buildAdUnit());
   o.add(buildAdUnit());
   return o;
 }
 
-checkUnnamed1413(core.List<api.AdUnit> o) {
+checkUnnamed166(core.List<api.AdUnit> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdUnit(o[0]);
   checkAdUnit(o[1]);
@@ -359,7 +394,7 @@
   buildCounterAdUnits++;
   if (buildCounterAdUnits < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1413();
+    o.items = buildUnnamed166();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -371,21 +406,21 @@
   buildCounterAdUnits++;
   if (buildCounterAdUnits < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1413(o.items);
+    checkUnnamed166(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterAdUnits--;
 }
 
-buildUnnamed1414() {
+buildUnnamed167() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1414(core.List<core.String> o) {
+checkUnnamed167(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -399,7 +434,7 @@
     o.accountId = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.productCodes = buildUnnamed1414();
+    o.productCodes = buildUnnamed167();
     o.redirectUrl = "foo";
     o.status = "foo";
     o.userLocale = "foo";
@@ -416,7 +451,7 @@
     unittest.expect(o.accountId, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1414(o.productCodes);
+    checkUnnamed167(o.productCodes);
     unittest.expect(o.redirectUrl, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.userLocale, unittest.equals('foo'));
@@ -451,14 +486,14 @@
   buildCounterCustomChannel--;
 }
 
-buildUnnamed1415() {
+buildUnnamed168() {
   var o = new core.List<api.CustomChannel>();
   o.add(buildCustomChannel());
   o.add(buildCustomChannel());
   return o;
 }
 
-checkUnnamed1415(core.List<api.CustomChannel> o) {
+checkUnnamed168(core.List<api.CustomChannel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomChannel(o[0]);
   checkCustomChannel(o[1]);
@@ -470,7 +505,7 @@
   buildCounterCustomChannels++;
   if (buildCounterCustomChannels < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1415();
+    o.items = buildUnnamed168();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -482,21 +517,21 @@
   buildCounterCustomChannels++;
   if (buildCounterCustomChannels < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1415(o.items);
+    checkUnnamed168(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterCustomChannels--;
 }
 
-buildUnnamed1416() {
+buildUnnamed169() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1416(core.List<core.String> o) {
+checkUnnamed169(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -525,66 +560,66 @@
   buildCounterReportHeaders--;
 }
 
-buildUnnamed1417() {
+buildUnnamed170() {
   var o = new core.List<api.ReportHeaders>();
   o.add(buildReportHeaders());
   o.add(buildReportHeaders());
   return o;
 }
 
-checkUnnamed1417(core.List<api.ReportHeaders> o) {
+checkUnnamed170(core.List<api.ReportHeaders> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportHeaders(o[0]);
   checkReportHeaders(o[1]);
 }
 
-buildUnnamed1418() {
+buildUnnamed171() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1418(core.List<core.String> o) {
+checkUnnamed171(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1419() {
+buildUnnamed172() {
   var o = new core.List<core.List<core.String>>();
-  o.add(buildUnnamed1418());
-  o.add(buildUnnamed1418());
+  o.add(buildUnnamed171());
+  o.add(buildUnnamed171());
   return o;
 }
 
-checkUnnamed1419(core.List<core.List<core.String>> o) {
+checkUnnamed172(core.List<core.List<core.String>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1418(o[0]);
-  checkUnnamed1418(o[1]);
+  checkUnnamed171(o[0]);
+  checkUnnamed171(o[1]);
 }
 
-buildUnnamed1420() {
+buildUnnamed173() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1420(core.List<core.String> o) {
+checkUnnamed173(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1421() {
+buildUnnamed174() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1421(core.List<core.String> o) {
+checkUnnamed174(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -595,13 +630,13 @@
   var o = new api.Report();
   buildCounterReport++;
   if (buildCounterReport < 3) {
-    o.averages = buildUnnamed1416();
-    o.headers = buildUnnamed1417();
+    o.averages = buildUnnamed169();
+    o.headers = buildUnnamed170();
     o.kind = "foo";
-    o.rows = buildUnnamed1419();
+    o.rows = buildUnnamed172();
     o.totalMatchedRows = "foo";
-    o.totals = buildUnnamed1420();
-    o.warnings = buildUnnamed1421();
+    o.totals = buildUnnamed173();
+    o.warnings = buildUnnamed174();
   }
   buildCounterReport--;
   return o;
@@ -610,13 +645,13 @@
 checkReport(api.Report o) {
   buildCounterReport++;
   if (buildCounterReport < 3) {
-    checkUnnamed1416(o.averages);
-    checkUnnamed1417(o.headers);
+    checkUnnamed169(o.averages);
+    checkUnnamed170(o.headers);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1419(o.rows);
+    checkUnnamed172(o.rows);
     unittest.expect(o.totalMatchedRows, unittest.equals('foo'));
-    checkUnnamed1420(o.totals);
-    checkUnnamed1421(o.warnings);
+    checkUnnamed173(o.totals);
+    checkUnnamed174(o.warnings);
   }
   buildCounterReport--;
 }
@@ -644,14 +679,14 @@
   buildCounterUrlChannel--;
 }
 
-buildUnnamed1422() {
+buildUnnamed175() {
   var o = new core.List<api.UrlChannel>();
   o.add(buildUrlChannel());
   o.add(buildUrlChannel());
   return o;
 }
 
-checkUnnamed1422(core.List<api.UrlChannel> o) {
+checkUnnamed175(core.List<api.UrlChannel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlChannel(o[0]);
   checkUrlChannel(o[1]);
@@ -663,7 +698,7 @@
   buildCounterUrlChannels++;
   if (buildCounterUrlChannels < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1422();
+    o.items = buildUnnamed175();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -675,151 +710,151 @@
   buildCounterUrlChannels++;
   if (buildCounterUrlChannels < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1422(o.items);
+    checkUnnamed175(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterUrlChannels--;
 }
 
-buildUnnamed1423() {
+buildUnnamed176() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1423(core.List<core.String> o) {
+checkUnnamed176(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1424() {
+buildUnnamed177() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1424(core.List<core.String> o) {
+checkUnnamed177(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1425() {
+buildUnnamed178() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1425(core.List<core.String> o) {
+checkUnnamed178(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1426() {
+buildUnnamed179() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1426(core.List<core.String> o) {
+checkUnnamed179(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1427() {
+buildUnnamed180() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1427(core.List<core.String> o) {
+checkUnnamed180(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1428() {
+buildUnnamed181() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1428(core.List<core.String> o) {
+checkUnnamed181(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1429() {
+buildUnnamed182() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1429(core.List<core.String> o) {
+checkUnnamed182(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1430() {
+buildUnnamed183() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1430(core.List<core.String> o) {
+checkUnnamed183(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1431() {
+buildUnnamed184() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1431(core.List<core.String> o) {
+checkUnnamed184(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1432() {
+buildUnnamed185() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1432(core.List<core.String> o) {
+checkUnnamed185(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1433() {
+buildUnnamed186() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1433(core.List<core.String> o) {
+checkUnnamed186(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1010,7 +1045,7 @@
   unittest.group("resource-AccountsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.AdsensehostApi(mock).accounts;
       var arg_accountId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1050,7 +1085,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccount());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId).then(unittest.expectAsync(((api.Account response) {
         checkAccount(response);
@@ -1059,9 +1094,9 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.AdsensehostApi(mock).accounts;
-      var arg_filterAdClientId = buildUnnamed1423();
+      var arg_filterAdClientId = buildUnnamed176();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -1097,7 +1132,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccounts());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_filterAdClientId).then(unittest.expectAsync(((api.Accounts response) {
         checkAccounts(response);
@@ -1110,7 +1145,7 @@
   unittest.group("resource-AccountsAdclientsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsAdclientsResourceApi res = new api.AdsensehostApi(mock).accounts.adclients;
       var arg_accountId = "foo";
       var arg_adClientId = "foo";
@@ -1158,7 +1193,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdClient());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_adClientId).then(unittest.expectAsync(((api.AdClient response) {
         checkAdClient(response);
@@ -1167,7 +1202,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsAdclientsResourceApi res = new api.AdsensehostApi(mock).accounts.adclients;
       var arg_accountId = "foo";
       var arg_maxResults = 42;
@@ -1215,7 +1250,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdClients());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.AdClients response) {
         checkAdClients(response);
@@ -1228,7 +1263,7 @@
   unittest.group("resource-AccountsAdunitsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsAdunitsResourceApi res = new api.AdsensehostApi(mock).accounts.adunits;
       var arg_accountId = "foo";
       var arg_adClientId = "foo";
@@ -1284,7 +1319,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdUnit());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_accountId, arg_adClientId, arg_adUnitId).then(unittest.expectAsync(((api.AdUnit response) {
         checkAdUnit(response);
@@ -1293,7 +1328,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsAdunitsResourceApi res = new api.AdsensehostApi(mock).accounts.adunits;
       var arg_accountId = "foo";
       var arg_adClientId = "foo";
@@ -1349,7 +1384,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdUnit());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_adClientId, arg_adUnitId).then(unittest.expectAsync(((api.AdUnit response) {
         checkAdUnit(response);
@@ -1358,12 +1393,12 @@
 
     unittest.test("method--getAdCode", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsAdunitsResourceApi res = new api.AdsensehostApi(mock).accounts.adunits;
       var arg_accountId = "foo";
       var arg_adClientId = "foo";
       var arg_adUnitId = "foo";
-      var arg_hostCustomChannelId = buildUnnamed1424();
+      var arg_hostCustomChannelId = buildUnnamed177();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -1420,7 +1455,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdCode());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.getAdCode(arg_accountId, arg_adClientId, arg_adUnitId, hostCustomChannelId: arg_hostCustomChannelId).then(unittest.expectAsync(((api.AdCode response) {
         checkAdCode(response);
@@ -1429,7 +1464,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsAdunitsResourceApi res = new api.AdsensehostApi(mock).accounts.adunits;
       var arg_request = buildAdUnit();
       var arg_accountId = "foo";
@@ -1485,7 +1520,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdUnit());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_accountId, arg_adClientId).then(unittest.expectAsync(((api.AdUnit response) {
         checkAdUnit(response);
@@ -1494,7 +1529,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsAdunitsResourceApi res = new api.AdsensehostApi(mock).accounts.adunits;
       var arg_accountId = "foo";
       var arg_adClientId = "foo";
@@ -1552,7 +1587,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdUnits());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_adClientId, includeInactive: arg_includeInactive, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.AdUnits response) {
         checkAdUnits(response);
@@ -1561,7 +1596,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsAdunitsResourceApi res = new api.AdsensehostApi(mock).accounts.adunits;
       var arg_request = buildAdUnit();
       var arg_accountId = "foo";
@@ -1619,7 +1654,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdUnit());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_accountId, arg_adClientId, arg_adUnitId).then(unittest.expectAsync(((api.AdUnit response) {
         checkAdUnit(response);
@@ -1628,7 +1663,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsAdunitsResourceApi res = new api.AdsensehostApi(mock).accounts.adunits;
       var arg_request = buildAdUnit();
       var arg_accountId = "foo";
@@ -1684,7 +1719,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdUnit());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_accountId, arg_adClientId).then(unittest.expectAsync(((api.AdUnit response) {
         checkAdUnit(response);
@@ -1697,17 +1732,17 @@
   unittest.group("resource-AccountsReportsResourceApi", () {
     unittest.test("method--generate", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsReportsResourceApi res = new api.AdsensehostApi(mock).accounts.reports;
       var arg_accountId = "foo";
       var arg_startDate = "foo";
       var arg_endDate = "foo";
-      var arg_dimension = buildUnnamed1425();
-      var arg_filter = buildUnnamed1426();
+      var arg_dimension = buildUnnamed178();
+      var arg_filter = buildUnnamed179();
       var arg_locale = "foo";
       var arg_maxResults = 42;
-      var arg_metric = buildUnnamed1427();
-      var arg_sort = buildUnnamed1428();
+      var arg_metric = buildUnnamed180();
+      var arg_sort = buildUnnamed181();
       var arg_startIndex = 42;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1759,7 +1794,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildReport());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.generate(arg_accountId, arg_startDate, arg_endDate, dimension: arg_dimension, filter: arg_filter, locale: arg_locale, maxResults: arg_maxResults, metric: arg_metric, sort: arg_sort, startIndex: arg_startIndex).then(unittest.expectAsync(((api.Report response) {
         checkReport(response);
@@ -1772,7 +1807,7 @@
   unittest.group("resource-AdclientsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdclientsResourceApi res = new api.AdsensehostApi(mock).adclients;
       var arg_adClientId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1812,7 +1847,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdClient());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_adClientId).then(unittest.expectAsync(((api.AdClient response) {
         checkAdClient(response);
@@ -1821,7 +1856,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdclientsResourceApi res = new api.AdsensehostApi(mock).adclients;
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
@@ -1861,7 +1896,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdClients());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.AdClients response) {
         checkAdClients(response);
@@ -1874,9 +1909,9 @@
   unittest.group("resource-AssociationsessionsResourceApi", () {
     unittest.test("method--start", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AssociationsessionsResourceApi res = new api.AdsensehostApi(mock).associationsessions;
-      var arg_productCode = buildUnnamed1429();
+      var arg_productCode = buildUnnamed182();
       var arg_websiteUrl = "foo";
       var arg_userLocale = "foo";
       var arg_websiteLocale = "foo";
@@ -1918,7 +1953,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAssociationSession());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.start(arg_productCode, arg_websiteUrl, userLocale: arg_userLocale, websiteLocale: arg_websiteLocale).then(unittest.expectAsync(((api.AssociationSession response) {
         checkAssociationSession(response);
@@ -1927,7 +1962,7 @@
 
     unittest.test("method--verify", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AssociationsessionsResourceApi res = new api.AdsensehostApi(mock).associationsessions;
       var arg_token = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1965,7 +2000,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAssociationSession());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.verify(arg_token).then(unittest.expectAsync(((api.AssociationSession response) {
         checkAssociationSession(response);
@@ -1978,7 +2013,7 @@
   unittest.group("resource-CustomchannelsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CustomchannelsResourceApi res = new api.AdsensehostApi(mock).customchannels;
       var arg_adClientId = "foo";
       var arg_customChannelId = "foo";
@@ -2026,7 +2061,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomChannel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_adClientId, arg_customChannelId).then(unittest.expectAsync(((api.CustomChannel response) {
         checkCustomChannel(response);
@@ -2035,7 +2070,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CustomchannelsResourceApi res = new api.AdsensehostApi(mock).customchannels;
       var arg_adClientId = "foo";
       var arg_customChannelId = "foo";
@@ -2083,7 +2118,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomChannel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_adClientId, arg_customChannelId).then(unittest.expectAsync(((api.CustomChannel response) {
         checkCustomChannel(response);
@@ -2092,7 +2127,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CustomchannelsResourceApi res = new api.AdsensehostApi(mock).customchannels;
       var arg_request = buildCustomChannel();
       var arg_adClientId = "foo";
@@ -2140,7 +2175,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomChannel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_adClientId).then(unittest.expectAsync(((api.CustomChannel response) {
         checkCustomChannel(response);
@@ -2149,7 +2184,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CustomchannelsResourceApi res = new api.AdsensehostApi(mock).customchannels;
       var arg_adClientId = "foo";
       var arg_maxResults = 42;
@@ -2197,7 +2232,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomChannels());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_adClientId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.CustomChannels response) {
         checkCustomChannels(response);
@@ -2206,7 +2241,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CustomchannelsResourceApi res = new api.AdsensehostApi(mock).customchannels;
       var arg_request = buildCustomChannel();
       var arg_adClientId = "foo";
@@ -2256,7 +2291,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomChannel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_adClientId, arg_customChannelId).then(unittest.expectAsync(((api.CustomChannel response) {
         checkCustomChannel(response);
@@ -2265,7 +2300,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CustomchannelsResourceApi res = new api.AdsensehostApi(mock).customchannels;
       var arg_request = buildCustomChannel();
       var arg_adClientId = "foo";
@@ -2313,7 +2348,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomChannel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_adClientId).then(unittest.expectAsync(((api.CustomChannel response) {
         checkCustomChannel(response);
@@ -2326,16 +2361,16 @@
   unittest.group("resource-ReportsResourceApi", () {
     unittest.test("method--generate", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsResourceApi res = new api.AdsensehostApi(mock).reports;
       var arg_startDate = "foo";
       var arg_endDate = "foo";
-      var arg_dimension = buildUnnamed1430();
-      var arg_filter = buildUnnamed1431();
+      var arg_dimension = buildUnnamed183();
+      var arg_filter = buildUnnamed184();
       var arg_locale = "foo";
       var arg_maxResults = 42;
-      var arg_metric = buildUnnamed1432();
-      var arg_sort = buildUnnamed1433();
+      var arg_metric = buildUnnamed185();
+      var arg_sort = buildUnnamed186();
       var arg_startIndex = 42;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -2380,7 +2415,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildReport());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.generate(arg_startDate, arg_endDate, dimension: arg_dimension, filter: arg_filter, locale: arg_locale, maxResults: arg_maxResults, metric: arg_metric, sort: arg_sort, startIndex: arg_startIndex).then(unittest.expectAsync(((api.Report response) {
         checkReport(response);
@@ -2393,7 +2428,7 @@
   unittest.group("resource-UrlchannelsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UrlchannelsResourceApi res = new api.AdsensehostApi(mock).urlchannels;
       var arg_adClientId = "foo";
       var arg_urlChannelId = "foo";
@@ -2441,7 +2476,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUrlChannel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_adClientId, arg_urlChannelId).then(unittest.expectAsync(((api.UrlChannel response) {
         checkUrlChannel(response);
@@ -2450,7 +2485,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UrlchannelsResourceApi res = new api.AdsensehostApi(mock).urlchannels;
       var arg_request = buildUrlChannel();
       var arg_adClientId = "foo";
@@ -2498,7 +2533,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUrlChannel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_adClientId).then(unittest.expectAsync(((api.UrlChannel response) {
         checkUrlChannel(response);
@@ -2507,7 +2542,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UrlchannelsResourceApi res = new api.AdsensehostApi(mock).urlchannels;
       var arg_adClientId = "foo";
       var arg_maxResults = 42;
@@ -2555,7 +2590,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUrlChannels());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_adClientId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.UrlChannels response) {
         checkUrlChannels(response);
diff --git a/generated/googleapis/test/analytics/v3_test.dart b/generated/googleapis/test/analytics/v3_test.dart
index 849d635..e85546a 100644
--- a/generated/googleapis/test/analytics/v3_test.dart
+++ b/generated/googleapis/test/analytics/v3_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/analytics/v3.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterAccountChildLink = 0;
 buildAccountChildLink() {
@@ -37,14 +72,14 @@
   buildCounterAccountChildLink--;
 }
 
-buildUnnamed893() {
+buildUnnamed187() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed893(core.List<core.String> o) {
+checkUnnamed187(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -55,7 +90,7 @@
   var o = new api.AccountPermissions();
   buildCounterAccountPermissions++;
   if (buildCounterAccountPermissions < 3) {
-    o.effective = buildUnnamed893();
+    o.effective = buildUnnamed187();
   }
   buildCounterAccountPermissions--;
   return o;
@@ -64,7 +99,7 @@
 checkAccountPermissions(api.AccountPermissions o) {
   buildCounterAccountPermissions++;
   if (buildCounterAccountPermissions < 3) {
-    checkUnnamed893(o.effective);
+    checkUnnamed187(o.effective);
   }
   buildCounterAccountPermissions--;
 }
@@ -127,14 +162,14 @@
   buildCounterAccountRef--;
 }
 
-buildUnnamed894() {
+buildUnnamed188() {
   var o = new core.List<api.AccountSummary>();
   o.add(buildAccountSummary());
   o.add(buildAccountSummary());
   return o;
 }
 
-checkUnnamed894(core.List<api.AccountSummary> o) {
+checkUnnamed188(core.List<api.AccountSummary> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountSummary(o[0]);
   checkAccountSummary(o[1]);
@@ -145,7 +180,7 @@
   var o = new api.AccountSummaries();
   buildCounterAccountSummaries++;
   if (buildCounterAccountSummaries < 3) {
-    o.items = buildUnnamed894();
+    o.items = buildUnnamed188();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -161,7 +196,7 @@
 checkAccountSummaries(api.AccountSummaries o) {
   buildCounterAccountSummaries++;
   if (buildCounterAccountSummaries < 3) {
-    checkUnnamed894(o.items);
+    checkUnnamed188(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -173,14 +208,14 @@
   buildCounterAccountSummaries--;
 }
 
-buildUnnamed895() {
+buildUnnamed189() {
   var o = new core.List<api.WebPropertySummary>();
   o.add(buildWebPropertySummary());
   o.add(buildWebPropertySummary());
   return o;
 }
 
-checkUnnamed895(core.List<api.WebPropertySummary> o) {
+checkUnnamed189(core.List<api.WebPropertySummary> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWebPropertySummary(o[0]);
   checkWebPropertySummary(o[1]);
@@ -194,7 +229,7 @@
     o.id = "foo";
     o.kind = "foo";
     o.name = "foo";
-    o.webProperties = buildUnnamed895();
+    o.webProperties = buildUnnamed189();
   }
   buildCounterAccountSummary--;
   return o;
@@ -206,7 +241,7 @@
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed895(o.webProperties);
+    checkUnnamed189(o.webProperties);
   }
   buildCounterAccountSummary--;
 }
@@ -240,14 +275,14 @@
   buildCounterAccountTicket--;
 }
 
-buildUnnamed896() {
+buildUnnamed190() {
   var o = new core.List<api.Account>();
   o.add(buildAccount());
   o.add(buildAccount());
   return o;
 }
 
-checkUnnamed896(core.List<api.Account> o) {
+checkUnnamed190(core.List<api.Account> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccount(o[0]);
   checkAccount(o[1]);
@@ -258,7 +293,7 @@
   var o = new api.Accounts();
   buildCounterAccounts++;
   if (buildCounterAccounts < 3) {
-    o.items = buildUnnamed896();
+    o.items = buildUnnamed190();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -274,7 +309,7 @@
 checkAccounts(api.Accounts o) {
   buildCounterAccounts++;
   if (buildCounterAccounts < 3) {
-    checkUnnamed896(o.items);
+    checkUnnamed190(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -309,14 +344,14 @@
   buildCounterAdWordsAccount--;
 }
 
-buildUnnamed897() {
+buildUnnamed191() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed897(core.List<core.String> o) {
+checkUnnamed191(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -327,7 +362,7 @@
   var o = new api.AnalyticsDataimportDeleteUploadDataRequest();
   buildCounterAnalyticsDataimportDeleteUploadDataRequest++;
   if (buildCounterAnalyticsDataimportDeleteUploadDataRequest < 3) {
-    o.customDataImportUids = buildUnnamed897();
+    o.customDataImportUids = buildUnnamed191();
   }
   buildCounterAnalyticsDataimportDeleteUploadDataRequest--;
   return o;
@@ -336,19 +371,19 @@
 checkAnalyticsDataimportDeleteUploadDataRequest(api.AnalyticsDataimportDeleteUploadDataRequest o) {
   buildCounterAnalyticsDataimportDeleteUploadDataRequest++;
   if (buildCounterAnalyticsDataimportDeleteUploadDataRequest < 3) {
-    checkUnnamed897(o.customDataImportUids);
+    checkUnnamed191(o.customDataImportUids);
   }
   buildCounterAnalyticsDataimportDeleteUploadDataRequest--;
 }
 
-buildUnnamed898() {
+buildUnnamed192() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed898(core.Map<core.String, core.String> o) {
+checkUnnamed192(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -359,7 +394,7 @@
   var o = new api.Column();
   buildCounterColumn++;
   if (buildCounterColumn < 3) {
-    o.attributes = buildUnnamed898();
+    o.attributes = buildUnnamed192();
     o.id = "foo";
     o.kind = "foo";
   }
@@ -370,34 +405,34 @@
 checkColumn(api.Column o) {
   buildCounterColumn++;
   if (buildCounterColumn < 3) {
-    checkUnnamed898(o.attributes);
+    checkUnnamed192(o.attributes);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterColumn--;
 }
 
-buildUnnamed899() {
+buildUnnamed193() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed899(core.List<core.String> o) {
+checkUnnamed193(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed900() {
+buildUnnamed194() {
   var o = new core.List<api.Column>();
   o.add(buildColumn());
   o.add(buildColumn());
   return o;
 }
 
-checkUnnamed900(core.List<api.Column> o) {
+checkUnnamed194(core.List<api.Column> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkColumn(o[0]);
   checkColumn(o[1]);
@@ -408,9 +443,9 @@
   var o = new api.Columns();
   buildCounterColumns++;
   if (buildCounterColumns < 3) {
-    o.attributeNames = buildUnnamed899();
+    o.attributeNames = buildUnnamed193();
     o.etag = "foo";
-    o.items = buildUnnamed900();
+    o.items = buildUnnamed194();
     o.kind = "foo";
     o.totalResults = 42;
   }
@@ -421,9 +456,9 @@
 checkColumns(api.Columns o) {
   buildCounterColumns++;
   if (buildCounterColumns < 3) {
-    checkUnnamed899(o.attributeNames);
+    checkUnnamed193(o.attributeNames);
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed900(o.items);
+    checkUnnamed194(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.totalResults, unittest.equals(42));
   }
@@ -472,14 +507,14 @@
   buildCounterCustomDataSourceParentLink--;
 }
 
-buildUnnamed901() {
+buildUnnamed195() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed901(core.List<core.String> o) {
+checkUnnamed195(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -499,7 +534,7 @@
     o.kind = "foo";
     o.name = "foo";
     o.parentLink = buildCustomDataSourceParentLink();
-    o.profilesLinked = buildUnnamed901();
+    o.profilesLinked = buildUnnamed195();
     o.selfLink = "foo";
     o.type = "foo";
     o.updated = core.DateTime.parse("2002-02-27T14:01:02");
@@ -522,7 +557,7 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     checkCustomDataSourceParentLink(o.parentLink);
-    checkUnnamed901(o.profilesLinked);
+    checkUnnamed195(o.profilesLinked);
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(o.updated, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
@@ -532,14 +567,14 @@
   buildCounterCustomDataSource--;
 }
 
-buildUnnamed902() {
+buildUnnamed196() {
   var o = new core.List<api.CustomDataSource>();
   o.add(buildCustomDataSource());
   o.add(buildCustomDataSource());
   return o;
 }
 
-checkUnnamed902(core.List<api.CustomDataSource> o) {
+checkUnnamed196(core.List<api.CustomDataSource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomDataSource(o[0]);
   checkCustomDataSource(o[1]);
@@ -550,7 +585,7 @@
   var o = new api.CustomDataSources();
   buildCounterCustomDataSources++;
   if (buildCounterCustomDataSources < 3) {
-    o.items = buildUnnamed902();
+    o.items = buildUnnamed196();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -566,7 +601,7 @@
 checkCustomDataSources(api.CustomDataSources o) {
   buildCounterCustomDataSources++;
   if (buildCounterCustomDataSources < 3) {
-    checkUnnamed902(o.items);
+    checkUnnamed196(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -640,14 +675,14 @@
   buildCounterCustomDimension--;
 }
 
-buildUnnamed903() {
+buildUnnamed197() {
   var o = new core.List<api.CustomDimension>();
   o.add(buildCustomDimension());
   o.add(buildCustomDimension());
   return o;
 }
 
-checkUnnamed903(core.List<api.CustomDimension> o) {
+checkUnnamed197(core.List<api.CustomDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomDimension(o[0]);
   checkCustomDimension(o[1]);
@@ -658,7 +693,7 @@
   var o = new api.CustomDimensions();
   buildCounterCustomDimensions++;
   if (buildCounterCustomDimensions < 3) {
-    o.items = buildUnnamed903();
+    o.items = buildUnnamed197();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -674,7 +709,7 @@
 checkCustomDimensions(api.CustomDimensions o) {
   buildCounterCustomDimensions++;
   if (buildCounterCustomDimensions < 3) {
-    checkUnnamed903(o.items);
+    checkUnnamed197(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -754,14 +789,14 @@
   buildCounterCustomMetric--;
 }
 
-buildUnnamed904() {
+buildUnnamed198() {
   var o = new core.List<api.CustomMetric>();
   o.add(buildCustomMetric());
   o.add(buildCustomMetric());
   return o;
 }
 
-checkUnnamed904(core.List<api.CustomMetric> o) {
+checkUnnamed198(core.List<api.CustomMetric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomMetric(o[0]);
   checkCustomMetric(o[1]);
@@ -772,7 +807,7 @@
   var o = new api.CustomMetrics();
   buildCounterCustomMetrics++;
   if (buildCounterCustomMetrics < 3) {
-    o.items = buildUnnamed904();
+    o.items = buildUnnamed198();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -788,7 +823,7 @@
 checkCustomMetrics(api.CustomMetrics o) {
   buildCounterCustomMetrics++;
   if (buildCounterCustomMetrics < 3) {
-    checkUnnamed904(o.items);
+    checkUnnamed198(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -800,185 +835,14 @@
   buildCounterCustomMetrics--;
 }
 
-core.int buildCounterDailyUploadParentLink = 0;
-buildDailyUploadParentLink() {
-  var o = new api.DailyUploadParentLink();
-  buildCounterDailyUploadParentLink++;
-  if (buildCounterDailyUploadParentLink < 3) {
-    o.href = "foo";
-    o.type = "foo";
-  }
-  buildCounterDailyUploadParentLink--;
-  return o;
-}
-
-checkDailyUploadParentLink(api.DailyUploadParentLink o) {
-  buildCounterDailyUploadParentLink++;
-  if (buildCounterDailyUploadParentLink < 3) {
-    unittest.expect(o.href, unittest.equals('foo'));
-    unittest.expect(o.type, unittest.equals('foo'));
-  }
-  buildCounterDailyUploadParentLink--;
-}
-
-core.int buildCounterDailyUploadRecentChanges = 0;
-buildDailyUploadRecentChanges() {
-  var o = new api.DailyUploadRecentChanges();
-  buildCounterDailyUploadRecentChanges++;
-  if (buildCounterDailyUploadRecentChanges < 3) {
-    o.change = "foo";
-    o.time = core.DateTime.parse("2002-02-27T14:01:02");
-  }
-  buildCounterDailyUploadRecentChanges--;
-  return o;
-}
-
-checkDailyUploadRecentChanges(api.DailyUploadRecentChanges o) {
-  buildCounterDailyUploadRecentChanges++;
-  if (buildCounterDailyUploadRecentChanges < 3) {
-    unittest.expect(o.change, unittest.equals('foo'));
-    unittest.expect(o.time, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
-  }
-  buildCounterDailyUploadRecentChanges--;
-}
-
-buildUnnamed905() {
-  var o = new core.List<api.DailyUploadRecentChanges>();
-  o.add(buildDailyUploadRecentChanges());
-  o.add(buildDailyUploadRecentChanges());
-  return o;
-}
-
-checkUnnamed905(core.List<api.DailyUploadRecentChanges> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkDailyUploadRecentChanges(o[0]);
-  checkDailyUploadRecentChanges(o[1]);
-}
-
-core.int buildCounterDailyUpload = 0;
-buildDailyUpload() {
-  var o = new api.DailyUpload();
-  buildCounterDailyUpload++;
-  if (buildCounterDailyUpload < 3) {
-    o.accountId = "foo";
-    o.appendCount = 42;
-    o.createdTime = core.DateTime.parse("2002-02-27T14:01:02");
-    o.customDataSourceId = "foo";
-    o.date = "foo";
-    o.kind = "foo";
-    o.modifiedTime = core.DateTime.parse("2002-02-27T14:01:02");
-    o.parentLink = buildDailyUploadParentLink();
-    o.recentChanges = buildUnnamed905();
-    o.selfLink = "foo";
-    o.webPropertyId = "foo";
-  }
-  buildCounterDailyUpload--;
-  return o;
-}
-
-checkDailyUpload(api.DailyUpload o) {
-  buildCounterDailyUpload++;
-  if (buildCounterDailyUpload < 3) {
-    unittest.expect(o.accountId, unittest.equals('foo'));
-    unittest.expect(o.appendCount, unittest.equals(42));
-    unittest.expect(o.createdTime, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
-    unittest.expect(o.customDataSourceId, unittest.equals('foo'));
-    unittest.expect(o.date, unittest.equals('foo'));
-    unittest.expect(o.kind, unittest.equals('foo'));
-    unittest.expect(o.modifiedTime, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
-    checkDailyUploadParentLink(o.parentLink);
-    checkUnnamed905(o.recentChanges);
-    unittest.expect(o.selfLink, unittest.equals('foo'));
-    unittest.expect(o.webPropertyId, unittest.equals('foo'));
-  }
-  buildCounterDailyUpload--;
-}
-
-core.int buildCounterDailyUploadAppend = 0;
-buildDailyUploadAppend() {
-  var o = new api.DailyUploadAppend();
-  buildCounterDailyUploadAppend++;
-  if (buildCounterDailyUploadAppend < 3) {
-    o.accountId = "foo";
-    o.appendNumber = 42;
-    o.customDataSourceId = "foo";
-    o.date = "foo";
-    o.kind = "foo";
-    o.nextAppendLink = "foo";
-    o.webPropertyId = "foo";
-  }
-  buildCounterDailyUploadAppend--;
-  return o;
-}
-
-checkDailyUploadAppend(api.DailyUploadAppend o) {
-  buildCounterDailyUploadAppend++;
-  if (buildCounterDailyUploadAppend < 3) {
-    unittest.expect(o.accountId, unittest.equals('foo'));
-    unittest.expect(o.appendNumber, unittest.equals(42));
-    unittest.expect(o.customDataSourceId, unittest.equals('foo'));
-    unittest.expect(o.date, unittest.equals('foo'));
-    unittest.expect(o.kind, unittest.equals('foo'));
-    unittest.expect(o.nextAppendLink, unittest.equals('foo'));
-    unittest.expect(o.webPropertyId, unittest.equals('foo'));
-  }
-  buildCounterDailyUploadAppend--;
-}
-
-buildUnnamed906() {
-  var o = new core.List<api.DailyUpload>();
-  o.add(buildDailyUpload());
-  o.add(buildDailyUpload());
-  return o;
-}
-
-checkUnnamed906(core.List<api.DailyUpload> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkDailyUpload(o[0]);
-  checkDailyUpload(o[1]);
-}
-
-core.int buildCounterDailyUploads = 0;
-buildDailyUploads() {
-  var o = new api.DailyUploads();
-  buildCounterDailyUploads++;
-  if (buildCounterDailyUploads < 3) {
-    o.items = buildUnnamed906();
-    o.itemsPerPage = 42;
-    o.kind = "foo";
-    o.nextLink = "foo";
-    o.previousLink = "foo";
-    o.startIndex = 42;
-    o.totalResults = 42;
-    o.username = "foo";
-  }
-  buildCounterDailyUploads--;
-  return o;
-}
-
-checkDailyUploads(api.DailyUploads o) {
-  buildCounterDailyUploads++;
-  if (buildCounterDailyUploads < 3) {
-    checkUnnamed906(o.items);
-    unittest.expect(o.itemsPerPage, unittest.equals(42));
-    unittest.expect(o.kind, unittest.equals('foo'));
-    unittest.expect(o.nextLink, unittest.equals('foo'));
-    unittest.expect(o.previousLink, unittest.equals('foo'));
-    unittest.expect(o.startIndex, unittest.equals(42));
-    unittest.expect(o.totalResults, unittest.equals(42));
-    unittest.expect(o.username, unittest.equals('foo'));
-  }
-  buildCounterDailyUploads--;
-}
-
-buildUnnamed907() {
+buildUnnamed199() {
   var o = new core.List<api.AdWordsAccount>();
   o.add(buildAdWordsAccount());
   o.add(buildAdWordsAccount());
   return o;
 }
 
-checkUnnamed907(core.List<api.AdWordsAccount> o) {
+checkUnnamed199(core.List<api.AdWordsAccount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdWordsAccount(o[0]);
   checkAdWordsAccount(o[1]);
@@ -1003,14 +867,14 @@
   buildCounterEntityAdWordsLinkEntity--;
 }
 
-buildUnnamed908() {
+buildUnnamed200() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed908(core.List<core.String> o) {
+checkUnnamed200(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1021,12 +885,12 @@
   var o = new api.EntityAdWordsLink();
   buildCounterEntityAdWordsLink++;
   if (buildCounterEntityAdWordsLink < 3) {
-    o.adWordsAccounts = buildUnnamed907();
+    o.adWordsAccounts = buildUnnamed199();
     o.entity = buildEntityAdWordsLinkEntity();
     o.id = "foo";
     o.kind = "foo";
     o.name = "foo";
-    o.profileIds = buildUnnamed908();
+    o.profileIds = buildUnnamed200();
     o.selfLink = "foo";
   }
   buildCounterEntityAdWordsLink--;
@@ -1036,25 +900,25 @@
 checkEntityAdWordsLink(api.EntityAdWordsLink o) {
   buildCounterEntityAdWordsLink++;
   if (buildCounterEntityAdWordsLink < 3) {
-    checkUnnamed907(o.adWordsAccounts);
+    checkUnnamed199(o.adWordsAccounts);
     checkEntityAdWordsLinkEntity(o.entity);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed908(o.profileIds);
+    checkUnnamed200(o.profileIds);
     unittest.expect(o.selfLink, unittest.equals('foo'));
   }
   buildCounterEntityAdWordsLink--;
 }
 
-buildUnnamed909() {
+buildUnnamed201() {
   var o = new core.List<api.EntityAdWordsLink>();
   o.add(buildEntityAdWordsLink());
   o.add(buildEntityAdWordsLink());
   return o;
 }
 
-checkUnnamed909(core.List<api.EntityAdWordsLink> o) {
+checkUnnamed201(core.List<api.EntityAdWordsLink> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntityAdWordsLink(o[0]);
   checkEntityAdWordsLink(o[1]);
@@ -1065,7 +929,7 @@
   var o = new api.EntityAdWordsLinks();
   buildCounterEntityAdWordsLinks++;
   if (buildCounterEntityAdWordsLinks < 3) {
-    o.items = buildUnnamed909();
+    o.items = buildUnnamed201();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -1080,7 +944,7 @@
 checkEntityAdWordsLinks(api.EntityAdWordsLinks o) {
   buildCounterEntityAdWordsLinks++;
   if (buildCounterEntityAdWordsLinks < 3) {
-    checkUnnamed909(o.items);
+    checkUnnamed201(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -1114,27 +978,27 @@
   buildCounterEntityUserLinkEntity--;
 }
 
-buildUnnamed910() {
+buildUnnamed202() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed910(core.List<core.String> o) {
+checkUnnamed202(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed911() {
+buildUnnamed203() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed911(core.List<core.String> o) {
+checkUnnamed203(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1145,8 +1009,8 @@
   var o = new api.EntityUserLinkPermissions();
   buildCounterEntityUserLinkPermissions++;
   if (buildCounterEntityUserLinkPermissions < 3) {
-    o.effective = buildUnnamed910();
-    o.local = buildUnnamed911();
+    o.effective = buildUnnamed202();
+    o.local = buildUnnamed203();
   }
   buildCounterEntityUserLinkPermissions--;
   return o;
@@ -1155,8 +1019,8 @@
 checkEntityUserLinkPermissions(api.EntityUserLinkPermissions o) {
   buildCounterEntityUserLinkPermissions++;
   if (buildCounterEntityUserLinkPermissions < 3) {
-    checkUnnamed910(o.effective);
-    checkUnnamed911(o.local);
+    checkUnnamed202(o.effective);
+    checkUnnamed203(o.local);
   }
   buildCounterEntityUserLinkPermissions--;
 }
@@ -1190,14 +1054,14 @@
   buildCounterEntityUserLink--;
 }
 
-buildUnnamed912() {
+buildUnnamed204() {
   var o = new core.List<api.EntityUserLink>();
   o.add(buildEntityUserLink());
   o.add(buildEntityUserLink());
   return o;
 }
 
-checkUnnamed912(core.List<api.EntityUserLink> o) {
+checkUnnamed204(core.List<api.EntityUserLink> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntityUserLink(o[0]);
   checkEntityUserLink(o[1]);
@@ -1208,7 +1072,7 @@
   var o = new api.EntityUserLinks();
   buildCounterEntityUserLinks++;
   if (buildCounterEntityUserLinks < 3) {
-    o.items = buildUnnamed912();
+    o.items = buildUnnamed204();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -1223,7 +1087,7 @@
 checkEntityUserLinks(api.EntityUserLinks o) {
   buildCounterEntityUserLinks++;
   if (buildCounterEntityUserLinks < 3) {
-    checkUnnamed912(o.items);
+    checkUnnamed204(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -1282,14 +1146,14 @@
   buildCounterExperimentVariations--;
 }
 
-buildUnnamed913() {
+buildUnnamed205() {
   var o = new core.List<api.ExperimentVariations>();
   o.add(buildExperimentVariations());
   o.add(buildExperimentVariations());
   return o;
 }
 
-checkUnnamed913(core.List<api.ExperimentVariations> o) {
+checkUnnamed205(core.List<api.ExperimentVariations> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkExperimentVariations(o[0]);
   checkExperimentVariations(o[1]);
@@ -1324,7 +1188,7 @@
     o.status = "foo";
     o.trafficCoverage = 42.0;
     o.updated = core.DateTime.parse("2002-02-27T14:01:02");
-    o.variations = buildUnnamed913();
+    o.variations = buildUnnamed205();
     o.webPropertyId = "foo";
     o.winnerConfidenceLevel = 42.0;
     o.winnerFound = true;
@@ -1360,7 +1224,7 @@
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.trafficCoverage, unittest.equals(42.0));
     unittest.expect(o.updated, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
-    checkUnnamed913(o.variations);
+    checkUnnamed205(o.variations);
     unittest.expect(o.webPropertyId, unittest.equals('foo'));
     unittest.expect(o.winnerConfidenceLevel, unittest.equals(42.0));
     unittest.expect(o.winnerFound, unittest.isTrue);
@@ -1368,14 +1232,14 @@
   buildCounterExperiment--;
 }
 
-buildUnnamed914() {
+buildUnnamed206() {
   var o = new core.List<api.Experiment>();
   o.add(buildExperiment());
   o.add(buildExperiment());
   return o;
 }
 
-checkUnnamed914(core.List<api.Experiment> o) {
+checkUnnamed206(core.List<api.Experiment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkExperiment(o[0]);
   checkExperiment(o[1]);
@@ -1386,7 +1250,7 @@
   var o = new api.Experiments();
   buildCounterExperiments++;
   if (buildCounterExperiments < 3) {
-    o.items = buildUnnamed914();
+    o.items = buildUnnamed206();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -1402,7 +1266,7 @@
 checkExperiments(api.Experiments o) {
   buildCounterExperiments++;
   if (buildCounterExperiments < 3) {
-    checkUnnamed914(o.items);
+    checkUnnamed206(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -1636,14 +1500,14 @@
   buildCounterFilterRef--;
 }
 
-buildUnnamed915() {
+buildUnnamed207() {
   var o = new core.List<api.Filter>();
   o.add(buildFilter());
   o.add(buildFilter());
   return o;
 }
 
-checkUnnamed915(core.List<api.Filter> o) {
+checkUnnamed207(core.List<api.Filter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFilter(o[0]);
   checkFilter(o[1]);
@@ -1654,7 +1518,7 @@
   var o = new api.Filters();
   buildCounterFilters++;
   if (buildCounterFilters < 3) {
-    o.items = buildUnnamed915();
+    o.items = buildUnnamed207();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -1670,7 +1534,7 @@
 checkFilters(api.Filters o) {
   buildCounterFilters++;
   if (buildCounterFilters < 3) {
-    checkUnnamed915(o.items);
+    checkUnnamed207(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -1705,14 +1569,14 @@
   buildCounterGaDataColumnHeaders--;
 }
 
-buildUnnamed916() {
+buildUnnamed208() {
   var o = new core.List<api.GaDataColumnHeaders>();
   o.add(buildGaDataColumnHeaders());
   o.add(buildGaDataColumnHeaders());
   return o;
 }
 
-checkUnnamed916(core.List<api.GaDataColumnHeaders> o) {
+checkUnnamed208(core.List<api.GaDataColumnHeaders> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGaDataColumnHeaders(o[0]);
   checkGaDataColumnHeaders(o[1]);
@@ -1741,14 +1605,14 @@
   buildCounterGaDataDataTableCols--;
 }
 
-buildUnnamed917() {
+buildUnnamed209() {
   var o = new core.List<api.GaDataDataTableCols>();
   o.add(buildGaDataDataTableCols());
   o.add(buildGaDataDataTableCols());
   return o;
 }
 
-checkUnnamed917(core.List<api.GaDataDataTableCols> o) {
+checkUnnamed209(core.List<api.GaDataDataTableCols> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGaDataDataTableCols(o[0]);
   checkGaDataDataTableCols(o[1]);
@@ -1773,14 +1637,14 @@
   buildCounterGaDataDataTableRowsC--;
 }
 
-buildUnnamed918() {
+buildUnnamed210() {
   var o = new core.List<api.GaDataDataTableRowsC>();
   o.add(buildGaDataDataTableRowsC());
   o.add(buildGaDataDataTableRowsC());
   return o;
 }
 
-checkUnnamed918(core.List<api.GaDataDataTableRowsC> o) {
+checkUnnamed210(core.List<api.GaDataDataTableRowsC> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGaDataDataTableRowsC(o[0]);
   checkGaDataDataTableRowsC(o[1]);
@@ -1791,7 +1655,7 @@
   var o = new api.GaDataDataTableRows();
   buildCounterGaDataDataTableRows++;
   if (buildCounterGaDataDataTableRows < 3) {
-    o.c = buildUnnamed918();
+    o.c = buildUnnamed210();
   }
   buildCounterGaDataDataTableRows--;
   return o;
@@ -1800,19 +1664,19 @@
 checkGaDataDataTableRows(api.GaDataDataTableRows o) {
   buildCounterGaDataDataTableRows++;
   if (buildCounterGaDataDataTableRows < 3) {
-    checkUnnamed918(o.c);
+    checkUnnamed210(o.c);
   }
   buildCounterGaDataDataTableRows--;
 }
 
-buildUnnamed919() {
+buildUnnamed211() {
   var o = new core.List<api.GaDataDataTableRows>();
   o.add(buildGaDataDataTableRows());
   o.add(buildGaDataDataTableRows());
   return o;
 }
 
-checkUnnamed919(core.List<api.GaDataDataTableRows> o) {
+checkUnnamed211(core.List<api.GaDataDataTableRows> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGaDataDataTableRows(o[0]);
   checkGaDataDataTableRows(o[1]);
@@ -1823,8 +1687,8 @@
   var o = new api.GaDataDataTable();
   buildCounterGaDataDataTable++;
   if (buildCounterGaDataDataTable < 3) {
-    o.cols = buildUnnamed917();
-    o.rows = buildUnnamed919();
+    o.cols = buildUnnamed209();
+    o.rows = buildUnnamed211();
   }
   buildCounterGaDataDataTable--;
   return o;
@@ -1833,8 +1697,8 @@
 checkGaDataDataTable(api.GaDataDataTable o) {
   buildCounterGaDataDataTable++;
   if (buildCounterGaDataDataTable < 3) {
-    checkUnnamed917(o.cols);
-    checkUnnamed919(o.rows);
+    checkUnnamed209(o.cols);
+    checkUnnamed211(o.rows);
   }
   buildCounterGaDataDataTable--;
 }
@@ -1868,27 +1732,27 @@
   buildCounterGaDataProfileInfo--;
 }
 
-buildUnnamed920() {
+buildUnnamed212() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed920(core.List<core.String> o) {
+checkUnnamed212(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed921() {
+buildUnnamed213() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed921(core.List<core.String> o) {
+checkUnnamed213(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1904,10 +1768,10 @@
     o.filters = "foo";
     o.ids = "foo";
     o.max_results = 42;
-    o.metrics = buildUnnamed920();
+    o.metrics = buildUnnamed212();
     o.samplingLevel = "foo";
     o.segment = "foo";
-    o.sort = buildUnnamed921();
+    o.sort = buildUnnamed213();
     o.start_date = "foo";
     o.start_index = 42;
   }
@@ -1923,50 +1787,50 @@
     unittest.expect(o.filters, unittest.equals('foo'));
     unittest.expect(o.ids, unittest.equals('foo'));
     unittest.expect(o.max_results, unittest.equals(42));
-    checkUnnamed920(o.metrics);
+    checkUnnamed212(o.metrics);
     unittest.expect(o.samplingLevel, unittest.equals('foo'));
     unittest.expect(o.segment, unittest.equals('foo'));
-    checkUnnamed921(o.sort);
+    checkUnnamed213(o.sort);
     unittest.expect(o.start_date, unittest.equals('foo'));
     unittest.expect(o.start_index, unittest.equals(42));
   }
   buildCounterGaDataQuery--;
 }
 
-buildUnnamed922() {
+buildUnnamed214() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed922(core.List<core.String> o) {
+checkUnnamed214(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed923() {
+buildUnnamed215() {
   var o = new core.List<core.List<core.String>>();
-  o.add(buildUnnamed922());
-  o.add(buildUnnamed922());
+  o.add(buildUnnamed214());
+  o.add(buildUnnamed214());
   return o;
 }
 
-checkUnnamed923(core.List<core.List<core.String>> o) {
+checkUnnamed215(core.List<core.List<core.String>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed922(o[0]);
-  checkUnnamed922(o[1]);
+  checkUnnamed214(o[0]);
+  checkUnnamed214(o[1]);
 }
 
-buildUnnamed924() {
+buildUnnamed216() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed924(core.Map<core.String, core.String> o) {
+checkUnnamed216(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1977,7 +1841,7 @@
   var o = new api.GaData();
   buildCounterGaData++;
   if (buildCounterGaData < 3) {
-    o.columnHeaders = buildUnnamed916();
+    o.columnHeaders = buildUnnamed208();
     o.containsSampledData = true;
     o.dataTable = buildGaDataDataTable();
     o.id = "foo";
@@ -1987,12 +1851,12 @@
     o.previousLink = "foo";
     o.profileInfo = buildGaDataProfileInfo();
     o.query = buildGaDataQuery();
-    o.rows = buildUnnamed923();
+    o.rows = buildUnnamed215();
     o.sampleSize = "foo";
     o.sampleSpace = "foo";
     o.selfLink = "foo";
     o.totalResults = 42;
-    o.totalsForAllResults = buildUnnamed924();
+    o.totalsForAllResults = buildUnnamed216();
   }
   buildCounterGaData--;
   return o;
@@ -2001,7 +1865,7 @@
 checkGaData(api.GaData o) {
   buildCounterGaData++;
   if (buildCounterGaData < 3) {
-    checkUnnamed916(o.columnHeaders);
+    checkUnnamed208(o.columnHeaders);
     unittest.expect(o.containsSampledData, unittest.isTrue);
     checkGaDataDataTable(o.dataTable);
     unittest.expect(o.id, unittest.equals('foo'));
@@ -2011,12 +1875,12 @@
     unittest.expect(o.previousLink, unittest.equals('foo'));
     checkGaDataProfileInfo(o.profileInfo);
     checkGaDataQuery(o.query);
-    checkUnnamed923(o.rows);
+    checkUnnamed215(o.rows);
     unittest.expect(o.sampleSize, unittest.equals('foo'));
     unittest.expect(o.sampleSpace, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.totalResults, unittest.equals(42));
-    checkUnnamed924(o.totalsForAllResults);
+    checkUnnamed216(o.totalsForAllResults);
   }
   buildCounterGaData--;
 }
@@ -2048,14 +1912,14 @@
   buildCounterGoalEventDetailsEventConditions--;
 }
 
-buildUnnamed925() {
+buildUnnamed217() {
   var o = new core.List<api.GoalEventDetailsEventConditions>();
   o.add(buildGoalEventDetailsEventConditions());
   o.add(buildGoalEventDetailsEventConditions());
   return o;
 }
 
-checkUnnamed925(core.List<api.GoalEventDetailsEventConditions> o) {
+checkUnnamed217(core.List<api.GoalEventDetailsEventConditions> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoalEventDetailsEventConditions(o[0]);
   checkGoalEventDetailsEventConditions(o[1]);
@@ -2066,7 +1930,7 @@
   var o = new api.GoalEventDetails();
   buildCounterGoalEventDetails++;
   if (buildCounterGoalEventDetails < 3) {
-    o.eventConditions = buildUnnamed925();
+    o.eventConditions = buildUnnamed217();
     o.useEventValue = true;
   }
   buildCounterGoalEventDetails--;
@@ -2076,7 +1940,7 @@
 checkGoalEventDetails(api.GoalEventDetails o) {
   buildCounterGoalEventDetails++;
   if (buildCounterGoalEventDetails < 3) {
-    checkUnnamed925(o.eventConditions);
+    checkUnnamed217(o.eventConditions);
     unittest.expect(o.useEventValue, unittest.isTrue);
   }
   buildCounterGoalEventDetails--;
@@ -2126,14 +1990,14 @@
   buildCounterGoalUrlDestinationDetailsSteps--;
 }
 
-buildUnnamed926() {
+buildUnnamed218() {
   var o = new core.List<api.GoalUrlDestinationDetailsSteps>();
   o.add(buildGoalUrlDestinationDetailsSteps());
   o.add(buildGoalUrlDestinationDetailsSteps());
   return o;
 }
 
-checkUnnamed926(core.List<api.GoalUrlDestinationDetailsSteps> o) {
+checkUnnamed218(core.List<api.GoalUrlDestinationDetailsSteps> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoalUrlDestinationDetailsSteps(o[0]);
   checkGoalUrlDestinationDetailsSteps(o[1]);
@@ -2147,7 +2011,7 @@
     o.caseSensitive = true;
     o.firstStepRequired = true;
     o.matchType = "foo";
-    o.steps = buildUnnamed926();
+    o.steps = buildUnnamed218();
     o.url = "foo";
   }
   buildCounterGoalUrlDestinationDetails--;
@@ -2160,7 +2024,7 @@
     unittest.expect(o.caseSensitive, unittest.isTrue);
     unittest.expect(o.firstStepRequired, unittest.isTrue);
     unittest.expect(o.matchType, unittest.equals('foo'));
-    checkUnnamed926(o.steps);
+    checkUnnamed218(o.steps);
     unittest.expect(o.url, unittest.equals('foo'));
   }
   buildCounterGoalUrlDestinationDetails--;
@@ -2261,14 +2125,14 @@
   buildCounterGoal--;
 }
 
-buildUnnamed927() {
+buildUnnamed219() {
   var o = new core.List<api.Goal>();
   o.add(buildGoal());
   o.add(buildGoal());
   return o;
 }
 
-checkUnnamed927(core.List<api.Goal> o) {
+checkUnnamed219(core.List<api.Goal> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoal(o[0]);
   checkGoal(o[1]);
@@ -2279,7 +2143,7 @@
   var o = new api.Goals();
   buildCounterGoals++;
   if (buildCounterGoals < 3) {
-    o.items = buildUnnamed927();
+    o.items = buildUnnamed219();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -2295,7 +2159,7 @@
 checkGoals(api.Goals o) {
   buildCounterGoals++;
   if (buildCounterGoals < 3) {
-    checkUnnamed927(o.items);
+    checkUnnamed219(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -2330,14 +2194,14 @@
   buildCounterMcfDataColumnHeaders--;
 }
 
-buildUnnamed928() {
+buildUnnamed220() {
   var o = new core.List<api.McfDataColumnHeaders>();
   o.add(buildMcfDataColumnHeaders());
   o.add(buildMcfDataColumnHeaders());
   return o;
 }
 
-checkUnnamed928(core.List<api.McfDataColumnHeaders> o) {
+checkUnnamed220(core.List<api.McfDataColumnHeaders> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMcfDataColumnHeaders(o[0]);
   checkMcfDataColumnHeaders(o[1]);
@@ -2372,27 +2236,27 @@
   buildCounterMcfDataProfileInfo--;
 }
 
-buildUnnamed929() {
+buildUnnamed221() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed929(core.List<core.String> o) {
+checkUnnamed221(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed930() {
+buildUnnamed222() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed930(core.List<core.String> o) {
+checkUnnamed222(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2408,10 +2272,10 @@
     o.filters = "foo";
     o.ids = "foo";
     o.max_results = 42;
-    o.metrics = buildUnnamed929();
+    o.metrics = buildUnnamed221();
     o.samplingLevel = "foo";
     o.segment = "foo";
-    o.sort = buildUnnamed930();
+    o.sort = buildUnnamed222();
     o.start_date = "foo";
     o.start_index = 42;
   }
@@ -2427,10 +2291,10 @@
     unittest.expect(o.filters, unittest.equals('foo'));
     unittest.expect(o.ids, unittest.equals('foo'));
     unittest.expect(o.max_results, unittest.equals(42));
-    checkUnnamed929(o.metrics);
+    checkUnnamed221(o.metrics);
     unittest.expect(o.samplingLevel, unittest.equals('foo'));
     unittest.expect(o.segment, unittest.equals('foo'));
-    checkUnnamed930(o.sort);
+    checkUnnamed222(o.sort);
     unittest.expect(o.start_date, unittest.equals('foo'));
     unittest.expect(o.start_index, unittest.equals(42));
   }
@@ -2458,14 +2322,14 @@
   buildCounterMcfDataRowsConversionPathValue--;
 }
 
-buildUnnamed931() {
+buildUnnamed223() {
   var o = new core.List<api.McfDataRowsConversionPathValue>();
   o.add(buildMcfDataRowsConversionPathValue());
   o.add(buildMcfDataRowsConversionPathValue());
   return o;
 }
 
-checkUnnamed931(core.List<api.McfDataRowsConversionPathValue> o) {
+checkUnnamed223(core.List<api.McfDataRowsConversionPathValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMcfDataRowsConversionPathValue(o[0]);
   checkMcfDataRowsConversionPathValue(o[1]);
@@ -2476,7 +2340,7 @@
   var o = new api.McfDataRows();
   buildCounterMcfDataRows++;
   if (buildCounterMcfDataRows < 3) {
-    o.conversionPathValue = buildUnnamed931();
+    o.conversionPathValue = buildUnnamed223();
     o.primitiveValue = "foo";
   }
   buildCounterMcfDataRows--;
@@ -2486,46 +2350,46 @@
 checkMcfDataRows(api.McfDataRows o) {
   buildCounterMcfDataRows++;
   if (buildCounterMcfDataRows < 3) {
-    checkUnnamed931(o.conversionPathValue);
+    checkUnnamed223(o.conversionPathValue);
     unittest.expect(o.primitiveValue, unittest.equals('foo'));
   }
   buildCounterMcfDataRows--;
 }
 
-buildUnnamed932() {
+buildUnnamed224() {
   var o = new core.List<api.McfDataRows>();
   o.add(buildMcfDataRows());
   o.add(buildMcfDataRows());
   return o;
 }
 
-checkUnnamed932(core.List<api.McfDataRows> o) {
+checkUnnamed224(core.List<api.McfDataRows> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMcfDataRows(o[0]);
   checkMcfDataRows(o[1]);
 }
 
-buildUnnamed933() {
+buildUnnamed225() {
   var o = new core.List<core.List<api.McfDataRows>>();
-  o.add(buildUnnamed932());
-  o.add(buildUnnamed932());
+  o.add(buildUnnamed224());
+  o.add(buildUnnamed224());
   return o;
 }
 
-checkUnnamed933(core.List<core.List<api.McfDataRows>> o) {
+checkUnnamed225(core.List<core.List<api.McfDataRows>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed932(o[0]);
-  checkUnnamed932(o[1]);
+  checkUnnamed224(o[0]);
+  checkUnnamed224(o[1]);
 }
 
-buildUnnamed934() {
+buildUnnamed226() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed934(core.Map<core.String, core.String> o) {
+checkUnnamed226(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -2536,7 +2400,7 @@
   var o = new api.McfData();
   buildCounterMcfData++;
   if (buildCounterMcfData < 3) {
-    o.columnHeaders = buildUnnamed928();
+    o.columnHeaders = buildUnnamed220();
     o.containsSampledData = true;
     o.id = "foo";
     o.itemsPerPage = 42;
@@ -2545,12 +2409,12 @@
     o.previousLink = "foo";
     o.profileInfo = buildMcfDataProfileInfo();
     o.query = buildMcfDataQuery();
-    o.rows = buildUnnamed933();
+    o.rows = buildUnnamed225();
     o.sampleSize = "foo";
     o.sampleSpace = "foo";
     o.selfLink = "foo";
     o.totalResults = 42;
-    o.totalsForAllResults = buildUnnamed934();
+    o.totalsForAllResults = buildUnnamed226();
   }
   buildCounterMcfData--;
   return o;
@@ -2559,7 +2423,7 @@
 checkMcfData(api.McfData o) {
   buildCounterMcfData++;
   if (buildCounterMcfData < 3) {
-    checkUnnamed928(o.columnHeaders);
+    checkUnnamed220(o.columnHeaders);
     unittest.expect(o.containsSampledData, unittest.isTrue);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.itemsPerPage, unittest.equals(42));
@@ -2568,12 +2432,12 @@
     unittest.expect(o.previousLink, unittest.equals('foo'));
     checkMcfDataProfileInfo(o.profileInfo);
     checkMcfDataQuery(o.query);
-    checkUnnamed933(o.rows);
+    checkUnnamed225(o.rows);
     unittest.expect(o.sampleSize, unittest.equals('foo'));
     unittest.expect(o.sampleSpace, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.totalResults, unittest.equals(42));
-    checkUnnamed934(o.totalsForAllResults);
+    checkUnnamed226(o.totalsForAllResults);
   }
   buildCounterMcfData--;
 }
@@ -2620,14 +2484,14 @@
   buildCounterProfileParentLink--;
 }
 
-buildUnnamed935() {
+buildUnnamed227() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed935(core.List<core.String> o) {
+checkUnnamed227(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2638,7 +2502,7 @@
   var o = new api.ProfilePermissions();
   buildCounterProfilePermissions++;
   if (buildCounterProfilePermissions < 3) {
-    o.effective = buildUnnamed935();
+    o.effective = buildUnnamed227();
   }
   buildCounterProfilePermissions--;
   return o;
@@ -2647,7 +2511,7 @@
 checkProfilePermissions(api.ProfilePermissions o) {
   buildCounterProfilePermissions++;
   if (buildCounterProfilePermissions < 3) {
-    checkUnnamed935(o.effective);
+    checkUnnamed227(o.effective);
   }
   buildCounterProfilePermissions--;
 }
@@ -2746,14 +2610,14 @@
   buildCounterProfileFilterLink--;
 }
 
-buildUnnamed936() {
+buildUnnamed228() {
   var o = new core.List<api.ProfileFilterLink>();
   o.add(buildProfileFilterLink());
   o.add(buildProfileFilterLink());
   return o;
 }
 
-checkUnnamed936(core.List<api.ProfileFilterLink> o) {
+checkUnnamed228(core.List<api.ProfileFilterLink> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProfileFilterLink(o[0]);
   checkProfileFilterLink(o[1]);
@@ -2764,7 +2628,7 @@
   var o = new api.ProfileFilterLinks();
   buildCounterProfileFilterLinks++;
   if (buildCounterProfileFilterLinks < 3) {
-    o.items = buildUnnamed936();
+    o.items = buildUnnamed228();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -2780,7 +2644,7 @@
 checkProfileFilterLinks(api.ProfileFilterLinks o) {
   buildCounterProfileFilterLinks++;
   if (buildCounterProfileFilterLinks < 3) {
-    checkUnnamed936(o.items);
+    checkUnnamed228(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -2848,14 +2712,14 @@
   buildCounterProfileSummary--;
 }
 
-buildUnnamed937() {
+buildUnnamed229() {
   var o = new core.List<api.Profile>();
   o.add(buildProfile());
   o.add(buildProfile());
   return o;
 }
 
-checkUnnamed937(core.List<api.Profile> o) {
+checkUnnamed229(core.List<api.Profile> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProfile(o[0]);
   checkProfile(o[1]);
@@ -2866,7 +2730,7 @@
   var o = new api.Profiles();
   buildCounterProfiles++;
   if (buildCounterProfiles < 3) {
-    o.items = buildUnnamed937();
+    o.items = buildUnnamed229();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -2882,7 +2746,7 @@
 checkProfiles(api.Profiles o) {
   buildCounterProfiles++;
   if (buildCounterProfiles < 3) {
-    checkUnnamed937(o.items);
+    checkUnnamed229(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -2917,14 +2781,14 @@
   buildCounterRealtimeDataColumnHeaders--;
 }
 
-buildUnnamed938() {
+buildUnnamed230() {
   var o = new core.List<api.RealtimeDataColumnHeaders>();
   o.add(buildRealtimeDataColumnHeaders());
   o.add(buildRealtimeDataColumnHeaders());
   return o;
 }
 
-checkUnnamed938(core.List<api.RealtimeDataColumnHeaders> o) {
+checkUnnamed230(core.List<api.RealtimeDataColumnHeaders> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRealtimeDataColumnHeaders(o[0]);
   checkRealtimeDataColumnHeaders(o[1]);
@@ -2959,27 +2823,27 @@
   buildCounterRealtimeDataProfileInfo--;
 }
 
-buildUnnamed939() {
+buildUnnamed231() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed939(core.List<core.String> o) {
+checkUnnamed231(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed940() {
+buildUnnamed232() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed940(core.List<core.String> o) {
+checkUnnamed232(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2994,8 +2858,8 @@
     o.filters = "foo";
     o.ids = "foo";
     o.max_results = 42;
-    o.metrics = buildUnnamed939();
-    o.sort = buildUnnamed940();
+    o.metrics = buildUnnamed231();
+    o.sort = buildUnnamed232();
   }
   buildCounterRealtimeDataQuery--;
   return o;
@@ -3008,46 +2872,46 @@
     unittest.expect(o.filters, unittest.equals('foo'));
     unittest.expect(o.ids, unittest.equals('foo'));
     unittest.expect(o.max_results, unittest.equals(42));
-    checkUnnamed939(o.metrics);
-    checkUnnamed940(o.sort);
+    checkUnnamed231(o.metrics);
+    checkUnnamed232(o.sort);
   }
   buildCounterRealtimeDataQuery--;
 }
 
-buildUnnamed941() {
+buildUnnamed233() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed941(core.List<core.String> o) {
+checkUnnamed233(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed942() {
+buildUnnamed234() {
   var o = new core.List<core.List<core.String>>();
-  o.add(buildUnnamed941());
-  o.add(buildUnnamed941());
+  o.add(buildUnnamed233());
+  o.add(buildUnnamed233());
   return o;
 }
 
-checkUnnamed942(core.List<core.List<core.String>> o) {
+checkUnnamed234(core.List<core.List<core.String>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed941(o[0]);
-  checkUnnamed941(o[1]);
+  checkUnnamed233(o[0]);
+  checkUnnamed233(o[1]);
 }
 
-buildUnnamed943() {
+buildUnnamed235() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed943(core.Map<core.String, core.String> o) {
+checkUnnamed235(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -3058,15 +2922,15 @@
   var o = new api.RealtimeData();
   buildCounterRealtimeData++;
   if (buildCounterRealtimeData < 3) {
-    o.columnHeaders = buildUnnamed938();
+    o.columnHeaders = buildUnnamed230();
     o.id = "foo";
     o.kind = "foo";
     o.profileInfo = buildRealtimeDataProfileInfo();
     o.query = buildRealtimeDataQuery();
-    o.rows = buildUnnamed942();
+    o.rows = buildUnnamed234();
     o.selfLink = "foo";
     o.totalResults = 42;
-    o.totalsForAllResults = buildUnnamed943();
+    o.totalsForAllResults = buildUnnamed235();
   }
   buildCounterRealtimeData--;
   return o;
@@ -3075,15 +2939,15 @@
 checkRealtimeData(api.RealtimeData o) {
   buildCounterRealtimeData++;
   if (buildCounterRealtimeData < 3) {
-    checkUnnamed938(o.columnHeaders);
+    checkUnnamed230(o.columnHeaders);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     checkRealtimeDataProfileInfo(o.profileInfo);
     checkRealtimeDataQuery(o.query);
-    checkUnnamed942(o.rows);
+    checkUnnamed234(o.rows);
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.totalResults, unittest.equals(42));
-    checkUnnamed943(o.totalsForAllResults);
+    checkUnnamed235(o.totalsForAllResults);
   }
   buildCounterRealtimeData--;
 }
@@ -3123,14 +2987,14 @@
   buildCounterSegment--;
 }
 
-buildUnnamed944() {
+buildUnnamed236() {
   var o = new core.List<api.Segment>();
   o.add(buildSegment());
   o.add(buildSegment());
   return o;
 }
 
-checkUnnamed944(core.List<api.Segment> o) {
+checkUnnamed236(core.List<api.Segment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSegment(o[0]);
   checkSegment(o[1]);
@@ -3141,7 +3005,7 @@
   var o = new api.Segments();
   buildCounterSegments++;
   if (buildCounterSegments < 3) {
-    o.items = buildUnnamed944();
+    o.items = buildUnnamed236();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -3157,7 +3021,7 @@
 checkSegments(api.Segments o) {
   buildCounterSegments++;
   if (buildCounterSegments < 3) {
-    checkUnnamed944(o.items);
+    checkUnnamed236(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -3264,14 +3128,14 @@
   buildCounterUnsampledReport--;
 }
 
-buildUnnamed945() {
+buildUnnamed237() {
   var o = new core.List<api.UnsampledReport>();
   o.add(buildUnsampledReport());
   o.add(buildUnsampledReport());
   return o;
 }
 
-checkUnnamed945(core.List<api.UnsampledReport> o) {
+checkUnnamed237(core.List<api.UnsampledReport> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUnsampledReport(o[0]);
   checkUnsampledReport(o[1]);
@@ -3282,7 +3146,7 @@
   var o = new api.UnsampledReports();
   buildCounterUnsampledReports++;
   if (buildCounterUnsampledReports < 3) {
-    o.items = buildUnnamed945();
+    o.items = buildUnnamed237();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -3298,7 +3162,7 @@
 checkUnsampledReports(api.UnsampledReports o) {
   buildCounterUnsampledReports++;
   if (buildCounterUnsampledReports < 3) {
-    checkUnnamed945(o.items);
+    checkUnnamed237(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -3310,14 +3174,14 @@
   buildCounterUnsampledReports--;
 }
 
-buildUnnamed946() {
+buildUnnamed238() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed946(core.List<core.String> o) {
+checkUnnamed238(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3330,7 +3194,7 @@
   if (buildCounterUpload < 3) {
     o.accountId = "foo";
     o.customDataSourceId = "foo";
-    o.errors = buildUnnamed946();
+    o.errors = buildUnnamed238();
     o.id = "foo";
     o.kind = "foo";
     o.status = "foo";
@@ -3344,7 +3208,7 @@
   if (buildCounterUpload < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
     unittest.expect(o.customDataSourceId, unittest.equals('foo'));
-    checkUnnamed946(o.errors);
+    checkUnnamed238(o.errors);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
@@ -3352,14 +3216,14 @@
   buildCounterUpload--;
 }
 
-buildUnnamed947() {
+buildUnnamed239() {
   var o = new core.List<api.Upload>();
   o.add(buildUpload());
   o.add(buildUpload());
   return o;
 }
 
-checkUnnamed947(core.List<api.Upload> o) {
+checkUnnamed239(core.List<api.Upload> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUpload(o[0]);
   checkUpload(o[1]);
@@ -3370,7 +3234,7 @@
   var o = new api.Uploads();
   buildCounterUploads++;
   if (buildCounterUploads < 3) {
-    o.items = buildUnnamed947();
+    o.items = buildUnnamed239();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -3385,7 +3249,7 @@
 checkUploads(api.Uploads o) {
   buildCounterUploads++;
   if (buildCounterUploads < 3) {
-    checkUnnamed947(o.items);
+    checkUnnamed239(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -3448,14 +3312,14 @@
   buildCounterWebPropertyRef--;
 }
 
-buildUnnamed948() {
+buildUnnamed240() {
   var o = new core.List<api.ProfileSummary>();
   o.add(buildProfileSummary());
   o.add(buildProfileSummary());
   return o;
 }
 
-checkUnnamed948(core.List<api.ProfileSummary> o) {
+checkUnnamed240(core.List<api.ProfileSummary> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProfileSummary(o[0]);
   checkProfileSummary(o[1]);
@@ -3471,7 +3335,7 @@
     o.kind = "foo";
     o.level = "foo";
     o.name = "foo";
-    o.profiles = buildUnnamed948();
+    o.profiles = buildUnnamed240();
     o.websiteUrl = "foo";
   }
   buildCounterWebPropertySummary--;
@@ -3486,20 +3350,20 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.level, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed948(o.profiles);
+    checkUnnamed240(o.profiles);
     unittest.expect(o.websiteUrl, unittest.equals('foo'));
   }
   buildCounterWebPropertySummary--;
 }
 
-buildUnnamed949() {
+buildUnnamed241() {
   var o = new core.List<api.Webproperty>();
   o.add(buildWebproperty());
   o.add(buildWebproperty());
   return o;
 }
 
-checkUnnamed949(core.List<api.Webproperty> o) {
+checkUnnamed241(core.List<api.Webproperty> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWebproperty(o[0]);
   checkWebproperty(o[1]);
@@ -3510,7 +3374,7 @@
   var o = new api.Webproperties();
   buildCounterWebproperties++;
   if (buildCounterWebproperties < 3) {
-    o.items = buildUnnamed949();
+    o.items = buildUnnamed241();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -3526,7 +3390,7 @@
 checkWebproperties(api.Webproperties o) {
   buildCounterWebproperties++;
   if (buildCounterWebproperties < 3) {
-    checkUnnamed949(o.items);
+    checkUnnamed241(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -3580,14 +3444,14 @@
   buildCounterWebpropertyParentLink--;
 }
 
-buildUnnamed950() {
+buildUnnamed242() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed950(core.List<core.String> o) {
+checkUnnamed242(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3598,7 +3462,7 @@
   var o = new api.WebpropertyPermissions();
   buildCounterWebpropertyPermissions++;
   if (buildCounterWebpropertyPermissions < 3) {
-    o.effective = buildUnnamed950();
+    o.effective = buildUnnamed242();
   }
   buildCounterWebpropertyPermissions--;
   return o;
@@ -3607,7 +3471,7 @@
 checkWebpropertyPermissions(api.WebpropertyPermissions o) {
   buildCounterWebpropertyPermissions++;
   if (buildCounterWebpropertyPermissions < 3) {
-    checkUnnamed950(o.effective);
+    checkUnnamed242(o.effective);
   }
   buildCounterWebpropertyPermissions--;
 }
@@ -3861,51 +3725,6 @@
   });
 
 
-  unittest.group("obj-schema-DailyUploadParentLink", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildDailyUploadParentLink();
-      var od = new api.DailyUploadParentLink.fromJson(o.toJson());
-      checkDailyUploadParentLink(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-DailyUploadRecentChanges", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildDailyUploadRecentChanges();
-      var od = new api.DailyUploadRecentChanges.fromJson(o.toJson());
-      checkDailyUploadRecentChanges(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-DailyUpload", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildDailyUpload();
-      var od = new api.DailyUpload.fromJson(o.toJson());
-      checkDailyUpload(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-DailyUploadAppend", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildDailyUploadAppend();
-      var od = new api.DailyUploadAppend.fromJson(o.toJson());
-      checkDailyUploadAppend(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-DailyUploads", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildDailyUploads();
-      var od = new api.DailyUploads.fromJson(o.toJson());
-      checkDailyUploads(od);
-    });
-  });
-
-
   unittest.group("obj-schema-EntityAdWordsLinkEntity", () {
     unittest.test("to-json--from-json", () {
       var o = buildEntityAdWordsLinkEntity();
@@ -4557,7 +4376,7 @@
   unittest.group("resource-DataGaResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DataGaResourceApi res = new api.AnalyticsApi(mock).data.ga;
       var arg_ids = "foo";
       var arg_start_date = "foo";
@@ -4617,7 +4436,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGaData());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_ids, arg_start_date, arg_end_date, arg_metrics, dimensions: arg_dimensions, filters: arg_filters, max_results: arg_max_results, output: arg_output, samplingLevel: arg_samplingLevel, segment: arg_segment, sort: arg_sort, start_index: arg_start_index).then(unittest.expectAsync(((api.GaData response) {
         checkGaData(response);
@@ -4630,7 +4449,7 @@
   unittest.group("resource-DataMcfResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DataMcfResourceApi res = new api.AnalyticsApi(mock).data.mcf;
       var arg_ids = "foo";
       var arg_start_date = "foo";
@@ -4686,7 +4505,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMcfData());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_ids, arg_start_date, arg_end_date, arg_metrics, dimensions: arg_dimensions, filters: arg_filters, max_results: arg_max_results, samplingLevel: arg_samplingLevel, sort: arg_sort, start_index: arg_start_index).then(unittest.expectAsync(((api.McfData response) {
         checkMcfData(response);
@@ -4699,7 +4518,7 @@
   unittest.group("resource-DataRealtimeResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DataRealtimeResourceApi res = new api.AnalyticsApi(mock).data.realtime;
       var arg_ids = "foo";
       var arg_metrics = "foo";
@@ -4747,7 +4566,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRealtimeData());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_ids, arg_metrics, dimensions: arg_dimensions, filters: arg_filters, max_results: arg_max_results, sort: arg_sort).then(unittest.expectAsync(((api.RealtimeData response) {
         checkRealtimeData(response);
@@ -4760,7 +4579,7 @@
   unittest.group("resource-ManagementAccountSummariesResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementAccountSummariesResourceApi res = new api.AnalyticsApi(mock).management.accountSummaries;
       var arg_max_results = 42;
       var arg_start_index = 42;
@@ -4800,7 +4619,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountSummaries());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(max_results: arg_max_results, start_index: arg_start_index).then(unittest.expectAsync(((api.AccountSummaries response) {
         checkAccountSummaries(response);
@@ -4813,7 +4632,7 @@
   unittest.group("resource-ManagementAccountUserLinksResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementAccountUserLinksResourceApi res = new api.AnalyticsApi(mock).management.accountUserLinks;
       var arg_accountId = "foo";
       var arg_linkId = "foo";
@@ -4861,14 +4680,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_accountId, arg_linkId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementAccountUserLinksResourceApi res = new api.AnalyticsApi(mock).management.accountUserLinks;
       var arg_request = buildEntityUserLink();
       var arg_accountId = "foo";
@@ -4916,7 +4735,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEntityUserLink());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_accountId).then(unittest.expectAsync(((api.EntityUserLink response) {
         checkEntityUserLink(response);
@@ -4925,7 +4744,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementAccountUserLinksResourceApi res = new api.AnalyticsApi(mock).management.accountUserLinks;
       var arg_accountId = "foo";
       var arg_max_results = 42;
@@ -4973,7 +4792,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEntityUserLinks());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, max_results: arg_max_results, start_index: arg_start_index).then(unittest.expectAsync(((api.EntityUserLinks response) {
         checkEntityUserLinks(response);
@@ -4982,7 +4801,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementAccountUserLinksResourceApi res = new api.AnalyticsApi(mock).management.accountUserLinks;
       var arg_request = buildEntityUserLink();
       var arg_accountId = "foo";
@@ -5034,7 +4853,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEntityUserLink());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_accountId, arg_linkId).then(unittest.expectAsync(((api.EntityUserLink response) {
         checkEntityUserLink(response);
@@ -5047,7 +4866,7 @@
   unittest.group("resource-ManagementAccountsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementAccountsResourceApi res = new api.AnalyticsApi(mock).management.accounts;
       var arg_max_results = 42;
       var arg_start_index = 42;
@@ -5087,7 +4906,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccounts());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(max_results: arg_max_results, start_index: arg_start_index).then(unittest.expectAsync(((api.Accounts response) {
         checkAccounts(response);
@@ -5100,7 +4919,7 @@
   unittest.group("resource-ManagementCustomDataSourcesResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementCustomDataSourcesResourceApi res = new api.AnalyticsApi(mock).management.customDataSources;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -5156,7 +4975,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomDataSources());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_webPropertyId, max_results: arg_max_results, start_index: arg_start_index).then(unittest.expectAsync(((api.CustomDataSources response) {
         checkCustomDataSources(response);
@@ -5169,7 +4988,7 @@
   unittest.group("resource-ManagementCustomDimensionsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementCustomDimensionsResourceApi res = new api.AnalyticsApi(mock).management.customDimensions;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -5225,7 +5044,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomDimension());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_webPropertyId, arg_customDimensionId).then(unittest.expectAsync(((api.CustomDimension response) {
         checkCustomDimension(response);
@@ -5234,7 +5053,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementCustomDimensionsResourceApi res = new api.AnalyticsApi(mock).management.customDimensions;
       var arg_request = buildCustomDimension();
       var arg_accountId = "foo";
@@ -5290,7 +5109,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomDimension());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_accountId, arg_webPropertyId).then(unittest.expectAsync(((api.CustomDimension response) {
         checkCustomDimension(response);
@@ -5299,7 +5118,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementCustomDimensionsResourceApi res = new api.AnalyticsApi(mock).management.customDimensions;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -5355,7 +5174,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomDimensions());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_webPropertyId, max_results: arg_max_results, start_index: arg_start_index).then(unittest.expectAsync(((api.CustomDimensions response) {
         checkCustomDimensions(response);
@@ -5364,7 +5183,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementCustomDimensionsResourceApi res = new api.AnalyticsApi(mock).management.customDimensions;
       var arg_request = buildCustomDimension();
       var arg_accountId = "foo";
@@ -5426,7 +5245,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomDimension());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_accountId, arg_webPropertyId, arg_customDimensionId, ignoreCustomDataSourceLinks: arg_ignoreCustomDataSourceLinks).then(unittest.expectAsync(((api.CustomDimension response) {
         checkCustomDimension(response);
@@ -5435,7 +5254,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementCustomDimensionsResourceApi res = new api.AnalyticsApi(mock).management.customDimensions;
       var arg_request = buildCustomDimension();
       var arg_accountId = "foo";
@@ -5497,7 +5316,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomDimension());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_accountId, arg_webPropertyId, arg_customDimensionId, ignoreCustomDataSourceLinks: arg_ignoreCustomDataSourceLinks).then(unittest.expectAsync(((api.CustomDimension response) {
         checkCustomDimension(response);
@@ -5510,7 +5329,7 @@
   unittest.group("resource-ManagementCustomMetricsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementCustomMetricsResourceApi res = new api.AnalyticsApi(mock).management.customMetrics;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -5566,7 +5385,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomMetric());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_webPropertyId, arg_customMetricId).then(unittest.expectAsync(((api.CustomMetric response) {
         checkCustomMetric(response);
@@ -5575,7 +5394,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementCustomMetricsResourceApi res = new api.AnalyticsApi(mock).management.customMetrics;
       var arg_request = buildCustomMetric();
       var arg_accountId = "foo";
@@ -5631,7 +5450,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomMetric());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_accountId, arg_webPropertyId).then(unittest.expectAsync(((api.CustomMetric response) {
         checkCustomMetric(response);
@@ -5640,7 +5459,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementCustomMetricsResourceApi res = new api.AnalyticsApi(mock).management.customMetrics;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -5696,7 +5515,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomMetrics());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_webPropertyId, max_results: arg_max_results, start_index: arg_start_index).then(unittest.expectAsync(((api.CustomMetrics response) {
         checkCustomMetrics(response);
@@ -5705,7 +5524,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementCustomMetricsResourceApi res = new api.AnalyticsApi(mock).management.customMetrics;
       var arg_request = buildCustomMetric();
       var arg_accountId = "foo";
@@ -5767,7 +5586,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomMetric());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_accountId, arg_webPropertyId, arg_customMetricId, ignoreCustomDataSourceLinks: arg_ignoreCustomDataSourceLinks).then(unittest.expectAsync(((api.CustomMetric response) {
         checkCustomMetric(response);
@@ -5776,7 +5595,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementCustomMetricsResourceApi res = new api.AnalyticsApi(mock).management.customMetrics;
       var arg_request = buildCustomMetric();
       var arg_accountId = "foo";
@@ -5838,7 +5657,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomMetric());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_accountId, arg_webPropertyId, arg_customMetricId, ignoreCustomDataSourceLinks: arg_ignoreCustomDataSourceLinks).then(unittest.expectAsync(((api.CustomMetric response) {
         checkCustomMetric(response);
@@ -5848,249 +5667,10 @@
   });
 
 
-  unittest.group("resource-ManagementDailyUploadsResourceApi", () {
-    unittest.test("method--delete", () {
-
-      var mock = new common_test.HttpServerMock();
-      api.ManagementDailyUploadsResourceApi res = new api.AnalyticsApi(mock).management.dailyUploads;
-      var arg_accountId = "foo";
-      var arg_webPropertyId = "foo";
-      var arg_customDataSourceId = "foo";
-      var arg_date = "foo";
-      var arg_type = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
-        var path = (req.url).path;
-        var pathOffset = 0;
-        var index;
-        var subPart;
-        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
-        pathOffset += 1;
-        unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("analytics/v3/"));
-        pathOffset += 13;
-        unittest.expect(path.substring(pathOffset, pathOffset + 20), unittest.equals("management/accounts/"));
-        pathOffset += 20;
-        index = path.indexOf("/webproperties/", pathOffset);
-        unittest.expect(index >= 0, unittest.isTrue);
-        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
-        pathOffset = index;
-        unittest.expect(subPart, unittest.equals("$arg_accountId"));
-        unittest.expect(path.substring(pathOffset, pathOffset + 15), unittest.equals("/webproperties/"));
-        pathOffset += 15;
-        index = path.indexOf("/customDataSources/", pathOffset);
-        unittest.expect(index >= 0, unittest.isTrue);
-        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
-        pathOffset = index;
-        unittest.expect(subPart, unittest.equals("$arg_webPropertyId"));
-        unittest.expect(path.substring(pathOffset, pathOffset + 19), unittest.equals("/customDataSources/"));
-        pathOffset += 19;
-        index = path.indexOf("/dailyUploads/", pathOffset);
-        unittest.expect(index >= 0, unittest.isTrue);
-        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
-        pathOffset = index;
-        unittest.expect(subPart, unittest.equals("$arg_customDataSourceId"));
-        unittest.expect(path.substring(pathOffset, pathOffset + 14), unittest.equals("/dailyUploads/"));
-        pathOffset += 14;
-        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
-        pathOffset = path.length;
-        unittest.expect(subPart, unittest.equals("$arg_date"));
-
-        var query = (req.url).query;
-        var queryOffset = 0;
-        var queryMap = {};
-        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
-        parseBool(n) {
-          if (n == "true") return true;
-          if (n == "false") return false;
-          if (n == null) return null;
-          throw new core.ArgumentError("Invalid boolean: $n");
-        }
-        if (query.length > 0) {
-          for (var part in query.split("&")) {
-            var keyvalue = part.split("=");
-            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
-          }
-        }
-        unittest.expect(queryMap["type"].first, unittest.equals(arg_type));
-
-
-        var h = {
-          "content-type" : "application/json; charset=utf-8",
-        };
-        var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
-      }), true);
-      res.delete(arg_accountId, arg_webPropertyId, arg_customDataSourceId, arg_date, arg_type).then(unittest.expectAsync((_) {}));
-    });
-
-    unittest.test("method--list", () {
-
-      var mock = new common_test.HttpServerMock();
-      api.ManagementDailyUploadsResourceApi res = new api.AnalyticsApi(mock).management.dailyUploads;
-      var arg_accountId = "foo";
-      var arg_webPropertyId = "foo";
-      var arg_customDataSourceId = "foo";
-      var arg_start_date = "foo";
-      var arg_end_date = "foo";
-      var arg_max_results = 42;
-      var arg_start_index = 42;
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
-        var path = (req.url).path;
-        var pathOffset = 0;
-        var index;
-        var subPart;
-        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
-        pathOffset += 1;
-        unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("analytics/v3/"));
-        pathOffset += 13;
-        unittest.expect(path.substring(pathOffset, pathOffset + 20), unittest.equals("management/accounts/"));
-        pathOffset += 20;
-        index = path.indexOf("/webproperties/", pathOffset);
-        unittest.expect(index >= 0, unittest.isTrue);
-        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
-        pathOffset = index;
-        unittest.expect(subPart, unittest.equals("$arg_accountId"));
-        unittest.expect(path.substring(pathOffset, pathOffset + 15), unittest.equals("/webproperties/"));
-        pathOffset += 15;
-        index = path.indexOf("/customDataSources/", pathOffset);
-        unittest.expect(index >= 0, unittest.isTrue);
-        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
-        pathOffset = index;
-        unittest.expect(subPart, unittest.equals("$arg_webPropertyId"));
-        unittest.expect(path.substring(pathOffset, pathOffset + 19), unittest.equals("/customDataSources/"));
-        pathOffset += 19;
-        index = path.indexOf("/dailyUploads", pathOffset);
-        unittest.expect(index >= 0, unittest.isTrue);
-        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
-        pathOffset = index;
-        unittest.expect(subPart, unittest.equals("$arg_customDataSourceId"));
-        unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("/dailyUploads"));
-        pathOffset += 13;
-
-        var query = (req.url).query;
-        var queryOffset = 0;
-        var queryMap = {};
-        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
-        parseBool(n) {
-          if (n == "true") return true;
-          if (n == "false") return false;
-          if (n == null) return null;
-          throw new core.ArgumentError("Invalid boolean: $n");
-        }
-        if (query.length > 0) {
-          for (var part in query.split("&")) {
-            var keyvalue = part.split("=");
-            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
-          }
-        }
-        unittest.expect(queryMap["start-date"].first, unittest.equals(arg_start_date));
-        unittest.expect(queryMap["end-date"].first, unittest.equals(arg_end_date));
-        unittest.expect(core.int.parse(queryMap["max-results"].first), unittest.equals(arg_max_results));
-        unittest.expect(core.int.parse(queryMap["start-index"].first), unittest.equals(arg_start_index));
-
-
-        var h = {
-          "content-type" : "application/json; charset=utf-8",
-        };
-        var resp = convert.JSON.encode(buildDailyUploads());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
-      }), true);
-      res.list(arg_accountId, arg_webPropertyId, arg_customDataSourceId, arg_start_date, arg_end_date, max_results: arg_max_results, start_index: arg_start_index).then(unittest.expectAsync(((api.DailyUploads response) {
-        checkDailyUploads(response);
-      })));
-    });
-
-    unittest.test("method--upload", () {
-      // TODO: Implement tests for media upload;
-      // TODO: Implement tests for media download;
-
-      var mock = new common_test.HttpServerMock();
-      api.ManagementDailyUploadsResourceApi res = new api.AnalyticsApi(mock).management.dailyUploads;
-      var arg_accountId = "foo";
-      var arg_webPropertyId = "foo";
-      var arg_customDataSourceId = "foo";
-      var arg_date = "foo";
-      var arg_appendNumber = 42;
-      var arg_type = "foo";
-      var arg_reset = true;
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
-        var path = (req.url).path;
-        var pathOffset = 0;
-        var index;
-        var subPart;
-        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
-        pathOffset += 1;
-        unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("analytics/v3/"));
-        pathOffset += 13;
-        unittest.expect(path.substring(pathOffset, pathOffset + 20), unittest.equals("management/accounts/"));
-        pathOffset += 20;
-        index = path.indexOf("/webproperties/", pathOffset);
-        unittest.expect(index >= 0, unittest.isTrue);
-        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
-        pathOffset = index;
-        unittest.expect(subPart, unittest.equals("$arg_accountId"));
-        unittest.expect(path.substring(pathOffset, pathOffset + 15), unittest.equals("/webproperties/"));
-        pathOffset += 15;
-        index = path.indexOf("/customDataSources/", pathOffset);
-        unittest.expect(index >= 0, unittest.isTrue);
-        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
-        pathOffset = index;
-        unittest.expect(subPart, unittest.equals("$arg_webPropertyId"));
-        unittest.expect(path.substring(pathOffset, pathOffset + 19), unittest.equals("/customDataSources/"));
-        pathOffset += 19;
-        index = path.indexOf("/dailyUploads/", pathOffset);
-        unittest.expect(index >= 0, unittest.isTrue);
-        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
-        pathOffset = index;
-        unittest.expect(subPart, unittest.equals("$arg_customDataSourceId"));
-        unittest.expect(path.substring(pathOffset, pathOffset + 14), unittest.equals("/dailyUploads/"));
-        pathOffset += 14;
-        index = path.indexOf("/uploads", pathOffset);
-        unittest.expect(index >= 0, unittest.isTrue);
-        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
-        pathOffset = index;
-        unittest.expect(subPart, unittest.equals("$arg_date"));
-        unittest.expect(path.substring(pathOffset, pathOffset + 8), unittest.equals("/uploads"));
-        pathOffset += 8;
-
-        var query = (req.url).query;
-        var queryOffset = 0;
-        var queryMap = {};
-        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
-        parseBool(n) {
-          if (n == "true") return true;
-          if (n == "false") return false;
-          if (n == null) return null;
-          throw new core.ArgumentError("Invalid boolean: $n");
-        }
-        if (query.length > 0) {
-          for (var part in query.split("&")) {
-            var keyvalue = part.split("=");
-            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
-          }
-        }
-        unittest.expect(core.int.parse(queryMap["appendNumber"].first), unittest.equals(arg_appendNumber));
-        unittest.expect(queryMap["type"].first, unittest.equals(arg_type));
-        unittest.expect(queryMap["reset"].first, unittest.equals("$arg_reset"));
-
-
-        var h = {
-          "content-type" : "application/json; charset=utf-8",
-        };
-        var resp = convert.JSON.encode(buildDailyUploadAppend());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
-      }), true);
-      res.upload(arg_accountId, arg_webPropertyId, arg_customDataSourceId, arg_date, arg_appendNumber, arg_type, reset: arg_reset).then(unittest.expectAsync(((api.DailyUploadAppend response) {
-        checkDailyUploadAppend(response);
-      })));
-    });
-
-  });
-
-
   unittest.group("resource-ManagementExperimentsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementExperimentsResourceApi res = new api.AnalyticsApi(mock).management.experiments;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -6154,14 +5734,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_accountId, arg_webPropertyId, arg_profileId, arg_experimentId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementExperimentsResourceApi res = new api.AnalyticsApi(mock).management.experiments;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -6225,7 +5805,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildExperiment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_webPropertyId, arg_profileId, arg_experimentId).then(unittest.expectAsync(((api.Experiment response) {
         checkExperiment(response);
@@ -6234,7 +5814,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementExperimentsResourceApi res = new api.AnalyticsApi(mock).management.experiments;
       var arg_request = buildExperiment();
       var arg_accountId = "foo";
@@ -6298,7 +5878,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildExperiment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_accountId, arg_webPropertyId, arg_profileId).then(unittest.expectAsync(((api.Experiment response) {
         checkExperiment(response);
@@ -6307,7 +5887,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementExperimentsResourceApi res = new api.AnalyticsApi(mock).management.experiments;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -6371,7 +5951,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildExperiments());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_webPropertyId, arg_profileId, max_results: arg_max_results, start_index: arg_start_index).then(unittest.expectAsync(((api.Experiments response) {
         checkExperiments(response);
@@ -6380,7 +5960,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementExperimentsResourceApi res = new api.AnalyticsApi(mock).management.experiments;
       var arg_request = buildExperiment();
       var arg_accountId = "foo";
@@ -6448,7 +6028,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildExperiment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_accountId, arg_webPropertyId, arg_profileId, arg_experimentId).then(unittest.expectAsync(((api.Experiment response) {
         checkExperiment(response);
@@ -6457,7 +6037,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementExperimentsResourceApi res = new api.AnalyticsApi(mock).management.experiments;
       var arg_request = buildExperiment();
       var arg_accountId = "foo";
@@ -6525,7 +6105,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildExperiment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_accountId, arg_webPropertyId, arg_profileId, arg_experimentId).then(unittest.expectAsync(((api.Experiment response) {
         checkExperiment(response);
@@ -6538,7 +6118,7 @@
   unittest.group("resource-ManagementFiltersResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementFiltersResourceApi res = new api.AnalyticsApi(mock).management.filters;
       var arg_accountId = "foo";
       var arg_filterId = "foo";
@@ -6586,7 +6166,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFilter());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_accountId, arg_filterId).then(unittest.expectAsync(((api.Filter response) {
         checkFilter(response);
@@ -6595,7 +6175,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementFiltersResourceApi res = new api.AnalyticsApi(mock).management.filters;
       var arg_accountId = "foo";
       var arg_filterId = "foo";
@@ -6643,7 +6223,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFilter());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_filterId).then(unittest.expectAsync(((api.Filter response) {
         checkFilter(response);
@@ -6652,7 +6232,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementFiltersResourceApi res = new api.AnalyticsApi(mock).management.filters;
       var arg_request = buildFilter();
       var arg_accountId = "foo";
@@ -6700,7 +6280,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFilter());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_accountId).then(unittest.expectAsync(((api.Filter response) {
         checkFilter(response);
@@ -6709,7 +6289,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementFiltersResourceApi res = new api.AnalyticsApi(mock).management.filters;
       var arg_accountId = "foo";
       var arg_max_results = 42;
@@ -6757,7 +6337,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFilters());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, max_results: arg_max_results, start_index: arg_start_index).then(unittest.expectAsync(((api.Filters response) {
         checkFilters(response);
@@ -6766,7 +6346,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementFiltersResourceApi res = new api.AnalyticsApi(mock).management.filters;
       var arg_request = buildFilter();
       var arg_accountId = "foo";
@@ -6818,7 +6398,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFilter());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_accountId, arg_filterId).then(unittest.expectAsync(((api.Filter response) {
         checkFilter(response);
@@ -6827,7 +6407,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementFiltersResourceApi res = new api.AnalyticsApi(mock).management.filters;
       var arg_request = buildFilter();
       var arg_accountId = "foo";
@@ -6879,7 +6459,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFilter());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_accountId, arg_filterId).then(unittest.expectAsync(((api.Filter response) {
         checkFilter(response);
@@ -6892,7 +6472,7 @@
   unittest.group("resource-ManagementGoalsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementGoalsResourceApi res = new api.AnalyticsApi(mock).management.goals;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -6956,7 +6536,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGoal());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_webPropertyId, arg_profileId, arg_goalId).then(unittest.expectAsync(((api.Goal response) {
         checkGoal(response);
@@ -6965,7 +6545,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementGoalsResourceApi res = new api.AnalyticsApi(mock).management.goals;
       var arg_request = buildGoal();
       var arg_accountId = "foo";
@@ -7029,7 +6609,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGoal());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_accountId, arg_webPropertyId, arg_profileId).then(unittest.expectAsync(((api.Goal response) {
         checkGoal(response);
@@ -7038,7 +6618,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementGoalsResourceApi res = new api.AnalyticsApi(mock).management.goals;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -7102,7 +6682,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGoals());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_webPropertyId, arg_profileId, max_results: arg_max_results, start_index: arg_start_index).then(unittest.expectAsync(((api.Goals response) {
         checkGoals(response);
@@ -7111,7 +6691,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementGoalsResourceApi res = new api.AnalyticsApi(mock).management.goals;
       var arg_request = buildGoal();
       var arg_accountId = "foo";
@@ -7179,7 +6759,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGoal());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_accountId, arg_webPropertyId, arg_profileId, arg_goalId).then(unittest.expectAsync(((api.Goal response) {
         checkGoal(response);
@@ -7188,7 +6768,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementGoalsResourceApi res = new api.AnalyticsApi(mock).management.goals;
       var arg_request = buildGoal();
       var arg_accountId = "foo";
@@ -7256,7 +6836,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGoal());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_accountId, arg_webPropertyId, arg_profileId, arg_goalId).then(unittest.expectAsync(((api.Goal response) {
         checkGoal(response);
@@ -7269,7 +6849,7 @@
   unittest.group("resource-ManagementProfileFilterLinksResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementProfileFilterLinksResourceApi res = new api.AnalyticsApi(mock).management.profileFilterLinks;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -7333,14 +6913,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_accountId, arg_webPropertyId, arg_profileId, arg_linkId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementProfileFilterLinksResourceApi res = new api.AnalyticsApi(mock).management.profileFilterLinks;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -7404,7 +6984,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProfileFilterLink());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_webPropertyId, arg_profileId, arg_linkId).then(unittest.expectAsync(((api.ProfileFilterLink response) {
         checkProfileFilterLink(response);
@@ -7413,7 +6993,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementProfileFilterLinksResourceApi res = new api.AnalyticsApi(mock).management.profileFilterLinks;
       var arg_request = buildProfileFilterLink();
       var arg_accountId = "foo";
@@ -7477,7 +7057,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProfileFilterLink());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_accountId, arg_webPropertyId, arg_profileId).then(unittest.expectAsync(((api.ProfileFilterLink response) {
         checkProfileFilterLink(response);
@@ -7486,7 +7066,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementProfileFilterLinksResourceApi res = new api.AnalyticsApi(mock).management.profileFilterLinks;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -7550,7 +7130,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProfileFilterLinks());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_webPropertyId, arg_profileId, max_results: arg_max_results, start_index: arg_start_index).then(unittest.expectAsync(((api.ProfileFilterLinks response) {
         checkProfileFilterLinks(response);
@@ -7559,7 +7139,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementProfileFilterLinksResourceApi res = new api.AnalyticsApi(mock).management.profileFilterLinks;
       var arg_request = buildProfileFilterLink();
       var arg_accountId = "foo";
@@ -7627,7 +7207,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProfileFilterLink());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_accountId, arg_webPropertyId, arg_profileId, arg_linkId).then(unittest.expectAsync(((api.ProfileFilterLink response) {
         checkProfileFilterLink(response);
@@ -7636,7 +7216,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementProfileFilterLinksResourceApi res = new api.AnalyticsApi(mock).management.profileFilterLinks;
       var arg_request = buildProfileFilterLink();
       var arg_accountId = "foo";
@@ -7704,7 +7284,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProfileFilterLink());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_accountId, arg_webPropertyId, arg_profileId, arg_linkId).then(unittest.expectAsync(((api.ProfileFilterLink response) {
         checkProfileFilterLink(response);
@@ -7717,7 +7297,7 @@
   unittest.group("resource-ManagementProfileUserLinksResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementProfileUserLinksResourceApi res = new api.AnalyticsApi(mock).management.profileUserLinks;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -7781,14 +7361,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_accountId, arg_webPropertyId, arg_profileId, arg_linkId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementProfileUserLinksResourceApi res = new api.AnalyticsApi(mock).management.profileUserLinks;
       var arg_request = buildEntityUserLink();
       var arg_accountId = "foo";
@@ -7852,7 +7432,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEntityUserLink());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_accountId, arg_webPropertyId, arg_profileId).then(unittest.expectAsync(((api.EntityUserLink response) {
         checkEntityUserLink(response);
@@ -7861,7 +7441,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementProfileUserLinksResourceApi res = new api.AnalyticsApi(mock).management.profileUserLinks;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -7925,7 +7505,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEntityUserLinks());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_webPropertyId, arg_profileId, max_results: arg_max_results, start_index: arg_start_index).then(unittest.expectAsync(((api.EntityUserLinks response) {
         checkEntityUserLinks(response);
@@ -7934,7 +7514,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementProfileUserLinksResourceApi res = new api.AnalyticsApi(mock).management.profileUserLinks;
       var arg_request = buildEntityUserLink();
       var arg_accountId = "foo";
@@ -8002,7 +7582,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEntityUserLink());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_accountId, arg_webPropertyId, arg_profileId, arg_linkId).then(unittest.expectAsync(((api.EntityUserLink response) {
         checkEntityUserLink(response);
@@ -8015,7 +7595,7 @@
   unittest.group("resource-ManagementProfilesResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementProfilesResourceApi res = new api.AnalyticsApi(mock).management.profiles;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -8071,14 +7651,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_accountId, arg_webPropertyId, arg_profileId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementProfilesResourceApi res = new api.AnalyticsApi(mock).management.profiles;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -8134,7 +7714,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProfile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_webPropertyId, arg_profileId).then(unittest.expectAsync(((api.Profile response) {
         checkProfile(response);
@@ -8143,7 +7723,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementProfilesResourceApi res = new api.AnalyticsApi(mock).management.profiles;
       var arg_request = buildProfile();
       var arg_accountId = "foo";
@@ -8199,7 +7779,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProfile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_accountId, arg_webPropertyId).then(unittest.expectAsync(((api.Profile response) {
         checkProfile(response);
@@ -8208,7 +7788,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementProfilesResourceApi res = new api.AnalyticsApi(mock).management.profiles;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -8264,7 +7844,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProfiles());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_webPropertyId, max_results: arg_max_results, start_index: arg_start_index).then(unittest.expectAsync(((api.Profiles response) {
         checkProfiles(response);
@@ -8273,7 +7853,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementProfilesResourceApi res = new api.AnalyticsApi(mock).management.profiles;
       var arg_request = buildProfile();
       var arg_accountId = "foo";
@@ -8333,7 +7913,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProfile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_accountId, arg_webPropertyId, arg_profileId).then(unittest.expectAsync(((api.Profile response) {
         checkProfile(response);
@@ -8342,7 +7922,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementProfilesResourceApi res = new api.AnalyticsApi(mock).management.profiles;
       var arg_request = buildProfile();
       var arg_accountId = "foo";
@@ -8402,7 +7982,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProfile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_accountId, arg_webPropertyId, arg_profileId).then(unittest.expectAsync(((api.Profile response) {
         checkProfile(response);
@@ -8415,7 +7995,7 @@
   unittest.group("resource-ManagementSegmentsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementSegmentsResourceApi res = new api.AnalyticsApi(mock).management.segments;
       var arg_max_results = 42;
       var arg_start_index = 42;
@@ -8455,7 +8035,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSegments());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(max_results: arg_max_results, start_index: arg_start_index).then(unittest.expectAsync(((api.Segments response) {
         checkSegments(response);
@@ -8468,7 +8048,7 @@
   unittest.group("resource-ManagementUnsampledReportsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementUnsampledReportsResourceApi res = new api.AnalyticsApi(mock).management.unsampledReports;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -8532,7 +8112,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUnsampledReport());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_webPropertyId, arg_profileId, arg_unsampledReportId).then(unittest.expectAsync(((api.UnsampledReport response) {
         checkUnsampledReport(response);
@@ -8541,7 +8121,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementUnsampledReportsResourceApi res = new api.AnalyticsApi(mock).management.unsampledReports;
       var arg_request = buildUnsampledReport();
       var arg_accountId = "foo";
@@ -8605,7 +8185,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUnsampledReport());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_accountId, arg_webPropertyId, arg_profileId).then(unittest.expectAsync(((api.UnsampledReport response) {
         checkUnsampledReport(response);
@@ -8614,7 +8194,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementUnsampledReportsResourceApi res = new api.AnalyticsApi(mock).management.unsampledReports;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -8678,7 +8258,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUnsampledReports());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_webPropertyId, arg_profileId, max_results: arg_max_results, start_index: arg_start_index).then(unittest.expectAsync(((api.UnsampledReports response) {
         checkUnsampledReports(response);
@@ -8691,7 +8271,7 @@
   unittest.group("resource-ManagementUploadsResourceApi", () {
     unittest.test("method--deleteUploadData", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementUploadsResourceApi res = new api.AnalyticsApi(mock).management.uploads;
       var arg_request = buildAnalyticsDataimportDeleteUploadDataRequest();
       var arg_accountId = "foo";
@@ -8755,14 +8335,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.deleteUploadData(arg_request, arg_accountId, arg_webPropertyId, arg_customDataSourceId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementUploadsResourceApi res = new api.AnalyticsApi(mock).management.uploads;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -8826,7 +8406,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUpload());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_webPropertyId, arg_customDataSourceId, arg_uploadId).then(unittest.expectAsync(((api.Upload response) {
         checkUpload(response);
@@ -8835,7 +8415,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementUploadsResourceApi res = new api.AnalyticsApi(mock).management.uploads;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -8899,85 +8479,18 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUploads());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_webPropertyId, arg_customDataSourceId, max_results: arg_max_results, start_index: arg_start_index).then(unittest.expectAsync(((api.Uploads response) {
         checkUploads(response);
       })));
     });
 
-    unittest.test("method--migrateDataImport", () {
-
-      var mock = new common_test.HttpServerMock();
-      api.ManagementUploadsResourceApi res = new api.AnalyticsApi(mock).management.uploads;
-      var arg_accountId = "foo";
-      var arg_webPropertyId = "foo";
-      var arg_customDataSourceId = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
-        var path = (req.url).path;
-        var pathOffset = 0;
-        var index;
-        var subPart;
-        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
-        pathOffset += 1;
-        unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("analytics/v3/"));
-        pathOffset += 13;
-        unittest.expect(path.substring(pathOffset, pathOffset + 20), unittest.equals("management/accounts/"));
-        pathOffset += 20;
-        index = path.indexOf("/webproperties/", pathOffset);
-        unittest.expect(index >= 0, unittest.isTrue);
-        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
-        pathOffset = index;
-        unittest.expect(subPart, unittest.equals("$arg_accountId"));
-        unittest.expect(path.substring(pathOffset, pathOffset + 15), unittest.equals("/webproperties/"));
-        pathOffset += 15;
-        index = path.indexOf("/customDataSources/", pathOffset);
-        unittest.expect(index >= 0, unittest.isTrue);
-        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
-        pathOffset = index;
-        unittest.expect(subPart, unittest.equals("$arg_webPropertyId"));
-        unittest.expect(path.substring(pathOffset, pathOffset + 19), unittest.equals("/customDataSources/"));
-        pathOffset += 19;
-        index = path.indexOf("/migrateDataImport", pathOffset);
-        unittest.expect(index >= 0, unittest.isTrue);
-        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
-        pathOffset = index;
-        unittest.expect(subPart, unittest.equals("$arg_customDataSourceId"));
-        unittest.expect(path.substring(pathOffset, pathOffset + 18), unittest.equals("/migrateDataImport"));
-        pathOffset += 18;
-
-        var query = (req.url).query;
-        var queryOffset = 0;
-        var queryMap = {};
-        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
-        parseBool(n) {
-          if (n == "true") return true;
-          if (n == "false") return false;
-          if (n == null) return null;
-          throw new core.ArgumentError("Invalid boolean: $n");
-        }
-        if (query.length > 0) {
-          for (var part in query.split("&")) {
-            var keyvalue = part.split("=");
-            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
-          }
-        }
-
-
-        var h = {
-          "content-type" : "application/json; charset=utf-8",
-        };
-        var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
-      }), true);
-      res.migrateDataImport(arg_accountId, arg_webPropertyId, arg_customDataSourceId).then(unittest.expectAsync((_) {}));
-    });
-
     unittest.test("method--uploadData", () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementUploadsResourceApi res = new api.AnalyticsApi(mock).management.uploads;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -9037,7 +8550,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUpload());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.uploadData(arg_accountId, arg_webPropertyId, arg_customDataSourceId).then(unittest.expectAsync(((api.Upload response) {
         checkUpload(response);
@@ -9050,7 +8563,7 @@
   unittest.group("resource-ManagementWebPropertyAdWordsLinksResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementWebPropertyAdWordsLinksResourceApi res = new api.AnalyticsApi(mock).management.webPropertyAdWordsLinks;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -9106,14 +8619,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_accountId, arg_webPropertyId, arg_webPropertyAdWordsLinkId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementWebPropertyAdWordsLinksResourceApi res = new api.AnalyticsApi(mock).management.webPropertyAdWordsLinks;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -9169,7 +8682,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEntityAdWordsLink());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_webPropertyId, arg_webPropertyAdWordsLinkId).then(unittest.expectAsync(((api.EntityAdWordsLink response) {
         checkEntityAdWordsLink(response);
@@ -9178,7 +8691,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementWebPropertyAdWordsLinksResourceApi res = new api.AnalyticsApi(mock).management.webPropertyAdWordsLinks;
       var arg_request = buildEntityAdWordsLink();
       var arg_accountId = "foo";
@@ -9234,7 +8747,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEntityAdWordsLink());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_accountId, arg_webPropertyId).then(unittest.expectAsync(((api.EntityAdWordsLink response) {
         checkEntityAdWordsLink(response);
@@ -9243,7 +8756,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementWebPropertyAdWordsLinksResourceApi res = new api.AnalyticsApi(mock).management.webPropertyAdWordsLinks;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -9299,7 +8812,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEntityAdWordsLinks());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_webPropertyId, max_results: arg_max_results, start_index: arg_start_index).then(unittest.expectAsync(((api.EntityAdWordsLinks response) {
         checkEntityAdWordsLinks(response);
@@ -9308,7 +8821,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementWebPropertyAdWordsLinksResourceApi res = new api.AnalyticsApi(mock).management.webPropertyAdWordsLinks;
       var arg_request = buildEntityAdWordsLink();
       var arg_accountId = "foo";
@@ -9368,7 +8881,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEntityAdWordsLink());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_accountId, arg_webPropertyId, arg_webPropertyAdWordsLinkId).then(unittest.expectAsync(((api.EntityAdWordsLink response) {
         checkEntityAdWordsLink(response);
@@ -9377,7 +8890,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementWebPropertyAdWordsLinksResourceApi res = new api.AnalyticsApi(mock).management.webPropertyAdWordsLinks;
       var arg_request = buildEntityAdWordsLink();
       var arg_accountId = "foo";
@@ -9437,7 +8950,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEntityAdWordsLink());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_accountId, arg_webPropertyId, arg_webPropertyAdWordsLinkId).then(unittest.expectAsync(((api.EntityAdWordsLink response) {
         checkEntityAdWordsLink(response);
@@ -9450,7 +8963,7 @@
   unittest.group("resource-ManagementWebpropertiesResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementWebpropertiesResourceApi res = new api.AnalyticsApi(mock).management.webproperties;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -9498,7 +9011,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildWebproperty());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_webPropertyId).then(unittest.expectAsync(((api.Webproperty response) {
         checkWebproperty(response);
@@ -9507,7 +9020,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementWebpropertiesResourceApi res = new api.AnalyticsApi(mock).management.webproperties;
       var arg_request = buildWebproperty();
       var arg_accountId = "foo";
@@ -9555,7 +9068,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildWebproperty());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_accountId).then(unittest.expectAsync(((api.Webproperty response) {
         checkWebproperty(response);
@@ -9564,7 +9077,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementWebpropertiesResourceApi res = new api.AnalyticsApi(mock).management.webproperties;
       var arg_accountId = "foo";
       var arg_max_results = 42;
@@ -9612,7 +9125,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildWebproperties());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, max_results: arg_max_results, start_index: arg_start_index).then(unittest.expectAsync(((api.Webproperties response) {
         checkWebproperties(response);
@@ -9621,7 +9134,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementWebpropertiesResourceApi res = new api.AnalyticsApi(mock).management.webproperties;
       var arg_request = buildWebproperty();
       var arg_accountId = "foo";
@@ -9673,7 +9186,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildWebproperty());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_accountId, arg_webPropertyId).then(unittest.expectAsync(((api.Webproperty response) {
         checkWebproperty(response);
@@ -9682,7 +9195,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementWebpropertiesResourceApi res = new api.AnalyticsApi(mock).management.webproperties;
       var arg_request = buildWebproperty();
       var arg_accountId = "foo";
@@ -9734,7 +9247,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildWebproperty());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_accountId, arg_webPropertyId).then(unittest.expectAsync(((api.Webproperty response) {
         checkWebproperty(response);
@@ -9747,7 +9260,7 @@
   unittest.group("resource-ManagementWebpropertyUserLinksResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementWebpropertyUserLinksResourceApi res = new api.AnalyticsApi(mock).management.webpropertyUserLinks;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -9803,14 +9316,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_accountId, arg_webPropertyId, arg_linkId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementWebpropertyUserLinksResourceApi res = new api.AnalyticsApi(mock).management.webpropertyUserLinks;
       var arg_request = buildEntityUserLink();
       var arg_accountId = "foo";
@@ -9866,7 +9379,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEntityUserLink());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_accountId, arg_webPropertyId).then(unittest.expectAsync(((api.EntityUserLink response) {
         checkEntityUserLink(response);
@@ -9875,7 +9388,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementWebpropertyUserLinksResourceApi res = new api.AnalyticsApi(mock).management.webpropertyUserLinks;
       var arg_accountId = "foo";
       var arg_webPropertyId = "foo";
@@ -9931,7 +9444,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEntityUserLinks());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_webPropertyId, max_results: arg_max_results, start_index: arg_start_index).then(unittest.expectAsync(((api.EntityUserLinks response) {
         checkEntityUserLinks(response);
@@ -9940,7 +9453,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ManagementWebpropertyUserLinksResourceApi res = new api.AnalyticsApi(mock).management.webpropertyUserLinks;
       var arg_request = buildEntityUserLink();
       var arg_accountId = "foo";
@@ -10000,7 +9513,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEntityUserLink());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_accountId, arg_webPropertyId, arg_linkId).then(unittest.expectAsync(((api.EntityUserLink response) {
         checkEntityUserLink(response);
@@ -10013,7 +9526,7 @@
   unittest.group("resource-MetadataColumnsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MetadataColumnsResourceApi res = new api.AnalyticsApi(mock).metadata.columns;
       var arg_reportType = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -10057,7 +9570,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildColumns());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_reportType).then(unittest.expectAsync(((api.Columns response) {
         checkColumns(response);
@@ -10070,7 +9583,7 @@
   unittest.group("resource-ProvisioningResourceApi", () {
     unittest.test("method--createAccountTicket", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ProvisioningResourceApi res = new api.AnalyticsApi(mock).provisioning;
       var arg_request = buildAccountTicket();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -10110,7 +9623,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountTicket());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.createAccountTicket(arg_request).then(unittest.expectAsync(((api.AccountTicket response) {
         checkAccountTicket(response);
diff --git a/generated/googleapis/test/androidenterprise/v1_test.dart b/generated/googleapis/test/androidenterprise/v1_test.dart
new file mode 100644
index 0000000..e387c2b
--- /dev/null
+++ b/generated/googleapis/test/androidenterprise/v1_test.dart
@@ -0,0 +1,3826 @@
+library googleapis.androidenterprise.v1.test;
+
+import "dart:core" as core;
+import "dart:collection" as collection;
+import "dart:async" as async;
+import "dart:convert" as convert;
+
+import 'package:http/http.dart' as http;
+import 'package:http/testing.dart' as http_testing;
+import 'package:unittest/unittest.dart' as unittest;
+
+import 'package:googleapis/androidenterprise/v1.dart' as api;
+
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
+
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+buildUnnamed243() {
+  var o = new core.List<api.AppRestrictionsSchemaRestriction>();
+  o.add(buildAppRestrictionsSchemaRestriction());
+  o.add(buildAppRestrictionsSchemaRestriction());
+  return o;
+}
+
+checkUnnamed243(core.List<api.AppRestrictionsSchemaRestriction> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkAppRestrictionsSchemaRestriction(o[0]);
+  checkAppRestrictionsSchemaRestriction(o[1]);
+}
+
+core.int buildCounterAppRestrictionsSchema = 0;
+buildAppRestrictionsSchema() {
+  var o = new api.AppRestrictionsSchema();
+  buildCounterAppRestrictionsSchema++;
+  if (buildCounterAppRestrictionsSchema < 3) {
+    o.restrictions = buildUnnamed243();
+  }
+  buildCounterAppRestrictionsSchema--;
+  return o;
+}
+
+checkAppRestrictionsSchema(api.AppRestrictionsSchema o) {
+  buildCounterAppRestrictionsSchema++;
+  if (buildCounterAppRestrictionsSchema < 3) {
+    checkUnnamed243(o.restrictions);
+  }
+  buildCounterAppRestrictionsSchema--;
+}
+
+buildUnnamed244() {
+  var o = new core.List<core.String>();
+  o.add("foo");
+  o.add("foo");
+  return o;
+}
+
+checkUnnamed244(core.List<core.String> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  unittest.expect(o[0], unittest.equals('foo'));
+  unittest.expect(o[1], unittest.equals('foo'));
+}
+
+buildUnnamed245() {
+  var o = new core.List<core.String>();
+  o.add("foo");
+  o.add("foo");
+  return o;
+}
+
+checkUnnamed245(core.List<core.String> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  unittest.expect(o[0], unittest.equals('foo'));
+  unittest.expect(o[1], unittest.equals('foo'));
+}
+
+core.int buildCounterAppRestrictionsSchemaRestriction = 0;
+buildAppRestrictionsSchemaRestriction() {
+  var o = new api.AppRestrictionsSchemaRestriction();
+  buildCounterAppRestrictionsSchemaRestriction++;
+  if (buildCounterAppRestrictionsSchemaRestriction < 3) {
+    o.defaultValue = buildAppRestrictionsSchemaRestrictionRestrictionValue();
+    o.description = "foo";
+    o.entry = buildUnnamed244();
+    o.entryValue = buildUnnamed245();
+    o.key = "foo";
+    o.restrictionType = "foo";
+    o.title = "foo";
+  }
+  buildCounterAppRestrictionsSchemaRestriction--;
+  return o;
+}
+
+checkAppRestrictionsSchemaRestriction(api.AppRestrictionsSchemaRestriction o) {
+  buildCounterAppRestrictionsSchemaRestriction++;
+  if (buildCounterAppRestrictionsSchemaRestriction < 3) {
+    checkAppRestrictionsSchemaRestrictionRestrictionValue(o.defaultValue);
+    unittest.expect(o.description, unittest.equals('foo'));
+    checkUnnamed244(o.entry);
+    checkUnnamed245(o.entryValue);
+    unittest.expect(o.key, unittest.equals('foo'));
+    unittest.expect(o.restrictionType, unittest.equals('foo'));
+    unittest.expect(o.title, unittest.equals('foo'));
+  }
+  buildCounterAppRestrictionsSchemaRestriction--;
+}
+
+buildUnnamed246() {
+  var o = new core.List<core.String>();
+  o.add("foo");
+  o.add("foo");
+  return o;
+}
+
+checkUnnamed246(core.List<core.String> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  unittest.expect(o[0], unittest.equals('foo'));
+  unittest.expect(o[1], unittest.equals('foo'));
+}
+
+core.int buildCounterAppRestrictionsSchemaRestrictionRestrictionValue = 0;
+buildAppRestrictionsSchemaRestrictionRestrictionValue() {
+  var o = new api.AppRestrictionsSchemaRestrictionRestrictionValue();
+  buildCounterAppRestrictionsSchemaRestrictionRestrictionValue++;
+  if (buildCounterAppRestrictionsSchemaRestrictionRestrictionValue < 3) {
+    o.type = "foo";
+    o.valueBool = true;
+    o.valueInteger = 42;
+    o.valueMultiselect = buildUnnamed246();
+    o.valueString = "foo";
+  }
+  buildCounterAppRestrictionsSchemaRestrictionRestrictionValue--;
+  return o;
+}
+
+checkAppRestrictionsSchemaRestrictionRestrictionValue(api.AppRestrictionsSchemaRestrictionRestrictionValue o) {
+  buildCounterAppRestrictionsSchemaRestrictionRestrictionValue++;
+  if (buildCounterAppRestrictionsSchemaRestrictionRestrictionValue < 3) {
+    unittest.expect(o.type, unittest.equals('foo'));
+    unittest.expect(o.valueBool, unittest.isTrue);
+    unittest.expect(o.valueInteger, unittest.equals(42));
+    checkUnnamed246(o.valueMultiselect);
+    unittest.expect(o.valueString, unittest.equals('foo'));
+  }
+  buildCounterAppRestrictionsSchemaRestrictionRestrictionValue--;
+}
+
+buildUnnamed247() {
+  var o = new core.List<core.String>();
+  o.add("foo");
+  o.add("foo");
+  return o;
+}
+
+checkUnnamed247(core.List<core.String> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  unittest.expect(o[0], unittest.equals('foo'));
+  unittest.expect(o[1], unittest.equals('foo'));
+}
+
+core.int buildCounterCollection = 0;
+buildCollection() {
+  var o = new api.Collection();
+  buildCounterCollection++;
+  if (buildCounterCollection < 3) {
+    o.collectionId = "foo";
+    o.kind = "foo";
+    o.name = "foo";
+    o.productId = buildUnnamed247();
+    o.visibility = "foo";
+  }
+  buildCounterCollection--;
+  return o;
+}
+
+checkCollection(api.Collection o) {
+  buildCounterCollection++;
+  if (buildCounterCollection < 3) {
+    unittest.expect(o.collectionId, unittest.equals('foo'));
+    unittest.expect(o.kind, unittest.equals('foo'));
+    unittest.expect(o.name, unittest.equals('foo'));
+    checkUnnamed247(o.productId);
+    unittest.expect(o.visibility, unittest.equals('foo'));
+  }
+  buildCounterCollection--;
+}
+
+buildUnnamed248() {
+  var o = new core.List<api.User>();
+  o.add(buildUser());
+  o.add(buildUser());
+  return o;
+}
+
+checkUnnamed248(core.List<api.User> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkUser(o[0]);
+  checkUser(o[1]);
+}
+
+core.int buildCounterCollectionViewersListResponse = 0;
+buildCollectionViewersListResponse() {
+  var o = new api.CollectionViewersListResponse();
+  buildCounterCollectionViewersListResponse++;
+  if (buildCounterCollectionViewersListResponse < 3) {
+    o.kind = "foo";
+    o.user = buildUnnamed248();
+  }
+  buildCounterCollectionViewersListResponse--;
+  return o;
+}
+
+checkCollectionViewersListResponse(api.CollectionViewersListResponse o) {
+  buildCounterCollectionViewersListResponse++;
+  if (buildCounterCollectionViewersListResponse < 3) {
+    unittest.expect(o.kind, unittest.equals('foo'));
+    checkUnnamed248(o.user);
+  }
+  buildCounterCollectionViewersListResponse--;
+}
+
+buildUnnamed249() {
+  var o = new core.List<api.Collection>();
+  o.add(buildCollection());
+  o.add(buildCollection());
+  return o;
+}
+
+checkUnnamed249(core.List<api.Collection> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkCollection(o[0]);
+  checkCollection(o[1]);
+}
+
+core.int buildCounterCollectionsListResponse = 0;
+buildCollectionsListResponse() {
+  var o = new api.CollectionsListResponse();
+  buildCounterCollectionsListResponse++;
+  if (buildCounterCollectionsListResponse < 3) {
+    o.collection = buildUnnamed249();
+    o.kind = "foo";
+  }
+  buildCounterCollectionsListResponse--;
+  return o;
+}
+
+checkCollectionsListResponse(api.CollectionsListResponse o) {
+  buildCounterCollectionsListResponse++;
+  if (buildCounterCollectionsListResponse < 3) {
+    checkUnnamed249(o.collection);
+    unittest.expect(o.kind, unittest.equals('foo'));
+  }
+  buildCounterCollectionsListResponse--;
+}
+
+core.int buildCounterDevice = 0;
+buildDevice() {
+  var o = new api.Device();
+  buildCounterDevice++;
+  if (buildCounterDevice < 3) {
+    o.androidId = "foo";
+    o.kind = "foo";
+  }
+  buildCounterDevice--;
+  return o;
+}
+
+checkDevice(api.Device o) {
+  buildCounterDevice++;
+  if (buildCounterDevice < 3) {
+    unittest.expect(o.androidId, unittest.equals('foo'));
+    unittest.expect(o.kind, unittest.equals('foo'));
+  }
+  buildCounterDevice--;
+}
+
+core.int buildCounterDeviceState = 0;
+buildDeviceState() {
+  var o = new api.DeviceState();
+  buildCounterDeviceState++;
+  if (buildCounterDeviceState < 3) {
+    o.accountState = "foo";
+    o.kind = "foo";
+  }
+  buildCounterDeviceState--;
+  return o;
+}
+
+checkDeviceState(api.DeviceState o) {
+  buildCounterDeviceState++;
+  if (buildCounterDeviceState < 3) {
+    unittest.expect(o.accountState, unittest.equals('foo'));
+    unittest.expect(o.kind, unittest.equals('foo'));
+  }
+  buildCounterDeviceState--;
+}
+
+buildUnnamed250() {
+  var o = new core.List<api.Device>();
+  o.add(buildDevice());
+  o.add(buildDevice());
+  return o;
+}
+
+checkUnnamed250(core.List<api.Device> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkDevice(o[0]);
+  checkDevice(o[1]);
+}
+
+core.int buildCounterDevicesListResponse = 0;
+buildDevicesListResponse() {
+  var o = new api.DevicesListResponse();
+  buildCounterDevicesListResponse++;
+  if (buildCounterDevicesListResponse < 3) {
+    o.device = buildUnnamed250();
+    o.kind = "foo";
+  }
+  buildCounterDevicesListResponse--;
+  return o;
+}
+
+checkDevicesListResponse(api.DevicesListResponse o) {
+  buildCounterDevicesListResponse++;
+  if (buildCounterDevicesListResponse < 3) {
+    checkUnnamed250(o.device);
+    unittest.expect(o.kind, unittest.equals('foo'));
+  }
+  buildCounterDevicesListResponse--;
+}
+
+core.int buildCounterEnterprise = 0;
+buildEnterprise() {
+  var o = new api.Enterprise();
+  buildCounterEnterprise++;
+  if (buildCounterEnterprise < 3) {
+    o.id = "foo";
+    o.kind = "foo";
+    o.name = "foo";
+    o.primaryDomain = "foo";
+  }
+  buildCounterEnterprise--;
+  return o;
+}
+
+checkEnterprise(api.Enterprise o) {
+  buildCounterEnterprise++;
+  if (buildCounterEnterprise < 3) {
+    unittest.expect(o.id, unittest.equals('foo'));
+    unittest.expect(o.kind, unittest.equals('foo'));
+    unittest.expect(o.name, unittest.equals('foo'));
+    unittest.expect(o.primaryDomain, unittest.equals('foo'));
+  }
+  buildCounterEnterprise--;
+}
+
+core.int buildCounterEnterpriseAccount = 0;
+buildEnterpriseAccount() {
+  var o = new api.EnterpriseAccount();
+  buildCounterEnterpriseAccount++;
+  if (buildCounterEnterpriseAccount < 3) {
+    o.accountEmail = "foo";
+    o.kind = "foo";
+  }
+  buildCounterEnterpriseAccount--;
+  return o;
+}
+
+checkEnterpriseAccount(api.EnterpriseAccount o) {
+  buildCounterEnterpriseAccount++;
+  if (buildCounterEnterpriseAccount < 3) {
+    unittest.expect(o.accountEmail, unittest.equals('foo'));
+    unittest.expect(o.kind, unittest.equals('foo'));
+  }
+  buildCounterEnterpriseAccount--;
+}
+
+buildUnnamed251() {
+  var o = new core.List<api.Enterprise>();
+  o.add(buildEnterprise());
+  o.add(buildEnterprise());
+  return o;
+}
+
+checkUnnamed251(core.List<api.Enterprise> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkEnterprise(o[0]);
+  checkEnterprise(o[1]);
+}
+
+core.int buildCounterEnterprisesListResponse = 0;
+buildEnterprisesListResponse() {
+  var o = new api.EnterprisesListResponse();
+  buildCounterEnterprisesListResponse++;
+  if (buildCounterEnterprisesListResponse < 3) {
+    o.enterprise = buildUnnamed251();
+    o.kind = "foo";
+  }
+  buildCounterEnterprisesListResponse--;
+  return o;
+}
+
+checkEnterprisesListResponse(api.EnterprisesListResponse o) {
+  buildCounterEnterprisesListResponse++;
+  if (buildCounterEnterprisesListResponse < 3) {
+    checkUnnamed251(o.enterprise);
+    unittest.expect(o.kind, unittest.equals('foo'));
+  }
+  buildCounterEnterprisesListResponse--;
+}
+
+core.int buildCounterEntitlement = 0;
+buildEntitlement() {
+  var o = new api.Entitlement();
+  buildCounterEntitlement++;
+  if (buildCounterEntitlement < 3) {
+    o.kind = "foo";
+    o.productId = "foo";
+    o.reason = "foo";
+  }
+  buildCounterEntitlement--;
+  return o;
+}
+
+checkEntitlement(api.Entitlement o) {
+  buildCounterEntitlement++;
+  if (buildCounterEntitlement < 3) {
+    unittest.expect(o.kind, unittest.equals('foo'));
+    unittest.expect(o.productId, unittest.equals('foo'));
+    unittest.expect(o.reason, unittest.equals('foo'));
+  }
+  buildCounterEntitlement--;
+}
+
+buildUnnamed252() {
+  var o = new core.List<api.Entitlement>();
+  o.add(buildEntitlement());
+  o.add(buildEntitlement());
+  return o;
+}
+
+checkUnnamed252(core.List<api.Entitlement> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkEntitlement(o[0]);
+  checkEntitlement(o[1]);
+}
+
+core.int buildCounterEntitlementsListResponse = 0;
+buildEntitlementsListResponse() {
+  var o = new api.EntitlementsListResponse();
+  buildCounterEntitlementsListResponse++;
+  if (buildCounterEntitlementsListResponse < 3) {
+    o.entitlement = buildUnnamed252();
+    o.kind = "foo";
+  }
+  buildCounterEntitlementsListResponse--;
+  return o;
+}
+
+checkEntitlementsListResponse(api.EntitlementsListResponse o) {
+  buildCounterEntitlementsListResponse++;
+  if (buildCounterEntitlementsListResponse < 3) {
+    checkUnnamed252(o.entitlement);
+    unittest.expect(o.kind, unittest.equals('foo'));
+  }
+  buildCounterEntitlementsListResponse--;
+}
+
+core.int buildCounterGroupLicense = 0;
+buildGroupLicense() {
+  var o = new api.GroupLicense();
+  buildCounterGroupLicense++;
+  if (buildCounterGroupLicense < 3) {
+    o.acquisitionKind = "foo";
+    o.approval = "foo";
+    o.kind = "foo";
+    o.numProvisioned = 42;
+    o.numPurchased = 42;
+    o.productId = "foo";
+  }
+  buildCounterGroupLicense--;
+  return o;
+}
+
+checkGroupLicense(api.GroupLicense o) {
+  buildCounterGroupLicense++;
+  if (buildCounterGroupLicense < 3) {
+    unittest.expect(o.acquisitionKind, unittest.equals('foo'));
+    unittest.expect(o.approval, unittest.equals('foo'));
+    unittest.expect(o.kind, unittest.equals('foo'));
+    unittest.expect(o.numProvisioned, unittest.equals(42));
+    unittest.expect(o.numPurchased, unittest.equals(42));
+    unittest.expect(o.productId, unittest.equals('foo'));
+  }
+  buildCounterGroupLicense--;
+}
+
+buildUnnamed253() {
+  var o = new core.List<api.User>();
+  o.add(buildUser());
+  o.add(buildUser());
+  return o;
+}
+
+checkUnnamed253(core.List<api.User> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkUser(o[0]);
+  checkUser(o[1]);
+}
+
+core.int buildCounterGroupLicenseUsersListResponse = 0;
+buildGroupLicenseUsersListResponse() {
+  var o = new api.GroupLicenseUsersListResponse();
+  buildCounterGroupLicenseUsersListResponse++;
+  if (buildCounterGroupLicenseUsersListResponse < 3) {
+    o.kind = "foo";
+    o.user = buildUnnamed253();
+  }
+  buildCounterGroupLicenseUsersListResponse--;
+  return o;
+}
+
+checkGroupLicenseUsersListResponse(api.GroupLicenseUsersListResponse o) {
+  buildCounterGroupLicenseUsersListResponse++;
+  if (buildCounterGroupLicenseUsersListResponse < 3) {
+    unittest.expect(o.kind, unittest.equals('foo'));
+    checkUnnamed253(o.user);
+  }
+  buildCounterGroupLicenseUsersListResponse--;
+}
+
+buildUnnamed254() {
+  var o = new core.List<api.GroupLicense>();
+  o.add(buildGroupLicense());
+  o.add(buildGroupLicense());
+  return o;
+}
+
+checkUnnamed254(core.List<api.GroupLicense> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkGroupLicense(o[0]);
+  checkGroupLicense(o[1]);
+}
+
+core.int buildCounterGroupLicensesListResponse = 0;
+buildGroupLicensesListResponse() {
+  var o = new api.GroupLicensesListResponse();
+  buildCounterGroupLicensesListResponse++;
+  if (buildCounterGroupLicensesListResponse < 3) {
+    o.groupLicense = buildUnnamed254();
+    o.kind = "foo";
+  }
+  buildCounterGroupLicensesListResponse--;
+  return o;
+}
+
+checkGroupLicensesListResponse(api.GroupLicensesListResponse o) {
+  buildCounterGroupLicensesListResponse++;
+  if (buildCounterGroupLicensesListResponse < 3) {
+    checkUnnamed254(o.groupLicense);
+    unittest.expect(o.kind, unittest.equals('foo'));
+  }
+  buildCounterGroupLicensesListResponse--;
+}
+
+core.int buildCounterInstall = 0;
+buildInstall() {
+  var o = new api.Install();
+  buildCounterInstall++;
+  if (buildCounterInstall < 3) {
+    o.installState = "foo";
+    o.kind = "foo";
+    o.productId = "foo";
+    o.versionCode = 42;
+  }
+  buildCounterInstall--;
+  return o;
+}
+
+checkInstall(api.Install o) {
+  buildCounterInstall++;
+  if (buildCounterInstall < 3) {
+    unittest.expect(o.installState, unittest.equals('foo'));
+    unittest.expect(o.kind, unittest.equals('foo'));
+    unittest.expect(o.productId, unittest.equals('foo'));
+    unittest.expect(o.versionCode, unittest.equals(42));
+  }
+  buildCounterInstall--;
+}
+
+buildUnnamed255() {
+  var o = new core.List<api.Install>();
+  o.add(buildInstall());
+  o.add(buildInstall());
+  return o;
+}
+
+checkUnnamed255(core.List<api.Install> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkInstall(o[0]);
+  checkInstall(o[1]);
+}
+
+core.int buildCounterInstallsListResponse = 0;
+buildInstallsListResponse() {
+  var o = new api.InstallsListResponse();
+  buildCounterInstallsListResponse++;
+  if (buildCounterInstallsListResponse < 3) {
+    o.install = buildUnnamed255();
+    o.kind = "foo";
+  }
+  buildCounterInstallsListResponse--;
+  return o;
+}
+
+checkInstallsListResponse(api.InstallsListResponse o) {
+  buildCounterInstallsListResponse++;
+  if (buildCounterInstallsListResponse < 3) {
+    checkUnnamed255(o.install);
+    unittest.expect(o.kind, unittest.equals('foo'));
+  }
+  buildCounterInstallsListResponse--;
+}
+
+core.int buildCounterPermission = 0;
+buildPermission() {
+  var o = new api.Permission();
+  buildCounterPermission++;
+  if (buildCounterPermission < 3) {
+    o.description = "foo";
+    o.kind = "foo";
+    o.name = "foo";
+    o.permissionId = "foo";
+  }
+  buildCounterPermission--;
+  return o;
+}
+
+checkPermission(api.Permission o) {
+  buildCounterPermission++;
+  if (buildCounterPermission < 3) {
+    unittest.expect(o.description, unittest.equals('foo'));
+    unittest.expect(o.kind, unittest.equals('foo'));
+    unittest.expect(o.name, unittest.equals('foo'));
+    unittest.expect(o.permissionId, unittest.equals('foo'));
+  }
+  buildCounterPermission--;
+}
+
+core.int buildCounterProduct = 0;
+buildProduct() {
+  var o = new api.Product();
+  buildCounterProduct++;
+  if (buildCounterProduct < 3) {
+    o.authorName = "foo";
+    o.detailsUrl = "foo";
+    o.iconUrl = "foo";
+    o.kind = "foo";
+    o.productId = "foo";
+    o.title = "foo";
+    o.workDetailsUrl = "foo";
+  }
+  buildCounterProduct--;
+  return o;
+}
+
+checkProduct(api.Product o) {
+  buildCounterProduct++;
+  if (buildCounterProduct < 3) {
+    unittest.expect(o.authorName, unittest.equals('foo'));
+    unittest.expect(o.detailsUrl, unittest.equals('foo'));
+    unittest.expect(o.iconUrl, unittest.equals('foo'));
+    unittest.expect(o.kind, unittest.equals('foo'));
+    unittest.expect(o.productId, unittest.equals('foo'));
+    unittest.expect(o.title, unittest.equals('foo'));
+    unittest.expect(o.workDetailsUrl, unittest.equals('foo'));
+  }
+  buildCounterProduct--;
+}
+
+core.int buildCounterProductPermission = 0;
+buildProductPermission() {
+  var o = new api.ProductPermission();
+  buildCounterProductPermission++;
+  if (buildCounterProductPermission < 3) {
+    o.permissionId = "foo";
+    o.state = "foo";
+  }
+  buildCounterProductPermission--;
+  return o;
+}
+
+checkProductPermission(api.ProductPermission o) {
+  buildCounterProductPermission++;
+  if (buildCounterProductPermission < 3) {
+    unittest.expect(o.permissionId, unittest.equals('foo'));
+    unittest.expect(o.state, unittest.equals('foo'));
+  }
+  buildCounterProductPermission--;
+}
+
+buildUnnamed256() {
+  var o = new core.List<api.ProductPermission>();
+  o.add(buildProductPermission());
+  o.add(buildProductPermission());
+  return o;
+}
+
+checkUnnamed256(core.List<api.ProductPermission> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkProductPermission(o[0]);
+  checkProductPermission(o[1]);
+}
+
+core.int buildCounterProductPermissions = 0;
+buildProductPermissions() {
+  var o = new api.ProductPermissions();
+  buildCounterProductPermissions++;
+  if (buildCounterProductPermissions < 3) {
+    o.kind = "foo";
+    o.permission = buildUnnamed256();
+    o.productId = "foo";
+  }
+  buildCounterProductPermissions--;
+  return o;
+}
+
+checkProductPermissions(api.ProductPermissions o) {
+  buildCounterProductPermissions++;
+  if (buildCounterProductPermissions < 3) {
+    unittest.expect(o.kind, unittest.equals('foo'));
+    checkUnnamed256(o.permission);
+    unittest.expect(o.productId, unittest.equals('foo'));
+  }
+  buildCounterProductPermissions--;
+}
+
+core.int buildCounterUser = 0;
+buildUser() {
+  var o = new api.User();
+  buildCounterUser++;
+  if (buildCounterUser < 3) {
+    o.id = "foo";
+    o.kind = "foo";
+    o.primaryEmail = "foo";
+  }
+  buildCounterUser--;
+  return o;
+}
+
+checkUser(api.User o) {
+  buildCounterUser++;
+  if (buildCounterUser < 3) {
+    unittest.expect(o.id, unittest.equals('foo'));
+    unittest.expect(o.kind, unittest.equals('foo'));
+    unittest.expect(o.primaryEmail, unittest.equals('foo'));
+  }
+  buildCounterUser--;
+}
+
+core.int buildCounterUserToken = 0;
+buildUserToken() {
+  var o = new api.UserToken();
+  buildCounterUserToken++;
+  if (buildCounterUserToken < 3) {
+    o.kind = "foo";
+    o.token = "foo";
+    o.userId = "foo";
+  }
+  buildCounterUserToken--;
+  return o;
+}
+
+checkUserToken(api.UserToken o) {
+  buildCounterUserToken++;
+  if (buildCounterUserToken < 3) {
+    unittest.expect(o.kind, unittest.equals('foo'));
+    unittest.expect(o.token, unittest.equals('foo'));
+    unittest.expect(o.userId, unittest.equals('foo'));
+  }
+  buildCounterUserToken--;
+}
+
+buildUnnamed257() {
+  var o = new core.List<api.User>();
+  o.add(buildUser());
+  o.add(buildUser());
+  return o;
+}
+
+checkUnnamed257(core.List<api.User> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkUser(o[0]);
+  checkUser(o[1]);
+}
+
+core.int buildCounterUsersListResponse = 0;
+buildUsersListResponse() {
+  var o = new api.UsersListResponse();
+  buildCounterUsersListResponse++;
+  if (buildCounterUsersListResponse < 3) {
+    o.kind = "foo";
+    o.user = buildUnnamed257();
+  }
+  buildCounterUsersListResponse--;
+  return o;
+}
+
+checkUsersListResponse(api.UsersListResponse o) {
+  buildCounterUsersListResponse++;
+  if (buildCounterUsersListResponse < 3) {
+    unittest.expect(o.kind, unittest.equals('foo'));
+    checkUnnamed257(o.user);
+  }
+  buildCounterUsersListResponse--;
+}
+
+
+main() {
+  unittest.group("obj-schema-AppRestrictionsSchema", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildAppRestrictionsSchema();
+      var od = new api.AppRestrictionsSchema.fromJson(o.toJson());
+      checkAppRestrictionsSchema(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-AppRestrictionsSchemaRestriction", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildAppRestrictionsSchemaRestriction();
+      var od = new api.AppRestrictionsSchemaRestriction.fromJson(o.toJson());
+      checkAppRestrictionsSchemaRestriction(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-AppRestrictionsSchemaRestrictionRestrictionValue", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildAppRestrictionsSchemaRestrictionRestrictionValue();
+      var od = new api.AppRestrictionsSchemaRestrictionRestrictionValue.fromJson(o.toJson());
+      checkAppRestrictionsSchemaRestrictionRestrictionValue(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-Collection", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildCollection();
+      var od = new api.Collection.fromJson(o.toJson());
+      checkCollection(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-CollectionViewersListResponse", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildCollectionViewersListResponse();
+      var od = new api.CollectionViewersListResponse.fromJson(o.toJson());
+      checkCollectionViewersListResponse(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-CollectionsListResponse", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildCollectionsListResponse();
+      var od = new api.CollectionsListResponse.fromJson(o.toJson());
+      checkCollectionsListResponse(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-Device", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildDevice();
+      var od = new api.Device.fromJson(o.toJson());
+      checkDevice(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-DeviceState", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildDeviceState();
+      var od = new api.DeviceState.fromJson(o.toJson());
+      checkDeviceState(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-DevicesListResponse", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildDevicesListResponse();
+      var od = new api.DevicesListResponse.fromJson(o.toJson());
+      checkDevicesListResponse(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-Enterprise", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildEnterprise();
+      var od = new api.Enterprise.fromJson(o.toJson());
+      checkEnterprise(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-EnterpriseAccount", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildEnterpriseAccount();
+      var od = new api.EnterpriseAccount.fromJson(o.toJson());
+      checkEnterpriseAccount(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-EnterprisesListResponse", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildEnterprisesListResponse();
+      var od = new api.EnterprisesListResponse.fromJson(o.toJson());
+      checkEnterprisesListResponse(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-Entitlement", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildEntitlement();
+      var od = new api.Entitlement.fromJson(o.toJson());
+      checkEntitlement(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-EntitlementsListResponse", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildEntitlementsListResponse();
+      var od = new api.EntitlementsListResponse.fromJson(o.toJson());
+      checkEntitlementsListResponse(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-GroupLicense", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildGroupLicense();
+      var od = new api.GroupLicense.fromJson(o.toJson());
+      checkGroupLicense(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-GroupLicenseUsersListResponse", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildGroupLicenseUsersListResponse();
+      var od = new api.GroupLicenseUsersListResponse.fromJson(o.toJson());
+      checkGroupLicenseUsersListResponse(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-GroupLicensesListResponse", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildGroupLicensesListResponse();
+      var od = new api.GroupLicensesListResponse.fromJson(o.toJson());
+      checkGroupLicensesListResponse(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-Install", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildInstall();
+      var od = new api.Install.fromJson(o.toJson());
+      checkInstall(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-InstallsListResponse", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildInstallsListResponse();
+      var od = new api.InstallsListResponse.fromJson(o.toJson());
+      checkInstallsListResponse(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-Permission", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildPermission();
+      var od = new api.Permission.fromJson(o.toJson());
+      checkPermission(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-Product", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildProduct();
+      var od = new api.Product.fromJson(o.toJson());
+      checkProduct(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-ProductPermission", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildProductPermission();
+      var od = new api.ProductPermission.fromJson(o.toJson());
+      checkProductPermission(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-ProductPermissions", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildProductPermissions();
+      var od = new api.ProductPermissions.fromJson(o.toJson());
+      checkProductPermissions(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-User", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildUser();
+      var od = new api.User.fromJson(o.toJson());
+      checkUser(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-UserToken", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildUserToken();
+      var od = new api.UserToken.fromJson(o.toJson());
+      checkUserToken(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-UsersListResponse", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildUsersListResponse();
+      var od = new api.UsersListResponse.fromJson(o.toJson());
+      checkUsersListResponse(od);
+    });
+  });
+
+
+  unittest.group("resource-CollectionsResourceApi", () {
+    unittest.test("method--delete", () {
+
+      var mock = new HttpServerMock();
+      api.CollectionsResourceApi res = new api.AndroidenterpriseApi(mock).collections;
+      var arg_enterpriseId = "foo";
+      var arg_collectionId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/collections/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("/collections/"));
+        pathOffset += 13;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_collectionId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = "";
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.delete(arg_enterpriseId, arg_collectionId).then(unittest.expectAsync((_) {}));
+    });
+
+    unittest.test("method--get", () {
+
+      var mock = new HttpServerMock();
+      api.CollectionsResourceApi res = new api.AndroidenterpriseApi(mock).collections;
+      var arg_enterpriseId = "foo";
+      var arg_collectionId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/collections/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("/collections/"));
+        pathOffset += 13;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_collectionId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildCollection());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.get(arg_enterpriseId, arg_collectionId).then(unittest.expectAsync(((api.Collection response) {
+        checkCollection(response);
+      })));
+    });
+
+    unittest.test("method--insert", () {
+
+      var mock = new HttpServerMock();
+      api.CollectionsResourceApi res = new api.AndroidenterpriseApi(mock).collections;
+      var arg_request = buildCollection();
+      var arg_enterpriseId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var obj = new api.Collection.fromJson(json);
+        checkCollection(obj);
+
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/collections", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("/collections"));
+        pathOffset += 12;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildCollection());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.insert(arg_request, arg_enterpriseId).then(unittest.expectAsync(((api.Collection response) {
+        checkCollection(response);
+      })));
+    });
+
+    unittest.test("method--list", () {
+
+      var mock = new HttpServerMock();
+      api.CollectionsResourceApi res = new api.AndroidenterpriseApi(mock).collections;
+      var arg_enterpriseId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/collections", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("/collections"));
+        pathOffset += 12;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildCollectionsListResponse());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.list(arg_enterpriseId).then(unittest.expectAsync(((api.CollectionsListResponse response) {
+        checkCollectionsListResponse(response);
+      })));
+    });
+
+    unittest.test("method--patch", () {
+
+      var mock = new HttpServerMock();
+      api.CollectionsResourceApi res = new api.AndroidenterpriseApi(mock).collections;
+      var arg_request = buildCollection();
+      var arg_enterpriseId = "foo";
+      var arg_collectionId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var obj = new api.Collection.fromJson(json);
+        checkCollection(obj);
+
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/collections/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("/collections/"));
+        pathOffset += 13;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_collectionId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildCollection());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.patch(arg_request, arg_enterpriseId, arg_collectionId).then(unittest.expectAsync(((api.Collection response) {
+        checkCollection(response);
+      })));
+    });
+
+    unittest.test("method--update", () {
+
+      var mock = new HttpServerMock();
+      api.CollectionsResourceApi res = new api.AndroidenterpriseApi(mock).collections;
+      var arg_request = buildCollection();
+      var arg_enterpriseId = "foo";
+      var arg_collectionId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var obj = new api.Collection.fromJson(json);
+        checkCollection(obj);
+
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/collections/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("/collections/"));
+        pathOffset += 13;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_collectionId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildCollection());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.update(arg_request, arg_enterpriseId, arg_collectionId).then(unittest.expectAsync(((api.Collection response) {
+        checkCollection(response);
+      })));
+    });
+
+  });
+
+
+  unittest.group("resource-CollectionviewersResourceApi", () {
+    unittest.test("method--delete", () {
+
+      var mock = new HttpServerMock();
+      api.CollectionviewersResourceApi res = new api.AndroidenterpriseApi(mock).collectionviewers;
+      var arg_enterpriseId = "foo";
+      var arg_collectionId = "foo";
+      var arg_userId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/collections/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("/collections/"));
+        pathOffset += 13;
+        index = path.indexOf("/users/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_collectionId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("/users/"));
+        pathOffset += 7;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_userId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = "";
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.delete(arg_enterpriseId, arg_collectionId, arg_userId).then(unittest.expectAsync((_) {}));
+    });
+
+    unittest.test("method--get", () {
+
+      var mock = new HttpServerMock();
+      api.CollectionviewersResourceApi res = new api.AndroidenterpriseApi(mock).collectionviewers;
+      var arg_enterpriseId = "foo";
+      var arg_collectionId = "foo";
+      var arg_userId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/collections/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("/collections/"));
+        pathOffset += 13;
+        index = path.indexOf("/users/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_collectionId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("/users/"));
+        pathOffset += 7;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_userId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildUser());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.get(arg_enterpriseId, arg_collectionId, arg_userId).then(unittest.expectAsync(((api.User response) {
+        checkUser(response);
+      })));
+    });
+
+    unittest.test("method--list", () {
+
+      var mock = new HttpServerMock();
+      api.CollectionviewersResourceApi res = new api.AndroidenterpriseApi(mock).collectionviewers;
+      var arg_enterpriseId = "foo";
+      var arg_collectionId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/collections/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("/collections/"));
+        pathOffset += 13;
+        index = path.indexOf("/users", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_collectionId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 6), unittest.equals("/users"));
+        pathOffset += 6;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildCollectionViewersListResponse());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.list(arg_enterpriseId, arg_collectionId).then(unittest.expectAsync(((api.CollectionViewersListResponse response) {
+        checkCollectionViewersListResponse(response);
+      })));
+    });
+
+    unittest.test("method--patch", () {
+
+      var mock = new HttpServerMock();
+      api.CollectionviewersResourceApi res = new api.AndroidenterpriseApi(mock).collectionviewers;
+      var arg_request = buildUser();
+      var arg_enterpriseId = "foo";
+      var arg_collectionId = "foo";
+      var arg_userId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var obj = new api.User.fromJson(json);
+        checkUser(obj);
+
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/collections/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("/collections/"));
+        pathOffset += 13;
+        index = path.indexOf("/users/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_collectionId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("/users/"));
+        pathOffset += 7;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_userId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildUser());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.patch(arg_request, arg_enterpriseId, arg_collectionId, arg_userId).then(unittest.expectAsync(((api.User response) {
+        checkUser(response);
+      })));
+    });
+
+    unittest.test("method--update", () {
+
+      var mock = new HttpServerMock();
+      api.CollectionviewersResourceApi res = new api.AndroidenterpriseApi(mock).collectionviewers;
+      var arg_request = buildUser();
+      var arg_enterpriseId = "foo";
+      var arg_collectionId = "foo";
+      var arg_userId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var obj = new api.User.fromJson(json);
+        checkUser(obj);
+
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/collections/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("/collections/"));
+        pathOffset += 13;
+        index = path.indexOf("/users/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_collectionId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("/users/"));
+        pathOffset += 7;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_userId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildUser());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.update(arg_request, arg_enterpriseId, arg_collectionId, arg_userId).then(unittest.expectAsync(((api.User response) {
+        checkUser(response);
+      })));
+    });
+
+  });
+
+
+  unittest.group("resource-DevicesResourceApi", () {
+    unittest.test("method--get", () {
+
+      var mock = new HttpServerMock();
+      api.DevicesResourceApi res = new api.AndroidenterpriseApi(mock).devices;
+      var arg_enterpriseId = "foo";
+      var arg_userId = "foo";
+      var arg_deviceId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/users/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("/users/"));
+        pathOffset += 7;
+        index = path.indexOf("/devices/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_userId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("/devices/"));
+        pathOffset += 9;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_deviceId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildDevice());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.get(arg_enterpriseId, arg_userId, arg_deviceId).then(unittest.expectAsync(((api.Device response) {
+        checkDevice(response);
+      })));
+    });
+
+    unittest.test("method--getState", () {
+
+      var mock = new HttpServerMock();
+      api.DevicesResourceApi res = new api.AndroidenterpriseApi(mock).devices;
+      var arg_enterpriseId = "foo";
+      var arg_userId = "foo";
+      var arg_deviceId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/users/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("/users/"));
+        pathOffset += 7;
+        index = path.indexOf("/devices/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_userId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("/devices/"));
+        pathOffset += 9;
+        index = path.indexOf("/state", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_deviceId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 6), unittest.equals("/state"));
+        pathOffset += 6;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildDeviceState());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.getState(arg_enterpriseId, arg_userId, arg_deviceId).then(unittest.expectAsync(((api.DeviceState response) {
+        checkDeviceState(response);
+      })));
+    });
+
+    unittest.test("method--list", () {
+
+      var mock = new HttpServerMock();
+      api.DevicesResourceApi res = new api.AndroidenterpriseApi(mock).devices;
+      var arg_enterpriseId = "foo";
+      var arg_userId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/users/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("/users/"));
+        pathOffset += 7;
+        index = path.indexOf("/devices", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_userId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 8), unittest.equals("/devices"));
+        pathOffset += 8;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildDevicesListResponse());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.list(arg_enterpriseId, arg_userId).then(unittest.expectAsync(((api.DevicesListResponse response) {
+        checkDevicesListResponse(response);
+      })));
+    });
+
+    unittest.test("method--setState", () {
+
+      var mock = new HttpServerMock();
+      api.DevicesResourceApi res = new api.AndroidenterpriseApi(mock).devices;
+      var arg_request = buildDeviceState();
+      var arg_enterpriseId = "foo";
+      var arg_userId = "foo";
+      var arg_deviceId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var obj = new api.DeviceState.fromJson(json);
+        checkDeviceState(obj);
+
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/users/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("/users/"));
+        pathOffset += 7;
+        index = path.indexOf("/devices/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_userId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("/devices/"));
+        pathOffset += 9;
+        index = path.indexOf("/state", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_deviceId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 6), unittest.equals("/state"));
+        pathOffset += 6;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildDeviceState());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.setState(arg_request, arg_enterpriseId, arg_userId, arg_deviceId).then(unittest.expectAsync(((api.DeviceState response) {
+        checkDeviceState(response);
+      })));
+    });
+
+  });
+
+
+  unittest.group("resource-EnterprisesResourceApi", () {
+    unittest.test("method--delete", () {
+
+      var mock = new HttpServerMock();
+      api.EnterprisesResourceApi res = new api.AndroidenterpriseApi(mock).enterprises;
+      var arg_enterpriseId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = "";
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.delete(arg_enterpriseId).then(unittest.expectAsync((_) {}));
+    });
+
+    unittest.test("method--enroll", () {
+
+      var mock = new HttpServerMock();
+      api.EnterprisesResourceApi res = new api.AndroidenterpriseApi(mock).enterprises;
+      var arg_request = buildEnterprise();
+      var arg_token = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var obj = new api.Enterprise.fromJson(json);
+        checkEnterprise(obj);
+
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 18), unittest.equals("enterprises/enroll"));
+        pathOffset += 18;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+        unittest.expect(queryMap["token"].first, unittest.equals(arg_token));
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildEnterprise());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.enroll(arg_request, arg_token).then(unittest.expectAsync(((api.Enterprise response) {
+        checkEnterprise(response);
+      })));
+    });
+
+    unittest.test("method--get", () {
+
+      var mock = new HttpServerMock();
+      api.EnterprisesResourceApi res = new api.AndroidenterpriseApi(mock).enterprises;
+      var arg_enterpriseId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildEnterprise());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.get(arg_enterpriseId).then(unittest.expectAsync(((api.Enterprise response) {
+        checkEnterprise(response);
+      })));
+    });
+
+    unittest.test("method--insert", () {
+
+      var mock = new HttpServerMock();
+      api.EnterprisesResourceApi res = new api.AndroidenterpriseApi(mock).enterprises;
+      var arg_request = buildEnterprise();
+      var arg_token = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var obj = new api.Enterprise.fromJson(json);
+        checkEnterprise(obj);
+
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 11), unittest.equals("enterprises"));
+        pathOffset += 11;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+        unittest.expect(queryMap["token"].first, unittest.equals(arg_token));
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildEnterprise());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.insert(arg_request, arg_token).then(unittest.expectAsync(((api.Enterprise response) {
+        checkEnterprise(response);
+      })));
+    });
+
+    unittest.test("method--list", () {
+
+      var mock = new HttpServerMock();
+      api.EnterprisesResourceApi res = new api.AndroidenterpriseApi(mock).enterprises;
+      var arg_domain = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 11), unittest.equals("enterprises"));
+        pathOffset += 11;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+        unittest.expect(queryMap["domain"].first, unittest.equals(arg_domain));
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildEnterprisesListResponse());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.list(arg_domain).then(unittest.expectAsync(((api.EnterprisesListResponse response) {
+        checkEnterprisesListResponse(response);
+      })));
+    });
+
+    unittest.test("method--setAccount", () {
+
+      var mock = new HttpServerMock();
+      api.EnterprisesResourceApi res = new api.AndroidenterpriseApi(mock).enterprises;
+      var arg_request = buildEnterpriseAccount();
+      var arg_enterpriseId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var obj = new api.EnterpriseAccount.fromJson(json);
+        checkEnterpriseAccount(obj);
+
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/account", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 8), unittest.equals("/account"));
+        pathOffset += 8;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildEnterpriseAccount());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.setAccount(arg_request, arg_enterpriseId).then(unittest.expectAsync(((api.EnterpriseAccount response) {
+        checkEnterpriseAccount(response);
+      })));
+    });
+
+    unittest.test("method--unenroll", () {
+
+      var mock = new HttpServerMock();
+      api.EnterprisesResourceApi res = new api.AndroidenterpriseApi(mock).enterprises;
+      var arg_enterpriseId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/unenroll", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("/unenroll"));
+        pathOffset += 9;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = "";
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.unenroll(arg_enterpriseId).then(unittest.expectAsync((_) {}));
+    });
+
+  });
+
+
+  unittest.group("resource-EntitlementsResourceApi", () {
+    unittest.test("method--delete", () {
+
+      var mock = new HttpServerMock();
+      api.EntitlementsResourceApi res = new api.AndroidenterpriseApi(mock).entitlements;
+      var arg_enterpriseId = "foo";
+      var arg_userId = "foo";
+      var arg_entitlementId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/users/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("/users/"));
+        pathOffset += 7;
+        index = path.indexOf("/entitlements/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_userId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 14), unittest.equals("/entitlements/"));
+        pathOffset += 14;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_entitlementId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = "";
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.delete(arg_enterpriseId, arg_userId, arg_entitlementId).then(unittest.expectAsync((_) {}));
+    });
+
+    unittest.test("method--get", () {
+
+      var mock = new HttpServerMock();
+      api.EntitlementsResourceApi res = new api.AndroidenterpriseApi(mock).entitlements;
+      var arg_enterpriseId = "foo";
+      var arg_userId = "foo";
+      var arg_entitlementId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/users/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("/users/"));
+        pathOffset += 7;
+        index = path.indexOf("/entitlements/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_userId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 14), unittest.equals("/entitlements/"));
+        pathOffset += 14;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_entitlementId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildEntitlement());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.get(arg_enterpriseId, arg_userId, arg_entitlementId).then(unittest.expectAsync(((api.Entitlement response) {
+        checkEntitlement(response);
+      })));
+    });
+
+    unittest.test("method--list", () {
+
+      var mock = new HttpServerMock();
+      api.EntitlementsResourceApi res = new api.AndroidenterpriseApi(mock).entitlements;
+      var arg_enterpriseId = "foo";
+      var arg_userId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/users/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("/users/"));
+        pathOffset += 7;
+        index = path.indexOf("/entitlements", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_userId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("/entitlements"));
+        pathOffset += 13;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildEntitlementsListResponse());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.list(arg_enterpriseId, arg_userId).then(unittest.expectAsync(((api.EntitlementsListResponse response) {
+        checkEntitlementsListResponse(response);
+      })));
+    });
+
+    unittest.test("method--patch", () {
+
+      var mock = new HttpServerMock();
+      api.EntitlementsResourceApi res = new api.AndroidenterpriseApi(mock).entitlements;
+      var arg_request = buildEntitlement();
+      var arg_enterpriseId = "foo";
+      var arg_userId = "foo";
+      var arg_entitlementId = "foo";
+      var arg_install = true;
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var obj = new api.Entitlement.fromJson(json);
+        checkEntitlement(obj);
+
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/users/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("/users/"));
+        pathOffset += 7;
+        index = path.indexOf("/entitlements/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_userId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 14), unittest.equals("/entitlements/"));
+        pathOffset += 14;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_entitlementId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+        unittest.expect(queryMap["install"].first, unittest.equals("$arg_install"));
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildEntitlement());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.patch(arg_request, arg_enterpriseId, arg_userId, arg_entitlementId, install: arg_install).then(unittest.expectAsync(((api.Entitlement response) {
+        checkEntitlement(response);
+      })));
+    });
+
+    unittest.test("method--update", () {
+
+      var mock = new HttpServerMock();
+      api.EntitlementsResourceApi res = new api.AndroidenterpriseApi(mock).entitlements;
+      var arg_request = buildEntitlement();
+      var arg_enterpriseId = "foo";
+      var arg_userId = "foo";
+      var arg_entitlementId = "foo";
+      var arg_install = true;
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var obj = new api.Entitlement.fromJson(json);
+        checkEntitlement(obj);
+
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/users/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("/users/"));
+        pathOffset += 7;
+        index = path.indexOf("/entitlements/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_userId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 14), unittest.equals("/entitlements/"));
+        pathOffset += 14;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_entitlementId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+        unittest.expect(queryMap["install"].first, unittest.equals("$arg_install"));
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildEntitlement());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.update(arg_request, arg_enterpriseId, arg_userId, arg_entitlementId, install: arg_install).then(unittest.expectAsync(((api.Entitlement response) {
+        checkEntitlement(response);
+      })));
+    });
+
+  });
+
+
+  unittest.group("resource-GrouplicensesResourceApi", () {
+    unittest.test("method--get", () {
+
+      var mock = new HttpServerMock();
+      api.GrouplicensesResourceApi res = new api.AndroidenterpriseApi(mock).grouplicenses;
+      var arg_enterpriseId = "foo";
+      var arg_groupLicenseId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/groupLicenses/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 15), unittest.equals("/groupLicenses/"));
+        pathOffset += 15;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_groupLicenseId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildGroupLicense());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.get(arg_enterpriseId, arg_groupLicenseId).then(unittest.expectAsync(((api.GroupLicense response) {
+        checkGroupLicense(response);
+      })));
+    });
+
+    unittest.test("method--list", () {
+
+      var mock = new HttpServerMock();
+      api.GrouplicensesResourceApi res = new api.AndroidenterpriseApi(mock).grouplicenses;
+      var arg_enterpriseId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/groupLicenses", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 14), unittest.equals("/groupLicenses"));
+        pathOffset += 14;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildGroupLicensesListResponse());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.list(arg_enterpriseId).then(unittest.expectAsync(((api.GroupLicensesListResponse response) {
+        checkGroupLicensesListResponse(response);
+      })));
+    });
+
+  });
+
+
+  unittest.group("resource-GrouplicenseusersResourceApi", () {
+    unittest.test("method--list", () {
+
+      var mock = new HttpServerMock();
+      api.GrouplicenseusersResourceApi res = new api.AndroidenterpriseApi(mock).grouplicenseusers;
+      var arg_enterpriseId = "foo";
+      var arg_groupLicenseId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/groupLicenses/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 15), unittest.equals("/groupLicenses/"));
+        pathOffset += 15;
+        index = path.indexOf("/users", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_groupLicenseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 6), unittest.equals("/users"));
+        pathOffset += 6;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildGroupLicenseUsersListResponse());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.list(arg_enterpriseId, arg_groupLicenseId).then(unittest.expectAsync(((api.GroupLicenseUsersListResponse response) {
+        checkGroupLicenseUsersListResponse(response);
+      })));
+    });
+
+  });
+
+
+  unittest.group("resource-InstallsResourceApi", () {
+    unittest.test("method--delete", () {
+
+      var mock = new HttpServerMock();
+      api.InstallsResourceApi res = new api.AndroidenterpriseApi(mock).installs;
+      var arg_enterpriseId = "foo";
+      var arg_userId = "foo";
+      var arg_deviceId = "foo";
+      var arg_installId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/users/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("/users/"));
+        pathOffset += 7;
+        index = path.indexOf("/devices/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_userId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("/devices/"));
+        pathOffset += 9;
+        index = path.indexOf("/installs/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_deviceId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 10), unittest.equals("/installs/"));
+        pathOffset += 10;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_installId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = "";
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.delete(arg_enterpriseId, arg_userId, arg_deviceId, arg_installId).then(unittest.expectAsync((_) {}));
+    });
+
+    unittest.test("method--get", () {
+
+      var mock = new HttpServerMock();
+      api.InstallsResourceApi res = new api.AndroidenterpriseApi(mock).installs;
+      var arg_enterpriseId = "foo";
+      var arg_userId = "foo";
+      var arg_deviceId = "foo";
+      var arg_installId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/users/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("/users/"));
+        pathOffset += 7;
+        index = path.indexOf("/devices/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_userId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("/devices/"));
+        pathOffset += 9;
+        index = path.indexOf("/installs/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_deviceId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 10), unittest.equals("/installs/"));
+        pathOffset += 10;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_installId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildInstall());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.get(arg_enterpriseId, arg_userId, arg_deviceId, arg_installId).then(unittest.expectAsync(((api.Install response) {
+        checkInstall(response);
+      })));
+    });
+
+    unittest.test("method--list", () {
+
+      var mock = new HttpServerMock();
+      api.InstallsResourceApi res = new api.AndroidenterpriseApi(mock).installs;
+      var arg_enterpriseId = "foo";
+      var arg_userId = "foo";
+      var arg_deviceId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/users/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("/users/"));
+        pathOffset += 7;
+        index = path.indexOf("/devices/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_userId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("/devices/"));
+        pathOffset += 9;
+        index = path.indexOf("/installs", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_deviceId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("/installs"));
+        pathOffset += 9;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildInstallsListResponse());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.list(arg_enterpriseId, arg_userId, arg_deviceId).then(unittest.expectAsync(((api.InstallsListResponse response) {
+        checkInstallsListResponse(response);
+      })));
+    });
+
+    unittest.test("method--patch", () {
+
+      var mock = new HttpServerMock();
+      api.InstallsResourceApi res = new api.AndroidenterpriseApi(mock).installs;
+      var arg_request = buildInstall();
+      var arg_enterpriseId = "foo";
+      var arg_userId = "foo";
+      var arg_deviceId = "foo";
+      var arg_installId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var obj = new api.Install.fromJson(json);
+        checkInstall(obj);
+
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/users/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("/users/"));
+        pathOffset += 7;
+        index = path.indexOf("/devices/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_userId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("/devices/"));
+        pathOffset += 9;
+        index = path.indexOf("/installs/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_deviceId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 10), unittest.equals("/installs/"));
+        pathOffset += 10;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_installId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildInstall());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.patch(arg_request, arg_enterpriseId, arg_userId, arg_deviceId, arg_installId).then(unittest.expectAsync(((api.Install response) {
+        checkInstall(response);
+      })));
+    });
+
+    unittest.test("method--update", () {
+
+      var mock = new HttpServerMock();
+      api.InstallsResourceApi res = new api.AndroidenterpriseApi(mock).installs;
+      var arg_request = buildInstall();
+      var arg_enterpriseId = "foo";
+      var arg_userId = "foo";
+      var arg_deviceId = "foo";
+      var arg_installId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var obj = new api.Install.fromJson(json);
+        checkInstall(obj);
+
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/users/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("/users/"));
+        pathOffset += 7;
+        index = path.indexOf("/devices/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_userId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("/devices/"));
+        pathOffset += 9;
+        index = path.indexOf("/installs/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_deviceId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 10), unittest.equals("/installs/"));
+        pathOffset += 10;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_installId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildInstall());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.update(arg_request, arg_enterpriseId, arg_userId, arg_deviceId, arg_installId).then(unittest.expectAsync(((api.Install response) {
+        checkInstall(response);
+      })));
+    });
+
+  });
+
+
+  unittest.group("resource-PermissionsResourceApi", () {
+    unittest.test("method--get", () {
+
+      var mock = new HttpServerMock();
+      api.PermissionsResourceApi res = new api.AndroidenterpriseApi(mock).permissions;
+      var arg_permissionId = "foo";
+      var arg_language = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("permissions/"));
+        pathOffset += 12;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_permissionId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+        unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildPermission());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.get(arg_permissionId, language: arg_language).then(unittest.expectAsync(((api.Permission response) {
+        checkPermission(response);
+      })));
+    });
+
+  });
+
+
+  unittest.group("resource-ProductsResourceApi", () {
+    unittest.test("method--get", () {
+
+      var mock = new HttpServerMock();
+      api.ProductsResourceApi res = new api.AndroidenterpriseApi(mock).products;
+      var arg_enterpriseId = "foo";
+      var arg_productId = "foo";
+      var arg_language = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/products/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 10), unittest.equals("/products/"));
+        pathOffset += 10;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_productId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+        unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildProduct());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.get(arg_enterpriseId, arg_productId, language: arg_language).then(unittest.expectAsync(((api.Product response) {
+        checkProduct(response);
+      })));
+    });
+
+    unittest.test("method--getAppRestrictionsSchema", () {
+
+      var mock = new HttpServerMock();
+      api.ProductsResourceApi res = new api.AndroidenterpriseApi(mock).products;
+      var arg_enterpriseId = "foo";
+      var arg_productId = "foo";
+      var arg_language = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/products/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 10), unittest.equals("/products/"));
+        pathOffset += 10;
+        index = path.indexOf("/appRestrictionsSchema", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_productId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 22), unittest.equals("/appRestrictionsSchema"));
+        pathOffset += 22;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+        unittest.expect(queryMap["language"].first, unittest.equals(arg_language));
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildAppRestrictionsSchema());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.getAppRestrictionsSchema(arg_enterpriseId, arg_productId, language: arg_language).then(unittest.expectAsync(((api.AppRestrictionsSchema response) {
+        checkAppRestrictionsSchema(response);
+      })));
+    });
+
+    unittest.test("method--getPermissions", () {
+
+      var mock = new HttpServerMock();
+      api.ProductsResourceApi res = new api.AndroidenterpriseApi(mock).products;
+      var arg_enterpriseId = "foo";
+      var arg_productId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/products/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 10), unittest.equals("/products/"));
+        pathOffset += 10;
+        index = path.indexOf("/permissions", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_productId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("/permissions"));
+        pathOffset += 12;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildProductPermissions());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.getPermissions(arg_enterpriseId, arg_productId).then(unittest.expectAsync(((api.ProductPermissions response) {
+        checkProductPermissions(response);
+      })));
+    });
+
+    unittest.test("method--updatePermissions", () {
+
+      var mock = new HttpServerMock();
+      api.ProductsResourceApi res = new api.AndroidenterpriseApi(mock).products;
+      var arg_request = buildProductPermissions();
+      var arg_enterpriseId = "foo";
+      var arg_productId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var obj = new api.ProductPermissions.fromJson(json);
+        checkProductPermissions(obj);
+
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/products/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 10), unittest.equals("/products/"));
+        pathOffset += 10;
+        index = path.indexOf("/permissions", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_productId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("/permissions"));
+        pathOffset += 12;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildProductPermissions());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.updatePermissions(arg_request, arg_enterpriseId, arg_productId).then(unittest.expectAsync(((api.ProductPermissions response) {
+        checkProductPermissions(response);
+      })));
+    });
+
+  });
+
+
+  unittest.group("resource-UsersResourceApi", () {
+    unittest.test("method--generateToken", () {
+
+      var mock = new HttpServerMock();
+      api.UsersResourceApi res = new api.AndroidenterpriseApi(mock).users;
+      var arg_enterpriseId = "foo";
+      var arg_userId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/users/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("/users/"));
+        pathOffset += 7;
+        index = path.indexOf("/token", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_userId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 6), unittest.equals("/token"));
+        pathOffset += 6;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildUserToken());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.generateToken(arg_enterpriseId, arg_userId).then(unittest.expectAsync(((api.UserToken response) {
+        checkUserToken(response);
+      })));
+    });
+
+    unittest.test("method--get", () {
+
+      var mock = new HttpServerMock();
+      api.UsersResourceApi res = new api.AndroidenterpriseApi(mock).users;
+      var arg_enterpriseId = "foo";
+      var arg_userId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/users/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("/users/"));
+        pathOffset += 7;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_userId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildUser());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.get(arg_enterpriseId, arg_userId).then(unittest.expectAsync(((api.User response) {
+        checkUser(response);
+      })));
+    });
+
+    unittest.test("method--list", () {
+
+      var mock = new HttpServerMock();
+      api.UsersResourceApi res = new api.AndroidenterpriseApi(mock).users;
+      var arg_enterpriseId = "foo";
+      var arg_email = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/users", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 6), unittest.equals("/users"));
+        pathOffset += 6;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+        unittest.expect(queryMap["email"].first, unittest.equals(arg_email));
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildUsersListResponse());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.list(arg_enterpriseId, arg_email).then(unittest.expectAsync(((api.UsersListResponse response) {
+        checkUsersListResponse(response);
+      })));
+    });
+
+    unittest.test("method--revokeToken", () {
+
+      var mock = new HttpServerMock();
+      api.UsersResourceApi res = new api.AndroidenterpriseApi(mock).users;
+      var arg_enterpriseId = "foo";
+      var arg_userId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 21), unittest.equals("androidenterprise/v1/"));
+        pathOffset += 21;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("enterprises/"));
+        pathOffset += 12;
+        index = path.indexOf("/users/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_enterpriseId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("/users/"));
+        pathOffset += 7;
+        index = path.indexOf("/token", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_userId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 6), unittest.equals("/token"));
+        pathOffset += 6;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = "";
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.revokeToken(arg_enterpriseId, arg_userId).then(unittest.expectAsync((_) {}));
+    });
+
+  });
+
+
+}
+
diff --git a/generated/googleapis/test/androidpublisher/v2_test.dart b/generated/googleapis/test/androidpublisher/v2_test.dart
index e468465..0a6aa88 100644
--- a/generated/googleapis/test/androidpublisher/v2_test.dart
+++ b/generated/googleapis/test/androidpublisher/v2_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/androidpublisher/v2.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterApk = 0;
 buildApk() {
@@ -77,14 +112,14 @@
   buildCounterApkListing--;
 }
 
-buildUnnamed1393() {
+buildUnnamed258() {
   var o = new core.List<api.ApkListing>();
   o.add(buildApkListing());
   o.add(buildApkListing());
   return o;
 }
 
-checkUnnamed1393(core.List<api.ApkListing> o) {
+checkUnnamed258(core.List<api.ApkListing> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkApkListing(o[0]);
   checkApkListing(o[1]);
@@ -96,7 +131,7 @@
   buildCounterApkListingsListResponse++;
   if (buildCounterApkListingsListResponse < 3) {
     o.kind = "foo";
-    o.listings = buildUnnamed1393();
+    o.listings = buildUnnamed258();
   }
   buildCounterApkListingsListResponse--;
   return o;
@@ -106,7 +141,7 @@
   buildCounterApkListingsListResponse++;
   if (buildCounterApkListingsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1393(o.listings);
+    checkUnnamed258(o.listings);
   }
   buildCounterApkListingsListResponse--;
 }
@@ -149,14 +184,14 @@
   buildCounterApksAddExternallyHostedResponse--;
 }
 
-buildUnnamed1394() {
+buildUnnamed259() {
   var o = new core.List<api.Apk>();
   o.add(buildApk());
   o.add(buildApk());
   return o;
 }
 
-checkUnnamed1394(core.List<api.Apk> o) {
+checkUnnamed259(core.List<api.Apk> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkApk(o[0]);
   checkApk(o[1]);
@@ -167,7 +202,7 @@
   var o = new api.ApksListResponse();
   buildCounterApksListResponse++;
   if (buildCounterApksListResponse < 3) {
-    o.apks = buildUnnamed1394();
+    o.apks = buildUnnamed259();
     o.kind = "foo";
   }
   buildCounterApksListResponse--;
@@ -177,7 +212,7 @@
 checkApksListResponse(api.ApksListResponse o) {
   buildCounterApksListResponse++;
   if (buildCounterApksListResponse < 3) {
-    checkUnnamed1394(o.apks);
+    checkUnnamed259(o.apks);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterApksListResponse--;
@@ -269,53 +304,53 @@
   buildCounterExpansionFilesUploadResponse--;
 }
 
-buildUnnamed1395() {
+buildUnnamed260() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1395(core.List<core.String> o) {
+checkUnnamed260(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1396() {
+buildUnnamed261() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1396(core.List<core.String> o) {
+checkUnnamed261(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1397() {
+buildUnnamed262() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1397(core.List<core.String> o) {
+checkUnnamed262(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1398() {
+buildUnnamed263() {
   var o = new core.List<api.ExternallyHostedApkUsesPermission>();
   o.add(buildExternallyHostedApkUsesPermission());
   o.add(buildExternallyHostedApkUsesPermission());
   return o;
 }
 
-checkUnnamed1398(core.List<api.ExternallyHostedApkUsesPermission> o) {
+checkUnnamed263(core.List<api.ExternallyHostedApkUsesPermission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkExternallyHostedApkUsesPermission(o[0]);
   checkExternallyHostedApkUsesPermission(o[1]);
@@ -327,7 +362,7 @@
   buildCounterExternallyHostedApk++;
   if (buildCounterExternallyHostedApk < 3) {
     o.applicationLabel = "foo";
-    o.certificateBase64s = buildUnnamed1395();
+    o.certificateBase64s = buildUnnamed260();
     o.externallyHostedUrl = "foo";
     o.fileSha1Base64 = "foo";
     o.fileSha256Base64 = "foo";
@@ -335,10 +370,10 @@
     o.iconBase64 = "foo";
     o.maximumSdk = 42;
     o.minimumSdk = 42;
-    o.nativeCodes = buildUnnamed1396();
+    o.nativeCodes = buildUnnamed261();
     o.packageName = "foo";
-    o.usesFeatures = buildUnnamed1397();
-    o.usesPermissions = buildUnnamed1398();
+    o.usesFeatures = buildUnnamed262();
+    o.usesPermissions = buildUnnamed263();
     o.versionCode = 42;
     o.versionName = "foo";
   }
@@ -350,7 +385,7 @@
   buildCounterExternallyHostedApk++;
   if (buildCounterExternallyHostedApk < 3) {
     unittest.expect(o.applicationLabel, unittest.equals('foo'));
-    checkUnnamed1395(o.certificateBase64s);
+    checkUnnamed260(o.certificateBase64s);
     unittest.expect(o.externallyHostedUrl, unittest.equals('foo'));
     unittest.expect(o.fileSha1Base64, unittest.equals('foo'));
     unittest.expect(o.fileSha256Base64, unittest.equals('foo'));
@@ -358,10 +393,10 @@
     unittest.expect(o.iconBase64, unittest.equals('foo'));
     unittest.expect(o.maximumSdk, unittest.equals(42));
     unittest.expect(o.minimumSdk, unittest.equals(42));
-    checkUnnamed1396(o.nativeCodes);
+    checkUnnamed261(o.nativeCodes);
     unittest.expect(o.packageName, unittest.equals('foo'));
-    checkUnnamed1397(o.usesFeatures);
-    checkUnnamed1398(o.usesPermissions);
+    checkUnnamed262(o.usesFeatures);
+    checkUnnamed263(o.usesPermissions);
     unittest.expect(o.versionCode, unittest.equals(42));
     unittest.expect(o.versionName, unittest.equals('foo'));
   }
@@ -412,14 +447,14 @@
   buildCounterImage--;
 }
 
-buildUnnamed1399() {
+buildUnnamed264() {
   var o = new core.List<api.Image>();
   o.add(buildImage());
   o.add(buildImage());
   return o;
 }
 
-checkUnnamed1399(core.List<api.Image> o) {
+checkUnnamed264(core.List<api.Image> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkImage(o[0]);
   checkImage(o[1]);
@@ -430,7 +465,7 @@
   var o = new api.ImagesDeleteAllResponse();
   buildCounterImagesDeleteAllResponse++;
   if (buildCounterImagesDeleteAllResponse < 3) {
-    o.deleted = buildUnnamed1399();
+    o.deleted = buildUnnamed264();
   }
   buildCounterImagesDeleteAllResponse--;
   return o;
@@ -439,19 +474,19 @@
 checkImagesDeleteAllResponse(api.ImagesDeleteAllResponse o) {
   buildCounterImagesDeleteAllResponse++;
   if (buildCounterImagesDeleteAllResponse < 3) {
-    checkUnnamed1399(o.deleted);
+    checkUnnamed264(o.deleted);
   }
   buildCounterImagesDeleteAllResponse--;
 }
 
-buildUnnamed1400() {
+buildUnnamed265() {
   var o = new core.List<api.Image>();
   o.add(buildImage());
   o.add(buildImage());
   return o;
 }
 
-checkUnnamed1400(core.List<api.Image> o) {
+checkUnnamed265(core.List<api.Image> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkImage(o[0]);
   checkImage(o[1]);
@@ -462,7 +497,7 @@
   var o = new api.ImagesListResponse();
   buildCounterImagesListResponse++;
   if (buildCounterImagesListResponse < 3) {
-    o.images = buildUnnamed1400();
+    o.images = buildUnnamed265();
   }
   buildCounterImagesListResponse--;
   return o;
@@ -471,7 +506,7 @@
 checkImagesListResponse(api.ImagesListResponse o) {
   buildCounterImagesListResponse++;
   if (buildCounterImagesListResponse < 3) {
-    checkUnnamed1400(o.images);
+    checkUnnamed265(o.images);
   }
   buildCounterImagesListResponse--;
 }
@@ -495,27 +530,27 @@
   buildCounterImagesUploadResponse--;
 }
 
-buildUnnamed1401() {
+buildUnnamed266() {
   var o = new core.Map<core.String, api.InAppProductListing>();
   o["x"] = buildInAppProductListing();
   o["y"] = buildInAppProductListing();
   return o;
 }
 
-checkUnnamed1401(core.Map<core.String, api.InAppProductListing> o) {
+checkUnnamed266(core.Map<core.String, api.InAppProductListing> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInAppProductListing(o["x"]);
   checkInAppProductListing(o["y"]);
 }
 
-buildUnnamed1402() {
+buildUnnamed267() {
   var o = new core.Map<core.String, api.Price>();
   o["x"] = buildPrice();
   o["y"] = buildPrice();
   return o;
 }
 
-checkUnnamed1402(core.Map<core.String, api.Price> o) {
+checkUnnamed267(core.Map<core.String, api.Price> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPrice(o["x"]);
   checkPrice(o["y"]);
@@ -528,9 +563,9 @@
   if (buildCounterInAppProduct < 3) {
     o.defaultLanguage = "foo";
     o.defaultPrice = buildPrice();
-    o.listings = buildUnnamed1401();
+    o.listings = buildUnnamed266();
     o.packageName = "foo";
-    o.prices = buildUnnamed1402();
+    o.prices = buildUnnamed267();
     o.purchaseType = "foo";
     o.season = buildSeason();
     o.sku = "foo";
@@ -547,9 +582,9 @@
   if (buildCounterInAppProduct < 3) {
     unittest.expect(o.defaultLanguage, unittest.equals('foo'));
     checkPrice(o.defaultPrice);
-    checkUnnamed1401(o.listings);
+    checkUnnamed266(o.listings);
     unittest.expect(o.packageName, unittest.equals('foo'));
-    checkUnnamed1402(o.prices);
+    checkUnnamed267(o.prices);
     unittest.expect(o.purchaseType, unittest.equals('foo'));
     checkSeason(o.season);
     unittest.expect(o.sku, unittest.equals('foo'));
@@ -581,14 +616,14 @@
   buildCounterInAppProductListing--;
 }
 
-buildUnnamed1403() {
+buildUnnamed268() {
   var o = new core.List<api.InappproductsBatchRequestEntry>();
   o.add(buildInappproductsBatchRequestEntry());
   o.add(buildInappproductsBatchRequestEntry());
   return o;
 }
 
-checkUnnamed1403(core.List<api.InappproductsBatchRequestEntry> o) {
+checkUnnamed268(core.List<api.InappproductsBatchRequestEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInappproductsBatchRequestEntry(o[0]);
   checkInappproductsBatchRequestEntry(o[1]);
@@ -599,7 +634,7 @@
   var o = new api.InappproductsBatchRequest();
   buildCounterInappproductsBatchRequest++;
   if (buildCounterInappproductsBatchRequest < 3) {
-    o.entrys = buildUnnamed1403();
+    o.entrys = buildUnnamed268();
   }
   buildCounterInappproductsBatchRequest--;
   return o;
@@ -608,7 +643,7 @@
 checkInappproductsBatchRequest(api.InappproductsBatchRequest o) {
   buildCounterInappproductsBatchRequest++;
   if (buildCounterInappproductsBatchRequest < 3) {
-    checkUnnamed1403(o.entrys);
+    checkUnnamed268(o.entrys);
   }
   buildCounterInappproductsBatchRequest--;
 }
@@ -638,14 +673,14 @@
   buildCounterInappproductsBatchRequestEntry--;
 }
 
-buildUnnamed1404() {
+buildUnnamed269() {
   var o = new core.List<api.InappproductsBatchResponseEntry>();
   o.add(buildInappproductsBatchResponseEntry());
   o.add(buildInappproductsBatchResponseEntry());
   return o;
 }
 
-checkUnnamed1404(core.List<api.InappproductsBatchResponseEntry> o) {
+checkUnnamed269(core.List<api.InappproductsBatchResponseEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInappproductsBatchResponseEntry(o[0]);
   checkInappproductsBatchResponseEntry(o[1]);
@@ -656,7 +691,7 @@
   var o = new api.InappproductsBatchResponse();
   buildCounterInappproductsBatchResponse++;
   if (buildCounterInappproductsBatchResponse < 3) {
-    o.entrys = buildUnnamed1404();
+    o.entrys = buildUnnamed269();
     o.kind = "foo";
   }
   buildCounterInappproductsBatchResponse--;
@@ -666,7 +701,7 @@
 checkInappproductsBatchResponse(api.InappproductsBatchResponse o) {
   buildCounterInappproductsBatchResponse++;
   if (buildCounterInappproductsBatchResponse < 3) {
-    checkUnnamed1404(o.entrys);
+    checkUnnamed269(o.entrys);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterInappproductsBatchResponse--;
@@ -733,14 +768,14 @@
   buildCounterInappproductsInsertResponse--;
 }
 
-buildUnnamed1405() {
+buildUnnamed270() {
   var o = new core.List<api.InAppProduct>();
   o.add(buildInAppProduct());
   o.add(buildInAppProduct());
   return o;
 }
 
-checkUnnamed1405(core.List<api.InAppProduct> o) {
+checkUnnamed270(core.List<api.InAppProduct> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInAppProduct(o[0]);
   checkInAppProduct(o[1]);
@@ -751,7 +786,7 @@
   var o = new api.InappproductsListResponse();
   buildCounterInappproductsListResponse++;
   if (buildCounterInappproductsListResponse < 3) {
-    o.inappproduct = buildUnnamed1405();
+    o.inappproduct = buildUnnamed270();
     o.kind = "foo";
     o.pageInfo = buildPageInfo();
     o.tokenPagination = buildTokenPagination();
@@ -763,7 +798,7 @@
 checkInappproductsListResponse(api.InappproductsListResponse o) {
   buildCounterInappproductsListResponse++;
   if (buildCounterInappproductsListResponse < 3) {
-    checkUnnamed1405(o.inappproduct);
+    checkUnnamed270(o.inappproduct);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
     checkTokenPagination(o.tokenPagination);
@@ -836,14 +871,14 @@
   buildCounterListing--;
 }
 
-buildUnnamed1406() {
+buildUnnamed271() {
   var o = new core.List<api.Listing>();
   o.add(buildListing());
   o.add(buildListing());
   return o;
 }
 
-checkUnnamed1406(core.List<api.Listing> o) {
+checkUnnamed271(core.List<api.Listing> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkListing(o[0]);
   checkListing(o[1]);
@@ -855,7 +890,7 @@
   buildCounterListingsListResponse++;
   if (buildCounterListingsListResponse < 3) {
     o.kind = "foo";
-    o.listings = buildUnnamed1406();
+    o.listings = buildUnnamed271();
   }
   buildCounterListingsListResponse--;
   return o;
@@ -865,7 +900,7 @@
   buildCounterListingsListResponse++;
   if (buildCounterListingsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1406(o.listings);
+    checkUnnamed271(o.listings);
   }
   buildCounterListingsListResponse--;
 }
@@ -1067,27 +1102,27 @@
   buildCounterSubscriptionPurchasesDeferResponse--;
 }
 
-buildUnnamed1407() {
+buildUnnamed272() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1407(core.List<core.String> o) {
+checkUnnamed272(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1408() {
+buildUnnamed273() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1408(core.List<core.String> o) {
+checkUnnamed273(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1098,8 +1133,8 @@
   var o = new api.Testers();
   buildCounterTesters++;
   if (buildCounterTesters < 3) {
-    o.googleGroups = buildUnnamed1407();
-    o.googlePlusCommunities = buildUnnamed1408();
+    o.googleGroups = buildUnnamed272();
+    o.googlePlusCommunities = buildUnnamed273();
   }
   buildCounterTesters--;
   return o;
@@ -1108,8 +1143,8 @@
 checkTesters(api.Testers o) {
   buildCounterTesters++;
   if (buildCounterTesters < 3) {
-    checkUnnamed1407(o.googleGroups);
-    checkUnnamed1408(o.googlePlusCommunities);
+    checkUnnamed272(o.googleGroups);
+    checkUnnamed273(o.googlePlusCommunities);
   }
   buildCounterTesters--;
 }
@@ -1135,14 +1170,14 @@
   buildCounterTokenPagination--;
 }
 
-buildUnnamed1409() {
+buildUnnamed274() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed1409(core.List<core.int> o) {
+checkUnnamed274(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
@@ -1155,7 +1190,7 @@
   if (buildCounterTrack < 3) {
     o.track = "foo";
     o.userFraction = 42.0;
-    o.versionCodes = buildUnnamed1409();
+    o.versionCodes = buildUnnamed274();
   }
   buildCounterTrack--;
   return o;
@@ -1166,19 +1201,19 @@
   if (buildCounterTrack < 3) {
     unittest.expect(o.track, unittest.equals('foo'));
     unittest.expect(o.userFraction, unittest.equals(42.0));
-    checkUnnamed1409(o.versionCodes);
+    checkUnnamed274(o.versionCodes);
   }
   buildCounterTrack--;
 }
 
-buildUnnamed1410() {
+buildUnnamed275() {
   var o = new core.List<api.Track>();
   o.add(buildTrack());
   o.add(buildTrack());
   return o;
 }
 
-checkUnnamed1410(core.List<api.Track> o) {
+checkUnnamed275(core.List<api.Track> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTrack(o[0]);
   checkTrack(o[1]);
@@ -1190,7 +1225,7 @@
   buildCounterTracksListResponse++;
   if (buildCounterTracksListResponse < 3) {
     o.kind = "foo";
-    o.tracks = buildUnnamed1410();
+    o.tracks = buildUnnamed275();
   }
   buildCounterTracksListResponse--;
   return o;
@@ -1200,7 +1235,7 @@
   buildCounterTracksListResponse++;
   if (buildCounterTracksListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1410(o.tracks);
+    checkUnnamed275(o.tracks);
   }
   buildCounterTracksListResponse--;
 }
@@ -1597,7 +1632,7 @@
   unittest.group("resource-EditsResourceApi", () {
     unittest.test("method--commit", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsResourceApi res = new api.AndroidpublisherApi(mock).edits;
       var arg_packageName = "foo";
       var arg_editId = "foo";
@@ -1631,7 +1666,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAppEdit());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.commit(arg_packageName, arg_editId).then(unittest.expectAsync(((api.AppEdit response) {
         checkAppEdit(response);
@@ -1640,7 +1675,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsResourceApi res = new api.AndroidpublisherApi(mock).edits;
       var arg_packageName = "foo";
       var arg_editId = "foo";
@@ -1674,14 +1709,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_packageName, arg_editId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsResourceApi res = new api.AndroidpublisherApi(mock).edits;
       var arg_packageName = "foo";
       var arg_editId = "foo";
@@ -1715,7 +1750,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAppEdit());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_packageName, arg_editId).then(unittest.expectAsync(((api.AppEdit response) {
         checkAppEdit(response);
@@ -1724,7 +1759,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsResourceApi res = new api.AndroidpublisherApi(mock).edits;
       var arg_request = buildAppEdit();
       var arg_packageName = "foo";
@@ -1761,7 +1796,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAppEdit());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_packageName).then(unittest.expectAsync(((api.AppEdit response) {
         checkAppEdit(response);
@@ -1770,7 +1805,7 @@
 
     unittest.test("method--validate", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsResourceApi res = new api.AndroidpublisherApi(mock).edits;
       var arg_packageName = "foo";
       var arg_editId = "foo";
@@ -1804,7 +1839,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAppEdit());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.validate(arg_packageName, arg_editId).then(unittest.expectAsync(((api.AppEdit response) {
         checkAppEdit(response);
@@ -1817,7 +1852,7 @@
   unittest.group("resource-EditsApklistingsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsApklistingsResourceApi res = new api.AndroidpublisherApi(mock).edits.apklistings;
       var arg_packageName = "foo";
       var arg_editId = "foo";
@@ -1853,14 +1888,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_packageName, arg_editId, arg_apkVersionCode, arg_language).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--deleteall", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsApklistingsResourceApi res = new api.AndroidpublisherApi(mock).edits.apklistings;
       var arg_packageName = "foo";
       var arg_editId = "foo";
@@ -1895,14 +1930,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.deleteall(arg_packageName, arg_editId, arg_apkVersionCode).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsApklistingsResourceApi res = new api.AndroidpublisherApi(mock).edits.apklistings;
       var arg_packageName = "foo";
       var arg_editId = "foo";
@@ -1938,7 +1973,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildApkListing());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_packageName, arg_editId, arg_apkVersionCode, arg_language).then(unittest.expectAsync(((api.ApkListing response) {
         checkApkListing(response);
@@ -1947,7 +1982,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsApklistingsResourceApi res = new api.AndroidpublisherApi(mock).edits.apklistings;
       var arg_packageName = "foo";
       var arg_editId = "foo";
@@ -1982,7 +2017,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildApkListingsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_packageName, arg_editId, arg_apkVersionCode).then(unittest.expectAsync(((api.ApkListingsListResponse response) {
         checkApkListingsListResponse(response);
@@ -1991,7 +2026,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsApklistingsResourceApi res = new api.AndroidpublisherApi(mock).edits.apklistings;
       var arg_request = buildApkListing();
       var arg_packageName = "foo";
@@ -2031,7 +2066,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildApkListing());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_packageName, arg_editId, arg_apkVersionCode, arg_language).then(unittest.expectAsync(((api.ApkListing response) {
         checkApkListing(response);
@@ -2040,7 +2075,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsApklistingsResourceApi res = new api.AndroidpublisherApi(mock).edits.apklistings;
       var arg_request = buildApkListing();
       var arg_packageName = "foo";
@@ -2080,7 +2115,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildApkListing());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_packageName, arg_editId, arg_apkVersionCode, arg_language).then(unittest.expectAsync(((api.ApkListing response) {
         checkApkListing(response);
@@ -2093,7 +2128,7 @@
   unittest.group("resource-EditsApksResourceApi", () {
     unittest.test("method--addexternallyhosted", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsApksResourceApi res = new api.AndroidpublisherApi(mock).edits.apks;
       var arg_request = buildApksAddExternallyHostedRequest();
       var arg_packageName = "foo";
@@ -2131,7 +2166,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildApksAddExternallyHostedResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.addexternallyhosted(arg_request, arg_packageName, arg_editId).then(unittest.expectAsync(((api.ApksAddExternallyHostedResponse response) {
         checkApksAddExternallyHostedResponse(response);
@@ -2140,7 +2175,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsApksResourceApi res = new api.AndroidpublisherApi(mock).edits.apks;
       var arg_packageName = "foo";
       var arg_editId = "foo";
@@ -2174,7 +2209,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildApksListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_packageName, arg_editId).then(unittest.expectAsync(((api.ApksListResponse response) {
         checkApksListResponse(response);
@@ -2185,7 +2220,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsApksResourceApi res = new api.AndroidpublisherApi(mock).edits.apks;
       var arg_packageName = "foo";
       var arg_editId = "foo";
@@ -2219,7 +2254,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildApk());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.upload(arg_packageName, arg_editId).then(unittest.expectAsync(((api.Apk response) {
         checkApk(response);
@@ -2232,7 +2267,7 @@
   unittest.group("resource-EditsDetailsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsDetailsResourceApi res = new api.AndroidpublisherApi(mock).edits.details;
       var arg_packageName = "foo";
       var arg_editId = "foo";
@@ -2266,7 +2301,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAppDetails());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_packageName, arg_editId).then(unittest.expectAsync(((api.AppDetails response) {
         checkAppDetails(response);
@@ -2275,7 +2310,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsDetailsResourceApi res = new api.AndroidpublisherApi(mock).edits.details;
       var arg_request = buildAppDetails();
       var arg_packageName = "foo";
@@ -2313,7 +2348,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAppDetails());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_packageName, arg_editId).then(unittest.expectAsync(((api.AppDetails response) {
         checkAppDetails(response);
@@ -2322,7 +2357,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsDetailsResourceApi res = new api.AndroidpublisherApi(mock).edits.details;
       var arg_request = buildAppDetails();
       var arg_packageName = "foo";
@@ -2360,7 +2395,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAppDetails());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_packageName, arg_editId).then(unittest.expectAsync(((api.AppDetails response) {
         checkAppDetails(response);
@@ -2373,7 +2408,7 @@
   unittest.group("resource-EditsExpansionfilesResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsExpansionfilesResourceApi res = new api.AndroidpublisherApi(mock).edits.expansionfiles;
       var arg_packageName = "foo";
       var arg_editId = "foo";
@@ -2409,7 +2444,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildExpansionFile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_packageName, arg_editId, arg_apkVersionCode, arg_expansionFileType).then(unittest.expectAsync(((api.ExpansionFile response) {
         checkExpansionFile(response);
@@ -2418,7 +2453,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsExpansionfilesResourceApi res = new api.AndroidpublisherApi(mock).edits.expansionfiles;
       var arg_request = buildExpansionFile();
       var arg_packageName = "foo";
@@ -2458,7 +2493,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildExpansionFile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_packageName, arg_editId, arg_apkVersionCode, arg_expansionFileType).then(unittest.expectAsync(((api.ExpansionFile response) {
         checkExpansionFile(response);
@@ -2467,7 +2502,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsExpansionfilesResourceApi res = new api.AndroidpublisherApi(mock).edits.expansionfiles;
       var arg_request = buildExpansionFile();
       var arg_packageName = "foo";
@@ -2507,7 +2542,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildExpansionFile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_packageName, arg_editId, arg_apkVersionCode, arg_expansionFileType).then(unittest.expectAsync(((api.ExpansionFile response) {
         checkExpansionFile(response);
@@ -2518,7 +2553,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsExpansionfilesResourceApi res = new api.AndroidpublisherApi(mock).edits.expansionfiles;
       var arg_packageName = "foo";
       var arg_editId = "foo";
@@ -2554,7 +2589,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildExpansionFilesUploadResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.upload(arg_packageName, arg_editId, arg_apkVersionCode, arg_expansionFileType).then(unittest.expectAsync(((api.ExpansionFilesUploadResponse response) {
         checkExpansionFilesUploadResponse(response);
@@ -2567,7 +2602,7 @@
   unittest.group("resource-EditsImagesResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsImagesResourceApi res = new api.AndroidpublisherApi(mock).edits.images;
       var arg_packageName = "foo";
       var arg_editId = "foo";
@@ -2604,14 +2639,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_packageName, arg_editId, arg_language, arg_imageType, arg_imageId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--deleteall", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsImagesResourceApi res = new api.AndroidpublisherApi(mock).edits.images;
       var arg_packageName = "foo";
       var arg_editId = "foo";
@@ -2647,7 +2682,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildImagesDeleteAllResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.deleteall(arg_packageName, arg_editId, arg_language, arg_imageType).then(unittest.expectAsync(((api.ImagesDeleteAllResponse response) {
         checkImagesDeleteAllResponse(response);
@@ -2656,7 +2691,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsImagesResourceApi res = new api.AndroidpublisherApi(mock).edits.images;
       var arg_packageName = "foo";
       var arg_editId = "foo";
@@ -2692,7 +2727,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildImagesListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_packageName, arg_editId, arg_language, arg_imageType).then(unittest.expectAsync(((api.ImagesListResponse response) {
         checkImagesListResponse(response);
@@ -2703,7 +2738,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsImagesResourceApi res = new api.AndroidpublisherApi(mock).edits.images;
       var arg_packageName = "foo";
       var arg_editId = "foo";
@@ -2739,7 +2774,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildImagesUploadResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.upload(arg_packageName, arg_editId, arg_language, arg_imageType).then(unittest.expectAsync(((api.ImagesUploadResponse response) {
         checkImagesUploadResponse(response);
@@ -2752,7 +2787,7 @@
   unittest.group("resource-EditsListingsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsListingsResourceApi res = new api.AndroidpublisherApi(mock).edits.listings;
       var arg_packageName = "foo";
       var arg_editId = "foo";
@@ -2787,14 +2822,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_packageName, arg_editId, arg_language).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--deleteall", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsListingsResourceApi res = new api.AndroidpublisherApi(mock).edits.listings;
       var arg_packageName = "foo";
       var arg_editId = "foo";
@@ -2828,14 +2863,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.deleteall(arg_packageName, arg_editId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsListingsResourceApi res = new api.AndroidpublisherApi(mock).edits.listings;
       var arg_packageName = "foo";
       var arg_editId = "foo";
@@ -2870,7 +2905,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListing());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_packageName, arg_editId, arg_language).then(unittest.expectAsync(((api.Listing response) {
         checkListing(response);
@@ -2879,7 +2914,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsListingsResourceApi res = new api.AndroidpublisherApi(mock).edits.listings;
       var arg_packageName = "foo";
       var arg_editId = "foo";
@@ -2913,7 +2948,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListingsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_packageName, arg_editId).then(unittest.expectAsync(((api.ListingsListResponse response) {
         checkListingsListResponse(response);
@@ -2922,7 +2957,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsListingsResourceApi res = new api.AndroidpublisherApi(mock).edits.listings;
       var arg_request = buildListing();
       var arg_packageName = "foo";
@@ -2961,7 +2996,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListing());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_packageName, arg_editId, arg_language).then(unittest.expectAsync(((api.Listing response) {
         checkListing(response);
@@ -2970,7 +3005,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsListingsResourceApi res = new api.AndroidpublisherApi(mock).edits.listings;
       var arg_request = buildListing();
       var arg_packageName = "foo";
@@ -3009,7 +3044,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListing());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_packageName, arg_editId, arg_language).then(unittest.expectAsync(((api.Listing response) {
         checkListing(response);
@@ -3022,7 +3057,7 @@
   unittest.group("resource-EditsTestersResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsTestersResourceApi res = new api.AndroidpublisherApi(mock).edits.testers;
       var arg_packageName = "foo";
       var arg_editId = "foo";
@@ -3057,7 +3092,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTesters());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_packageName, arg_editId, arg_track).then(unittest.expectAsync(((api.Testers response) {
         checkTesters(response);
@@ -3066,7 +3101,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsTestersResourceApi res = new api.AndroidpublisherApi(mock).edits.testers;
       var arg_request = buildTesters();
       var arg_packageName = "foo";
@@ -3105,7 +3140,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTesters());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_packageName, arg_editId, arg_track).then(unittest.expectAsync(((api.Testers response) {
         checkTesters(response);
@@ -3114,7 +3149,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsTestersResourceApi res = new api.AndroidpublisherApi(mock).edits.testers;
       var arg_request = buildTesters();
       var arg_packageName = "foo";
@@ -3153,7 +3188,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTesters());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_packageName, arg_editId, arg_track).then(unittest.expectAsync(((api.Testers response) {
         checkTesters(response);
@@ -3166,7 +3201,7 @@
   unittest.group("resource-EditsTracksResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsTracksResourceApi res = new api.AndroidpublisherApi(mock).edits.tracks;
       var arg_packageName = "foo";
       var arg_editId = "foo";
@@ -3201,7 +3236,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTrack());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_packageName, arg_editId, arg_track).then(unittest.expectAsync(((api.Track response) {
         checkTrack(response);
@@ -3210,7 +3245,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsTracksResourceApi res = new api.AndroidpublisherApi(mock).edits.tracks;
       var arg_packageName = "foo";
       var arg_editId = "foo";
@@ -3244,7 +3279,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTracksListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_packageName, arg_editId).then(unittest.expectAsync(((api.TracksListResponse response) {
         checkTracksListResponse(response);
@@ -3253,7 +3288,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsTracksResourceApi res = new api.AndroidpublisherApi(mock).edits.tracks;
       var arg_request = buildTrack();
       var arg_packageName = "foo";
@@ -3292,7 +3327,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTrack());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_packageName, arg_editId, arg_track).then(unittest.expectAsync(((api.Track response) {
         checkTrack(response);
@@ -3301,7 +3336,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EditsTracksResourceApi res = new api.AndroidpublisherApi(mock).edits.tracks;
       var arg_request = buildTrack();
       var arg_packageName = "foo";
@@ -3340,7 +3375,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTrack());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_packageName, arg_editId, arg_track).then(unittest.expectAsync(((api.Track response) {
         checkTrack(response);
@@ -3353,7 +3388,7 @@
   unittest.group("resource-InappproductsResourceApi", () {
     unittest.test("method--batch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InappproductsResourceApi res = new api.AndroidpublisherApi(mock).inappproducts;
       var arg_request = buildInappproductsBatchRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -3393,7 +3428,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildInappproductsBatchResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.batch(arg_request).then(unittest.expectAsync(((api.InappproductsBatchResponse response) {
         checkInappproductsBatchResponse(response);
@@ -3402,7 +3437,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InappproductsResourceApi res = new api.AndroidpublisherApi(mock).inappproducts;
       var arg_packageName = "foo";
       var arg_sku = "foo";
@@ -3436,14 +3471,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_packageName, arg_sku).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InappproductsResourceApi res = new api.AndroidpublisherApi(mock).inappproducts;
       var arg_packageName = "foo";
       var arg_sku = "foo";
@@ -3477,7 +3512,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildInAppProduct());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_packageName, arg_sku).then(unittest.expectAsync(((api.InAppProduct response) {
         checkInAppProduct(response);
@@ -3486,7 +3521,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InappproductsResourceApi res = new api.AndroidpublisherApi(mock).inappproducts;
       var arg_request = buildInAppProduct();
       var arg_packageName = "foo";
@@ -3525,7 +3560,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildInAppProduct());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_packageName, autoConvertMissingPrices: arg_autoConvertMissingPrices).then(unittest.expectAsync(((api.InAppProduct response) {
         checkInAppProduct(response);
@@ -3534,7 +3569,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InappproductsResourceApi res = new api.AndroidpublisherApi(mock).inappproducts;
       var arg_packageName = "foo";
       var arg_maxResults = 42;
@@ -3573,7 +3608,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildInappproductsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_packageName, maxResults: arg_maxResults, startIndex: arg_startIndex, token: arg_token).then(unittest.expectAsync(((api.InappproductsListResponse response) {
         checkInappproductsListResponse(response);
@@ -3582,7 +3617,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InappproductsResourceApi res = new api.AndroidpublisherApi(mock).inappproducts;
       var arg_request = buildInAppProduct();
       var arg_packageName = "foo";
@@ -3622,7 +3657,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildInAppProduct());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_packageName, arg_sku, autoConvertMissingPrices: arg_autoConvertMissingPrices).then(unittest.expectAsync(((api.InAppProduct response) {
         checkInAppProduct(response);
@@ -3631,7 +3666,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InappproductsResourceApi res = new api.AndroidpublisherApi(mock).inappproducts;
       var arg_request = buildInAppProduct();
       var arg_packageName = "foo";
@@ -3671,7 +3706,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildInAppProduct());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_packageName, arg_sku, autoConvertMissingPrices: arg_autoConvertMissingPrices).then(unittest.expectAsync(((api.InAppProduct response) {
         checkInAppProduct(response);
@@ -3684,7 +3719,7 @@
   unittest.group("resource-PurchasesProductsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PurchasesProductsResourceApi res = new api.AndroidpublisherApi(mock).purchases.products;
       var arg_packageName = "foo";
       var arg_productId = "foo";
@@ -3719,7 +3754,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProductPurchase());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_packageName, arg_productId, arg_token).then(unittest.expectAsync(((api.ProductPurchase response) {
         checkProductPurchase(response);
@@ -3732,7 +3767,7 @@
   unittest.group("resource-PurchasesSubscriptionsResourceApi", () {
     unittest.test("method--cancel", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PurchasesSubscriptionsResourceApi res = new api.AndroidpublisherApi(mock).purchases.subscriptions;
       var arg_packageName = "foo";
       var arg_subscriptionId = "foo";
@@ -3767,14 +3802,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.cancel(arg_packageName, arg_subscriptionId, arg_token).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--defer", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PurchasesSubscriptionsResourceApi res = new api.AndroidpublisherApi(mock).purchases.subscriptions;
       var arg_request = buildSubscriptionPurchasesDeferRequest();
       var arg_packageName = "foo";
@@ -3813,7 +3848,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSubscriptionPurchasesDeferResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.defer(arg_request, arg_packageName, arg_subscriptionId, arg_token).then(unittest.expectAsync(((api.SubscriptionPurchasesDeferResponse response) {
         checkSubscriptionPurchasesDeferResponse(response);
@@ -3822,7 +3857,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PurchasesSubscriptionsResourceApi res = new api.AndroidpublisherApi(mock).purchases.subscriptions;
       var arg_packageName = "foo";
       var arg_subscriptionId = "foo";
@@ -3857,7 +3892,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSubscriptionPurchase());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_packageName, arg_subscriptionId, arg_token).then(unittest.expectAsync(((api.SubscriptionPurchase response) {
         checkSubscriptionPurchase(response);
@@ -3866,7 +3901,7 @@
 
     unittest.test("method--refund", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PurchasesSubscriptionsResourceApi res = new api.AndroidpublisherApi(mock).purchases.subscriptions;
       var arg_packageName = "foo";
       var arg_subscriptionId = "foo";
@@ -3901,14 +3936,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.refund(arg_packageName, arg_subscriptionId, arg_token).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--revoke", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PurchasesSubscriptionsResourceApi res = new api.AndroidpublisherApi(mock).purchases.subscriptions;
       var arg_packageName = "foo";
       var arg_subscriptionId = "foo";
@@ -3943,7 +3978,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.revoke(arg_packageName, arg_subscriptionId, arg_token).then(unittest.expectAsync((_) {}));
     });
diff --git a/generated/googleapis/test/appsactivity/v1_test.dart b/generated/googleapis/test/appsactivity/v1_test.dart
index c676dd6..d48212d 100644
--- a/generated/googleapis/test/appsactivity/v1_test.dart
+++ b/generated/googleapis/test/appsactivity/v1_test.dart
@@ -8,22 +8,57 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/appsactivity/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
 
-buildUnnamed970() {
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+buildUnnamed276() {
   var o = new core.List<api.Event>();
   o.add(buildEvent());
   o.add(buildEvent());
   return o;
 }
 
-checkUnnamed970(core.List<api.Event> o) {
+checkUnnamed276(core.List<api.Event> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEvent(o[0]);
   checkEvent(o[1]);
@@ -35,7 +70,7 @@
   buildCounterActivity++;
   if (buildCounterActivity < 3) {
     o.combinedEvent = buildEvent();
-    o.singleEvents = buildUnnamed970();
+    o.singleEvents = buildUnnamed276();
   }
   buildCounterActivity--;
   return o;
@@ -45,32 +80,32 @@
   buildCounterActivity++;
   if (buildCounterActivity < 3) {
     checkEvent(o.combinedEvent);
-    checkUnnamed970(o.singleEvents);
+    checkUnnamed276(o.singleEvents);
   }
   buildCounterActivity--;
 }
 
-buildUnnamed971() {
+buildUnnamed277() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed971(core.List<core.String> o) {
+checkUnnamed277(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed972() {
+buildUnnamed278() {
   var o = new core.List<api.PermissionChange>();
   o.add(buildPermissionChange());
   o.add(buildPermissionChange());
   return o;
 }
 
-checkUnnamed972(core.List<api.PermissionChange> o) {
+checkUnnamed278(core.List<api.PermissionChange> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPermissionChange(o[0]);
   checkPermissionChange(o[1]);
@@ -81,11 +116,11 @@
   var o = new api.Event();
   buildCounterEvent++;
   if (buildCounterEvent < 3) {
-    o.additionalEventTypes = buildUnnamed971();
+    o.additionalEventTypes = buildUnnamed277();
     o.eventTimeMillis = "foo";
     o.fromUserDeletion = true;
     o.move = buildMove();
-    o.permissionChanges = buildUnnamed972();
+    o.permissionChanges = buildUnnamed278();
     o.primaryEventType = "foo";
     o.rename = buildRename();
     o.target = buildTarget();
@@ -98,11 +133,11 @@
 checkEvent(api.Event o) {
   buildCounterEvent++;
   if (buildCounterEvent < 3) {
-    checkUnnamed971(o.additionalEventTypes);
+    checkUnnamed277(o.additionalEventTypes);
     unittest.expect(o.eventTimeMillis, unittest.equals('foo'));
     unittest.expect(o.fromUserDeletion, unittest.isTrue);
     checkMove(o.move);
-    checkUnnamed972(o.permissionChanges);
+    checkUnnamed278(o.permissionChanges);
     unittest.expect(o.primaryEventType, unittest.equals('foo'));
     checkRename(o.rename);
     checkTarget(o.target);
@@ -111,14 +146,14 @@
   buildCounterEvent--;
 }
 
-buildUnnamed973() {
+buildUnnamed279() {
   var o = new core.List<api.Activity>();
   o.add(buildActivity());
   o.add(buildActivity());
   return o;
 }
 
-checkUnnamed973(core.List<api.Activity> o) {
+checkUnnamed279(core.List<api.Activity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivity(o[0]);
   checkActivity(o[1]);
@@ -129,7 +164,7 @@
   var o = new api.ListActivitiesResponse();
   buildCounterListActivitiesResponse++;
   if (buildCounterListActivitiesResponse < 3) {
-    o.activities = buildUnnamed973();
+    o.activities = buildUnnamed279();
     o.nextPageToken = "foo";
   }
   buildCounterListActivitiesResponse--;
@@ -139,33 +174,33 @@
 checkListActivitiesResponse(api.ListActivitiesResponse o) {
   buildCounterListActivitiesResponse++;
   if (buildCounterListActivitiesResponse < 3) {
-    checkUnnamed973(o.activities);
+    checkUnnamed279(o.activities);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListActivitiesResponse--;
 }
 
-buildUnnamed974() {
+buildUnnamed280() {
   var o = new core.List<api.Parent>();
   o.add(buildParent());
   o.add(buildParent());
   return o;
 }
 
-checkUnnamed974(core.List<api.Parent> o) {
+checkUnnamed280(core.List<api.Parent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParent(o[0]);
   checkParent(o[1]);
 }
 
-buildUnnamed975() {
+buildUnnamed281() {
   var o = new core.List<api.Parent>();
   o.add(buildParent());
   o.add(buildParent());
   return o;
 }
 
-checkUnnamed975(core.List<api.Parent> o) {
+checkUnnamed281(core.List<api.Parent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParent(o[0]);
   checkParent(o[1]);
@@ -176,8 +211,8 @@
   var o = new api.Move();
   buildCounterMove++;
   if (buildCounterMove < 3) {
-    o.addedParents = buildUnnamed974();
-    o.removedParents = buildUnnamed975();
+    o.addedParents = buildUnnamed280();
+    o.removedParents = buildUnnamed281();
   }
   buildCounterMove--;
   return o;
@@ -186,8 +221,8 @@
 checkMove(api.Move o) {
   buildCounterMove++;
   if (buildCounterMove < 3) {
-    checkUnnamed974(o.addedParents);
-    checkUnnamed975(o.removedParents);
+    checkUnnamed280(o.addedParents);
+    checkUnnamed281(o.removedParents);
   }
   buildCounterMove--;
 }
@@ -244,27 +279,27 @@
   buildCounterPermission--;
 }
 
-buildUnnamed976() {
+buildUnnamed282() {
   var o = new core.List<api.Permission>();
   o.add(buildPermission());
   o.add(buildPermission());
   return o;
 }
 
-checkUnnamed976(core.List<api.Permission> o) {
+checkUnnamed282(core.List<api.Permission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPermission(o[0]);
   checkPermission(o[1]);
 }
 
-buildUnnamed977() {
+buildUnnamed283() {
   var o = new core.List<api.Permission>();
   o.add(buildPermission());
   o.add(buildPermission());
   return o;
 }
 
-checkUnnamed977(core.List<api.Permission> o) {
+checkUnnamed283(core.List<api.Permission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPermission(o[0]);
   checkPermission(o[1]);
@@ -275,8 +310,8 @@
   var o = new api.PermissionChange();
   buildCounterPermissionChange++;
   if (buildCounterPermissionChange < 3) {
-    o.addedPermissions = buildUnnamed976();
-    o.removedPermissions = buildUnnamed977();
+    o.addedPermissions = buildUnnamed282();
+    o.removedPermissions = buildUnnamed283();
   }
   buildCounterPermissionChange--;
   return o;
@@ -285,8 +320,8 @@
 checkPermissionChange(api.PermissionChange o) {
   buildCounterPermissionChange++;
   if (buildCounterPermissionChange < 3) {
-    checkUnnamed976(o.addedPermissions);
-    checkUnnamed977(o.removedPermissions);
+    checkUnnamed282(o.addedPermissions);
+    checkUnnamed283(o.removedPermissions);
   }
   buildCounterPermissionChange--;
 }
@@ -479,7 +514,7 @@
   unittest.group("resource-ActivitiesResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ActivitiesResourceApi res = new api.AppsactivityApi(mock).activities;
       var arg_drive_ancestorId = "foo";
       var arg_drive_fileId = "foo";
@@ -529,7 +564,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListActivitiesResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(drive_ancestorId: arg_drive_ancestorId, drive_fileId: arg_drive_fileId, groupingStrategy: arg_groupingStrategy, pageSize: arg_pageSize, pageToken: arg_pageToken, source: arg_source, userId: arg_userId).then(unittest.expectAsync(((api.ListActivitiesResponse response) {
         checkListActivitiesResponse(response);
diff --git a/generated/googleapis/test/appstate/v1_test.dart b/generated/googleapis/test/appstate/v1_test.dart
index 6eb2c97..f4377bf 100644
--- a/generated/googleapis/test/appstate/v1_test.dart
+++ b/generated/googleapis/test/appstate/v1_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/appstate/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterGetResponse = 0;
 buildGetResponse() {
@@ -41,14 +76,14 @@
   buildCounterGetResponse--;
 }
 
-buildUnnamed1382() {
+buildUnnamed284() {
   var o = new core.List<api.GetResponse>();
   o.add(buildGetResponse());
   o.add(buildGetResponse());
   return o;
 }
 
-checkUnnamed1382(core.List<api.GetResponse> o) {
+checkUnnamed284(core.List<api.GetResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGetResponse(o[0]);
   checkGetResponse(o[1]);
@@ -59,7 +94,7 @@
   var o = new api.ListResponse();
   buildCounterListResponse++;
   if (buildCounterListResponse < 3) {
-    o.items = buildUnnamed1382();
+    o.items = buildUnnamed284();
     o.kind = "foo";
     o.maximumKeyCount = 42;
   }
@@ -70,7 +105,7 @@
 checkListResponse(api.ListResponse o) {
   buildCounterListResponse++;
   if (buildCounterListResponse < 3) {
-    checkUnnamed1382(o.items);
+    checkUnnamed284(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.maximumKeyCount, unittest.equals(42));
   }
@@ -162,7 +197,7 @@
   unittest.group("resource-StatesResourceApi", () {
     unittest.test("method--clear", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.StatesResourceApi res = new api.AppstateApi(mock).states;
       var arg_stateKey = 42;
       var arg_currentDataVersion = "foo";
@@ -208,7 +243,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildWriteResult());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.clear(arg_stateKey, currentDataVersion: arg_currentDataVersion).then(unittest.expectAsync(((api.WriteResult response) {
         checkWriteResult(response);
@@ -217,7 +252,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.StatesResourceApi res = new api.AppstateApi(mock).states;
       var arg_stateKey = 42;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -257,14 +292,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_stateKey).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.StatesResourceApi res = new api.AppstateApi(mock).states;
       var arg_stateKey = 42;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -304,7 +339,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGetResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_stateKey).then(unittest.expectAsync(((api.GetResponse response) {
         checkGetResponse(response);
@@ -313,7 +348,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.StatesResourceApi res = new api.AppstateApi(mock).states;
       var arg_includeData = true;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -351,7 +386,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(includeData: arg_includeData).then(unittest.expectAsync(((api.ListResponse response) {
         checkListResponse(response);
@@ -360,7 +395,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.StatesResourceApi res = new api.AppstateApi(mock).states;
       var arg_request = buildUpdateRequest();
       var arg_stateKey = 42;
@@ -406,7 +441,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildWriteResult());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_stateKey, currentStateVersion: arg_currentStateVersion).then(unittest.expectAsync(((api.WriteResult response) {
         checkWriteResult(response);
diff --git a/generated/googleapis/test/bigquery/v2_test.dart b/generated/googleapis/test/bigquery/v2_test.dart
index dd10244..e38f766 100644
--- a/generated/googleapis/test/bigquery/v2_test.dart
+++ b/generated/googleapis/test/bigquery/v2_test.dart
@@ -8,13 +8,77 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/bigquery/v2.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+core.int buildCounterCsvOptions = 0;
+buildCsvOptions() {
+  var o = new api.CsvOptions();
+  buildCounterCsvOptions++;
+  if (buildCounterCsvOptions < 3) {
+    o.allowJaggedRows = true;
+    o.allowQuotedNewlines = true;
+    o.encoding = "foo";
+    o.fieldDelimiter = "foo";
+    o.quote = "foo";
+    o.skipLeadingRows = 42;
+  }
+  buildCounterCsvOptions--;
+  return o;
+}
+
+checkCsvOptions(api.CsvOptions o) {
+  buildCounterCsvOptions++;
+  if (buildCounterCsvOptions < 3) {
+    unittest.expect(o.allowJaggedRows, unittest.isTrue);
+    unittest.expect(o.allowQuotedNewlines, unittest.isTrue);
+    unittest.expect(o.encoding, unittest.equals('foo'));
+    unittest.expect(o.fieldDelimiter, unittest.equals('foo'));
+    unittest.expect(o.quote, unittest.equals('foo'));
+    unittest.expect(o.skipLeadingRows, unittest.equals(42));
+  }
+  buildCounterCsvOptions--;
+}
 
 core.int buildCounterDatasetAccess = 0;
 buildDatasetAccess() {
@@ -45,14 +109,14 @@
   buildCounterDatasetAccess--;
 }
 
-buildUnnamed1457() {
+buildUnnamed285() {
   var o = new core.List<api.DatasetAccess>();
   o.add(buildDatasetAccess());
   o.add(buildDatasetAccess());
   return o;
 }
 
-checkUnnamed1457(core.List<api.DatasetAccess> o) {
+checkUnnamed285(core.List<api.DatasetAccess> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatasetAccess(o[0]);
   checkDatasetAccess(o[1]);
@@ -63,9 +127,10 @@
   var o = new api.Dataset();
   buildCounterDataset++;
   if (buildCounterDataset < 3) {
-    o.access = buildUnnamed1457();
+    o.access = buildUnnamed285();
     o.creationTime = "foo";
     o.datasetReference = buildDatasetReference();
+    o.defaultTableExpirationMs = "foo";
     o.description = "foo";
     o.etag = "foo";
     o.friendlyName = "foo";
@@ -81,9 +146,10 @@
 checkDataset(api.Dataset o) {
   buildCounterDataset++;
   if (buildCounterDataset < 3) {
-    checkUnnamed1457(o.access);
+    checkUnnamed285(o.access);
     unittest.expect(o.creationTime, unittest.equals('foo'));
     checkDatasetReference(o.datasetReference);
+    unittest.expect(o.defaultTableExpirationMs, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.friendlyName, unittest.equals('foo'));
@@ -120,14 +186,14 @@
   buildCounterDatasetListDatasets--;
 }
 
-buildUnnamed1458() {
+buildUnnamed286() {
   var o = new core.List<api.DatasetListDatasets>();
   o.add(buildDatasetListDatasets());
   o.add(buildDatasetListDatasets());
   return o;
 }
 
-checkUnnamed1458(core.List<api.DatasetListDatasets> o) {
+checkUnnamed286(core.List<api.DatasetListDatasets> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatasetListDatasets(o[0]);
   checkDatasetListDatasets(o[1]);
@@ -138,7 +204,7 @@
   var o = new api.DatasetList();
   buildCounterDatasetList++;
   if (buildCounterDatasetList < 3) {
-    o.datasets = buildUnnamed1458();
+    o.datasets = buildUnnamed286();
     o.etag = "foo";
     o.kind = "foo";
     o.nextPageToken = "foo";
@@ -150,7 +216,7 @@
 checkDatasetList(api.DatasetList o) {
   buildCounterDatasetList++;
   if (buildCounterDatasetList < 3) {
-    checkUnnamed1458(o.datasets);
+    checkUnnamed286(o.datasets);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -204,14 +270,58 @@
   buildCounterErrorProto--;
 }
 
-buildUnnamed1459() {
+buildUnnamed287() {
+  var o = new core.List<core.String>();
+  o.add("foo");
+  o.add("foo");
+  return o;
+}
+
+checkUnnamed287(core.List<core.String> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  unittest.expect(o[0], unittest.equals('foo'));
+  unittest.expect(o[1], unittest.equals('foo'));
+}
+
+core.int buildCounterExternalDataConfiguration = 0;
+buildExternalDataConfiguration() {
+  var o = new api.ExternalDataConfiguration();
+  buildCounterExternalDataConfiguration++;
+  if (buildCounterExternalDataConfiguration < 3) {
+    o.compression = "foo";
+    o.csvOptions = buildCsvOptions();
+    o.ignoreUnknownValues = true;
+    o.maxBadRecords = 42;
+    o.schema = buildTableSchema();
+    o.sourceFormat = "foo";
+    o.sourceUris = buildUnnamed287();
+  }
+  buildCounterExternalDataConfiguration--;
+  return o;
+}
+
+checkExternalDataConfiguration(api.ExternalDataConfiguration o) {
+  buildCounterExternalDataConfiguration++;
+  if (buildCounterExternalDataConfiguration < 3) {
+    unittest.expect(o.compression, unittest.equals('foo'));
+    checkCsvOptions(o.csvOptions);
+    unittest.expect(o.ignoreUnknownValues, unittest.isTrue);
+    unittest.expect(o.maxBadRecords, unittest.equals(42));
+    checkTableSchema(o.schema);
+    unittest.expect(o.sourceFormat, unittest.equals('foo'));
+    checkUnnamed287(o.sourceUris);
+  }
+  buildCounterExternalDataConfiguration--;
+}
+
+buildUnnamed288() {
   var o = new core.List<api.TableRow>();
   o.add(buildTableRow());
   o.add(buildTableRow());
   return o;
 }
 
-checkUnnamed1459(core.List<api.TableRow> o) {
+checkUnnamed288(core.List<api.TableRow> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableRow(o[0]);
   checkTableRow(o[1]);
@@ -228,7 +338,7 @@
     o.jobReference = buildJobReference();
     o.kind = "foo";
     o.pageToken = "foo";
-    o.rows = buildUnnamed1459();
+    o.rows = buildUnnamed288();
     o.schema = buildTableSchema();
     o.totalBytesProcessed = "foo";
     o.totalRows = "foo";
@@ -246,7 +356,7 @@
     checkJobReference(o.jobReference);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.pageToken, unittest.equals('foo'));
-    checkUnnamed1459(o.rows);
+    checkUnnamed288(o.rows);
     checkTableSchema(o.schema);
     unittest.expect(o.totalBytesProcessed, unittest.equals('foo'));
     unittest.expect(o.totalRows, unittest.equals('foo'));
@@ -318,14 +428,14 @@
   buildCounterJobConfiguration--;
 }
 
-buildUnnamed1460() {
+buildUnnamed289() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1460(core.List<core.String> o) {
+checkUnnamed289(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -339,7 +449,7 @@
     o.compression = "foo";
     o.destinationFormat = "foo";
     o.destinationUri = "foo";
-    o.destinationUris = buildUnnamed1460();
+    o.destinationUris = buildUnnamed289();
     o.fieldDelimiter = "foo";
     o.printHeader = true;
     o.sourceTable = buildTableReference();
@@ -354,7 +464,7 @@
     unittest.expect(o.compression, unittest.equals('foo'));
     unittest.expect(o.destinationFormat, unittest.equals('foo'));
     unittest.expect(o.destinationUri, unittest.equals('foo'));
-    checkUnnamed1460(o.destinationUris);
+    checkUnnamed289(o.destinationUris);
     unittest.expect(o.fieldDelimiter, unittest.equals('foo'));
     unittest.expect(o.printHeader, unittest.isTrue);
     checkTableReference(o.sourceTable);
@@ -362,14 +472,14 @@
   buildCounterJobConfigurationExtract--;
 }
 
-buildUnnamed1461() {
+buildUnnamed290() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1461(core.List<core.String> o) {
+checkUnnamed290(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -382,7 +492,7 @@
   if (buildCounterJobConfigurationLink < 3) {
     o.createDisposition = "foo";
     o.destinationTable = buildTableReference();
-    o.sourceUri = buildUnnamed1461();
+    o.sourceUri = buildUnnamed290();
     o.writeDisposition = "foo";
   }
   buildCounterJobConfigurationLink--;
@@ -394,33 +504,33 @@
   if (buildCounterJobConfigurationLink < 3) {
     unittest.expect(o.createDisposition, unittest.equals('foo'));
     checkTableReference(o.destinationTable);
-    checkUnnamed1461(o.sourceUri);
+    checkUnnamed290(o.sourceUri);
     unittest.expect(o.writeDisposition, unittest.equals('foo'));
   }
   buildCounterJobConfigurationLink--;
 }
 
-buildUnnamed1462() {
+buildUnnamed291() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1462(core.List<core.String> o) {
+checkUnnamed291(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1463() {
+buildUnnamed292() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1463(core.List<core.String> o) {
+checkUnnamed292(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -439,14 +549,14 @@
     o.fieldDelimiter = "foo";
     o.ignoreUnknownValues = true;
     o.maxBadRecords = 42;
-    o.projectionFields = buildUnnamed1462();
+    o.projectionFields = buildUnnamed291();
     o.quote = "foo";
     o.schema = buildTableSchema();
     o.schemaInline = "foo";
     o.schemaInlineFormat = "foo";
     o.skipLeadingRows = 42;
     o.sourceFormat = "foo";
-    o.sourceUris = buildUnnamed1463();
+    o.sourceUris = buildUnnamed292();
     o.writeDisposition = "foo";
   }
   buildCounterJobConfigurationLoad--;
@@ -464,19 +574,32 @@
     unittest.expect(o.fieldDelimiter, unittest.equals('foo'));
     unittest.expect(o.ignoreUnknownValues, unittest.isTrue);
     unittest.expect(o.maxBadRecords, unittest.equals(42));
-    checkUnnamed1462(o.projectionFields);
+    checkUnnamed291(o.projectionFields);
     unittest.expect(o.quote, unittest.equals('foo'));
     checkTableSchema(o.schema);
     unittest.expect(o.schemaInline, unittest.equals('foo'));
     unittest.expect(o.schemaInlineFormat, unittest.equals('foo'));
     unittest.expect(o.skipLeadingRows, unittest.equals(42));
     unittest.expect(o.sourceFormat, unittest.equals('foo'));
-    checkUnnamed1463(o.sourceUris);
+    checkUnnamed292(o.sourceUris);
     unittest.expect(o.writeDisposition, unittest.equals('foo'));
   }
   buildCounterJobConfigurationLoad--;
 }
 
+buildUnnamed293() {
+  var o = new core.Map<core.String, api.ExternalDataConfiguration>();
+  o["x"] = buildExternalDataConfiguration();
+  o["y"] = buildExternalDataConfiguration();
+  return o;
+}
+
+checkUnnamed293(core.Map<core.String, api.ExternalDataConfiguration> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkExternalDataConfiguration(o["x"]);
+  checkExternalDataConfiguration(o["y"]);
+}
+
 core.int buildCounterJobConfigurationQuery = 0;
 buildJobConfigurationQuery() {
   var o = new api.JobConfigurationQuery();
@@ -490,6 +613,7 @@
     o.preserveNulls = true;
     o.priority = "foo";
     o.query = "foo";
+    o.tableDefinitions = buildUnnamed293();
     o.useQueryCache = true;
     o.writeDisposition = "foo";
   }
@@ -508,20 +632,21 @@
     unittest.expect(o.preserveNulls, unittest.isTrue);
     unittest.expect(o.priority, unittest.equals('foo'));
     unittest.expect(o.query, unittest.equals('foo'));
+    checkUnnamed293(o.tableDefinitions);
     unittest.expect(o.useQueryCache, unittest.isTrue);
     unittest.expect(o.writeDisposition, unittest.equals('foo'));
   }
   buildCounterJobConfigurationQuery--;
 }
 
-buildUnnamed1464() {
+buildUnnamed294() {
   var o = new core.List<api.TableReference>();
   o.add(buildTableReference());
   o.add(buildTableReference());
   return o;
 }
 
-checkUnnamed1464(core.List<api.TableReference> o) {
+checkUnnamed294(core.List<api.TableReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableReference(o[0]);
   checkTableReference(o[1]);
@@ -535,7 +660,7 @@
     o.createDisposition = "foo";
     o.destinationTable = buildTableReference();
     o.sourceTable = buildTableReference();
-    o.sourceTables = buildUnnamed1464();
+    o.sourceTables = buildUnnamed294();
     o.writeDisposition = "foo";
   }
   buildCounterJobConfigurationTableCopy--;
@@ -548,7 +673,7 @@
     unittest.expect(o.createDisposition, unittest.equals('foo'));
     checkTableReference(o.destinationTable);
     checkTableReference(o.sourceTable);
-    checkUnnamed1464(o.sourceTables);
+    checkUnnamed294(o.sourceTables);
     unittest.expect(o.writeDisposition, unittest.equals('foo'));
   }
   buildCounterJobConfigurationTableCopy--;
@@ -589,14 +714,14 @@
   buildCounterJobListJobs--;
 }
 
-buildUnnamed1465() {
+buildUnnamed295() {
   var o = new core.List<api.JobListJobs>();
   o.add(buildJobListJobs());
   o.add(buildJobListJobs());
   return o;
 }
 
-checkUnnamed1465(core.List<api.JobListJobs> o) {
+checkUnnamed295(core.List<api.JobListJobs> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkJobListJobs(o[0]);
   checkJobListJobs(o[1]);
@@ -608,7 +733,7 @@
   buildCounterJobList++;
   if (buildCounterJobList < 3) {
     o.etag = "foo";
-    o.jobs = buildUnnamed1465();
+    o.jobs = buildUnnamed295();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
@@ -621,7 +746,7 @@
   buildCounterJobList++;
   if (buildCounterJobList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1465(o.jobs);
+    checkUnnamed295(o.jobs);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -727,14 +852,14 @@
   buildCounterJobStatistics3--;
 }
 
-buildUnnamed1466() {
+buildUnnamed296() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1466(core.List<core.String> o) {
+checkUnnamed296(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -745,7 +870,7 @@
   var o = new api.JobStatistics4();
   buildCounterJobStatistics4++;
   if (buildCounterJobStatistics4 < 3) {
-    o.destinationUriFileCounts = buildUnnamed1466();
+    o.destinationUriFileCounts = buildUnnamed296();
   }
   buildCounterJobStatistics4--;
   return o;
@@ -754,19 +879,19 @@
 checkJobStatistics4(api.JobStatistics4 o) {
   buildCounterJobStatistics4++;
   if (buildCounterJobStatistics4 < 3) {
-    checkUnnamed1466(o.destinationUriFileCounts);
+    checkUnnamed296(o.destinationUriFileCounts);
   }
   buildCounterJobStatistics4--;
 }
 
-buildUnnamed1467() {
+buildUnnamed297() {
   var o = new core.List<api.ErrorProto>();
   o.add(buildErrorProto());
   o.add(buildErrorProto());
   return o;
 }
 
-checkUnnamed1467(core.List<api.ErrorProto> o) {
+checkUnnamed297(core.List<api.ErrorProto> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkErrorProto(o[0]);
   checkErrorProto(o[1]);
@@ -778,7 +903,7 @@
   buildCounterJobStatus++;
   if (buildCounterJobStatus < 3) {
     o.errorResult = buildErrorProto();
-    o.errors = buildUnnamed1467();
+    o.errors = buildUnnamed297();
     o.state = "foo";
   }
   buildCounterJobStatus--;
@@ -789,7 +914,7 @@
   buildCounterJobStatus++;
   if (buildCounterJobStatus < 3) {
     checkErrorProto(o.errorResult);
-    checkUnnamed1467(o.errors);
+    checkUnnamed297(o.errors);
     unittest.expect(o.state, unittest.equals('foo'));
   }
   buildCounterJobStatus--;
@@ -835,14 +960,14 @@
   buildCounterProjectListProjects--;
 }
 
-buildUnnamed1468() {
+buildUnnamed298() {
   var o = new core.List<api.ProjectListProjects>();
   o.add(buildProjectListProjects());
   o.add(buildProjectListProjects());
   return o;
 }
 
-checkUnnamed1468(core.List<api.ProjectListProjects> o) {
+checkUnnamed298(core.List<api.ProjectListProjects> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProjectListProjects(o[0]);
   checkProjectListProjects(o[1]);
@@ -856,7 +981,7 @@
     o.etag = "foo";
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.projects = buildUnnamed1468();
+    o.projects = buildUnnamed298();
     o.totalItems = 42;
   }
   buildCounterProjectList--;
@@ -869,7 +994,7 @@
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1468(o.projects);
+    checkUnnamed298(o.projects);
     unittest.expect(o.totalItems, unittest.equals(42));
   }
   buildCounterProjectList--;
@@ -927,14 +1052,14 @@
   buildCounterQueryRequest--;
 }
 
-buildUnnamed1469() {
+buildUnnamed299() {
   var o = new core.List<api.TableRow>();
   o.add(buildTableRow());
   o.add(buildTableRow());
   return o;
 }
 
-checkUnnamed1469(core.List<api.TableRow> o) {
+checkUnnamed299(core.List<api.TableRow> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableRow(o[0]);
   checkTableRow(o[1]);
@@ -950,7 +1075,7 @@
     o.jobReference = buildJobReference();
     o.kind = "foo";
     o.pageToken = "foo";
-    o.rows = buildUnnamed1469();
+    o.rows = buildUnnamed299();
     o.schema = buildTableSchema();
     o.totalBytesProcessed = "foo";
     o.totalRows = "foo";
@@ -967,7 +1092,7 @@
     checkJobReference(o.jobReference);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.pageToken, unittest.equals('foo'));
-    checkUnnamed1469(o.rows);
+    checkUnnamed299(o.rows);
     checkTableSchema(o.schema);
     unittest.expect(o.totalBytesProcessed, unittest.equals('foo'));
     unittest.expect(o.totalRows, unittest.equals('foo'));
@@ -1062,14 +1187,14 @@
   buildCounterTableDataInsertAllRequestRows--;
 }
 
-buildUnnamed1470() {
+buildUnnamed300() {
   var o = new core.List<api.TableDataInsertAllRequestRows>();
   o.add(buildTableDataInsertAllRequestRows());
   o.add(buildTableDataInsertAllRequestRows());
   return o;
 }
 
-checkUnnamed1470(core.List<api.TableDataInsertAllRequestRows> o) {
+checkUnnamed300(core.List<api.TableDataInsertAllRequestRows> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableDataInsertAllRequestRows(o[0]);
   checkTableDataInsertAllRequestRows(o[1]);
@@ -1080,8 +1205,10 @@
   var o = new api.TableDataInsertAllRequest();
   buildCounterTableDataInsertAllRequest++;
   if (buildCounterTableDataInsertAllRequest < 3) {
+    o.ignoreUnknownValues = true;
     o.kind = "foo";
-    o.rows = buildUnnamed1470();
+    o.rows = buildUnnamed300();
+    o.skipInvalidRows = true;
   }
   buildCounterTableDataInsertAllRequest--;
   return o;
@@ -1090,20 +1217,22 @@
 checkTableDataInsertAllRequest(api.TableDataInsertAllRequest o) {
   buildCounterTableDataInsertAllRequest++;
   if (buildCounterTableDataInsertAllRequest < 3) {
+    unittest.expect(o.ignoreUnknownValues, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1470(o.rows);
+    checkUnnamed300(o.rows);
+    unittest.expect(o.skipInvalidRows, unittest.isTrue);
   }
   buildCounterTableDataInsertAllRequest--;
 }
 
-buildUnnamed1471() {
+buildUnnamed301() {
   var o = new core.List<api.ErrorProto>();
   o.add(buildErrorProto());
   o.add(buildErrorProto());
   return o;
 }
 
-checkUnnamed1471(core.List<api.ErrorProto> o) {
+checkUnnamed301(core.List<api.ErrorProto> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkErrorProto(o[0]);
   checkErrorProto(o[1]);
@@ -1114,7 +1243,7 @@
   var o = new api.TableDataInsertAllResponseInsertErrors();
   buildCounterTableDataInsertAllResponseInsertErrors++;
   if (buildCounterTableDataInsertAllResponseInsertErrors < 3) {
-    o.errors = buildUnnamed1471();
+    o.errors = buildUnnamed301();
     o.index = 42;
   }
   buildCounterTableDataInsertAllResponseInsertErrors--;
@@ -1124,20 +1253,20 @@
 checkTableDataInsertAllResponseInsertErrors(api.TableDataInsertAllResponseInsertErrors o) {
   buildCounterTableDataInsertAllResponseInsertErrors++;
   if (buildCounterTableDataInsertAllResponseInsertErrors < 3) {
-    checkUnnamed1471(o.errors);
+    checkUnnamed301(o.errors);
     unittest.expect(o.index, unittest.equals(42));
   }
   buildCounterTableDataInsertAllResponseInsertErrors--;
 }
 
-buildUnnamed1472() {
+buildUnnamed302() {
   var o = new core.List<api.TableDataInsertAllResponseInsertErrors>();
   o.add(buildTableDataInsertAllResponseInsertErrors());
   o.add(buildTableDataInsertAllResponseInsertErrors());
   return o;
 }
 
-checkUnnamed1472(core.List<api.TableDataInsertAllResponseInsertErrors> o) {
+checkUnnamed302(core.List<api.TableDataInsertAllResponseInsertErrors> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableDataInsertAllResponseInsertErrors(o[0]);
   checkTableDataInsertAllResponseInsertErrors(o[1]);
@@ -1148,7 +1277,7 @@
   var o = new api.TableDataInsertAllResponse();
   buildCounterTableDataInsertAllResponse++;
   if (buildCounterTableDataInsertAllResponse < 3) {
-    o.insertErrors = buildUnnamed1472();
+    o.insertErrors = buildUnnamed302();
     o.kind = "foo";
   }
   buildCounterTableDataInsertAllResponse--;
@@ -1158,20 +1287,20 @@
 checkTableDataInsertAllResponse(api.TableDataInsertAllResponse o) {
   buildCounterTableDataInsertAllResponse++;
   if (buildCounterTableDataInsertAllResponse < 3) {
-    checkUnnamed1472(o.insertErrors);
+    checkUnnamed302(o.insertErrors);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterTableDataInsertAllResponse--;
 }
 
-buildUnnamed1473() {
+buildUnnamed303() {
   var o = new core.List<api.TableRow>();
   o.add(buildTableRow());
   o.add(buildTableRow());
   return o;
 }
 
-checkUnnamed1473(core.List<api.TableRow> o) {
+checkUnnamed303(core.List<api.TableRow> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableRow(o[0]);
   checkTableRow(o[1]);
@@ -1185,7 +1314,7 @@
     o.etag = "foo";
     o.kind = "foo";
     o.pageToken = "foo";
-    o.rows = buildUnnamed1473();
+    o.rows = buildUnnamed303();
     o.totalRows = "foo";
   }
   buildCounterTableDataList--;
@@ -1198,20 +1327,20 @@
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.pageToken, unittest.equals('foo'));
-    checkUnnamed1473(o.rows);
+    checkUnnamed303(o.rows);
     unittest.expect(o.totalRows, unittest.equals('foo'));
   }
   buildCounterTableDataList--;
 }
 
-buildUnnamed1474() {
+buildUnnamed304() {
   var o = new core.List<api.TableFieldSchema>();
   o.add(buildTableFieldSchema());
   o.add(buildTableFieldSchema());
   return o;
 }
 
-checkUnnamed1474(core.List<api.TableFieldSchema> o) {
+checkUnnamed304(core.List<api.TableFieldSchema> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableFieldSchema(o[0]);
   checkTableFieldSchema(o[1]);
@@ -1223,7 +1352,7 @@
   buildCounterTableFieldSchema++;
   if (buildCounterTableFieldSchema < 3) {
     o.description = "foo";
-    o.fields = buildUnnamed1474();
+    o.fields = buildUnnamed304();
     o.mode = "foo";
     o.name = "foo";
     o.type = "foo";
@@ -1236,7 +1365,7 @@
   buildCounterTableFieldSchema++;
   if (buildCounterTableFieldSchema < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed1474(o.fields);
+    checkUnnamed304(o.fields);
     unittest.expect(o.mode, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
@@ -1271,14 +1400,14 @@
   buildCounterTableListTables--;
 }
 
-buildUnnamed1475() {
+buildUnnamed305() {
   var o = new core.List<api.TableListTables>();
   o.add(buildTableListTables());
   o.add(buildTableListTables());
   return o;
 }
 
-checkUnnamed1475(core.List<api.TableListTables> o) {
+checkUnnamed305(core.List<api.TableListTables> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableListTables(o[0]);
   checkTableListTables(o[1]);
@@ -1292,7 +1421,7 @@
     o.etag = "foo";
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.tables = buildUnnamed1475();
+    o.tables = buildUnnamed305();
     o.totalItems = 42;
   }
   buildCounterTableList--;
@@ -1305,7 +1434,7 @@
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1475(o.tables);
+    checkUnnamed305(o.tables);
     unittest.expect(o.totalItems, unittest.equals(42));
   }
   buildCounterTableList--;
@@ -1334,14 +1463,14 @@
   buildCounterTableReference--;
 }
 
-buildUnnamed1476() {
+buildUnnamed306() {
   var o = new core.List<api.TableCell>();
   o.add(buildTableCell());
   o.add(buildTableCell());
   return o;
 }
 
-checkUnnamed1476(core.List<api.TableCell> o) {
+checkUnnamed306(core.List<api.TableCell> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableCell(o[0]);
   checkTableCell(o[1]);
@@ -1352,7 +1481,7 @@
   var o = new api.TableRow();
   buildCounterTableRow++;
   if (buildCounterTableRow < 3) {
-    o.f = buildUnnamed1476();
+    o.f = buildUnnamed306();
   }
   buildCounterTableRow--;
   return o;
@@ -1361,19 +1490,19 @@
 checkTableRow(api.TableRow o) {
   buildCounterTableRow++;
   if (buildCounterTableRow < 3) {
-    checkUnnamed1476(o.f);
+    checkUnnamed306(o.f);
   }
   buildCounterTableRow--;
 }
 
-buildUnnamed1477() {
+buildUnnamed307() {
   var o = new core.List<api.TableFieldSchema>();
   o.add(buildTableFieldSchema());
   o.add(buildTableFieldSchema());
   return o;
 }
 
-checkUnnamed1477(core.List<api.TableFieldSchema> o) {
+checkUnnamed307(core.List<api.TableFieldSchema> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableFieldSchema(o[0]);
   checkTableFieldSchema(o[1]);
@@ -1384,7 +1513,7 @@
   var o = new api.TableSchema();
   buildCounterTableSchema++;
   if (buildCounterTableSchema < 3) {
-    o.fields = buildUnnamed1477();
+    o.fields = buildUnnamed307();
   }
   buildCounterTableSchema--;
   return o;
@@ -1393,7 +1522,7 @@
 checkTableSchema(api.TableSchema o) {
   buildCounterTableSchema++;
   if (buildCounterTableSchema < 3) {
-    checkUnnamed1477(o.fields);
+    checkUnnamed307(o.fields);
   }
   buildCounterTableSchema--;
 }
@@ -1417,14 +1546,14 @@
   buildCounterViewDefinition--;
 }
 
-buildUnnamed1478() {
+buildUnnamed308() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1478(core.List<core.String> o) {
+checkUnnamed308(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1432,6 +1561,15 @@
 
 
 main() {
+  unittest.group("obj-schema-CsvOptions", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildCsvOptions();
+      var od = new api.CsvOptions.fromJson(o.toJson());
+      checkCsvOptions(od);
+    });
+  });
+
+
   unittest.group("obj-schema-DatasetAccess", () {
     unittest.test("to-json--from-json", () {
       var o = buildDatasetAccess();
@@ -1486,6 +1624,15 @@
   });
 
 
+  unittest.group("obj-schema-ExternalDataConfiguration", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildExternalDataConfiguration();
+      var od = new api.ExternalDataConfiguration.fromJson(o.toJson());
+      checkExternalDataConfiguration(od);
+    });
+  });
+
+
   unittest.group("obj-schema-GetQueryResultsResponse", () {
     unittest.test("to-json--from-json", () {
       var o = buildGetQueryResultsResponse();
@@ -1813,7 +1960,7 @@
   unittest.group("resource-DatasetsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DatasetsResourceApi res = new api.BigqueryApi(mock).datasets;
       var arg_projectId = "foo";
       var arg_datasetId = "foo";
@@ -1863,14 +2010,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_projectId, arg_datasetId, deleteContents: arg_deleteContents).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DatasetsResourceApi res = new api.BigqueryApi(mock).datasets;
       var arg_projectId = "foo";
       var arg_datasetId = "foo";
@@ -1918,7 +2065,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDataset());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_projectId, arg_datasetId).then(unittest.expectAsync(((api.Dataset response) {
         checkDataset(response);
@@ -1927,7 +2074,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DatasetsResourceApi res = new api.BigqueryApi(mock).datasets;
       var arg_request = buildDataset();
       var arg_projectId = "foo";
@@ -1975,7 +2122,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDataset());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_projectId).then(unittest.expectAsync(((api.Dataset response) {
         checkDataset(response);
@@ -1984,7 +2131,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DatasetsResourceApi res = new api.BigqueryApi(mock).datasets;
       var arg_projectId = "foo";
       var arg_all = true;
@@ -2034,7 +2181,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDatasetList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_projectId, all: arg_all, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.DatasetList response) {
         checkDatasetList(response);
@@ -2043,7 +2190,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DatasetsResourceApi res = new api.BigqueryApi(mock).datasets;
       var arg_request = buildDataset();
       var arg_projectId = "foo";
@@ -2095,7 +2242,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDataset());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_projectId, arg_datasetId).then(unittest.expectAsync(((api.Dataset response) {
         checkDataset(response);
@@ -2104,7 +2251,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DatasetsResourceApi res = new api.BigqueryApi(mock).datasets;
       var arg_request = buildDataset();
       var arg_projectId = "foo";
@@ -2156,7 +2303,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDataset());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_projectId, arg_datasetId).then(unittest.expectAsync(((api.Dataset response) {
         checkDataset(response);
@@ -2169,7 +2316,7 @@
   unittest.group("resource-JobsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.JobsResourceApi res = new api.BigqueryApi(mock).jobs;
       var arg_projectId = "foo";
       var arg_jobId = "foo";
@@ -2217,7 +2364,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildJob());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_projectId, arg_jobId).then(unittest.expectAsync(((api.Job response) {
         checkJob(response);
@@ -2226,7 +2373,7 @@
 
     unittest.test("method--getQueryResults", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.JobsResourceApi res = new api.BigqueryApi(mock).jobs;
       var arg_projectId = "foo";
       var arg_jobId = "foo";
@@ -2282,7 +2429,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGetQueryResultsResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.getQueryResults(arg_projectId, arg_jobId, maxResults: arg_maxResults, pageToken: arg_pageToken, startIndex: arg_startIndex, timeoutMs: arg_timeoutMs).then(unittest.expectAsync(((api.GetQueryResultsResponse response) {
         checkGetQueryResultsResponse(response);
@@ -2293,7 +2440,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.JobsResourceApi res = new api.BigqueryApi(mock).jobs;
       var arg_request = buildJob();
       var arg_projectId = "foo";
@@ -2341,7 +2488,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildJob());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_projectId).then(unittest.expectAsync(((api.Job response) {
         checkJob(response);
@@ -2350,14 +2497,14 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.JobsResourceApi res = new api.BigqueryApi(mock).jobs;
       var arg_projectId = "foo";
       var arg_allUsers = true;
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_projection = "foo";
-      var arg_stateFilter = buildUnnamed1478();
+      var arg_stateFilter = buildUnnamed308();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -2404,7 +2551,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildJobList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_projectId, allUsers: arg_allUsers, maxResults: arg_maxResults, pageToken: arg_pageToken, projection: arg_projection, stateFilter: arg_stateFilter).then(unittest.expectAsync(((api.JobList response) {
         checkJobList(response);
@@ -2413,7 +2560,7 @@
 
     unittest.test("method--query", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.JobsResourceApi res = new api.BigqueryApi(mock).jobs;
       var arg_request = buildQueryRequest();
       var arg_projectId = "foo";
@@ -2461,7 +2608,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildQueryResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.query(arg_request, arg_projectId).then(unittest.expectAsync(((api.QueryResponse response) {
         checkQueryResponse(response);
@@ -2474,7 +2621,7 @@
   unittest.group("resource-ProjectsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ProjectsResourceApi res = new api.BigqueryApi(mock).projects;
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
@@ -2514,7 +2661,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProjectList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.ProjectList response) {
         checkProjectList(response);
@@ -2527,7 +2674,7 @@
   unittest.group("resource-TabledataResourceApi", () {
     unittest.test("method--insertAll", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TabledataResourceApi res = new api.BigqueryApi(mock).tabledata;
       var arg_request = buildTableDataInsertAllRequest();
       var arg_projectId = "foo";
@@ -2591,7 +2738,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTableDataInsertAllResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insertAll(arg_request, arg_projectId, arg_datasetId, arg_tableId).then(unittest.expectAsync(((api.TableDataInsertAllResponse response) {
         checkTableDataInsertAllResponse(response);
@@ -2600,7 +2747,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TabledataResourceApi res = new api.BigqueryApi(mock).tabledata;
       var arg_projectId = "foo";
       var arg_datasetId = "foo";
@@ -2666,7 +2813,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTableDataList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_projectId, arg_datasetId, arg_tableId, maxResults: arg_maxResults, pageToken: arg_pageToken, startIndex: arg_startIndex).then(unittest.expectAsync(((api.TableDataList response) {
         checkTableDataList(response);
@@ -2679,7 +2826,7 @@
   unittest.group("resource-TablesResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TablesResourceApi res = new api.BigqueryApi(mock).tables;
       var arg_projectId = "foo";
       var arg_datasetId = "foo";
@@ -2735,14 +2882,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_projectId, arg_datasetId, arg_tableId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TablesResourceApi res = new api.BigqueryApi(mock).tables;
       var arg_projectId = "foo";
       var arg_datasetId = "foo";
@@ -2798,7 +2945,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTable());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_projectId, arg_datasetId, arg_tableId).then(unittest.expectAsync(((api.Table response) {
         checkTable(response);
@@ -2807,7 +2954,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TablesResourceApi res = new api.BigqueryApi(mock).tables;
       var arg_request = buildTable();
       var arg_projectId = "foo";
@@ -2863,7 +3010,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTable());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_projectId, arg_datasetId).then(unittest.expectAsync(((api.Table response) {
         checkTable(response);
@@ -2872,7 +3019,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TablesResourceApi res = new api.BigqueryApi(mock).tables;
       var arg_projectId = "foo";
       var arg_datasetId = "foo";
@@ -2928,7 +3075,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTableList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_projectId, arg_datasetId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.TableList response) {
         checkTableList(response);
@@ -2937,7 +3084,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TablesResourceApi res = new api.BigqueryApi(mock).tables;
       var arg_request = buildTable();
       var arg_projectId = "foo";
@@ -2997,7 +3144,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTable());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_projectId, arg_datasetId, arg_tableId).then(unittest.expectAsync(((api.Table response) {
         checkTable(response);
@@ -3006,7 +3153,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TablesResourceApi res = new api.BigqueryApi(mock).tables;
       var arg_request = buildTable();
       var arg_projectId = "foo";
@@ -3066,7 +3213,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTable());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_projectId, arg_datasetId, arg_tableId).then(unittest.expectAsync(((api.Table response) {
         checkTable(response);
diff --git a/generated/googleapis/test/blogger/v3_test.dart b/generated/googleapis/test/blogger/v3_test.dart
index 91deeea..c0a3a50 100644
--- a/generated/googleapis/test/blogger/v3_test.dart
+++ b/generated/googleapis/test/blogger/v3_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/blogger/v3.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterBlogLocale = 0;
 buildBlogLocale() {
@@ -60,14 +95,14 @@
   buildCounterBlogPages--;
 }
 
-buildUnnamed1026() {
+buildUnnamed309() {
   var o = new core.List<api.Post>();
   o.add(buildPost());
   o.add(buildPost());
   return o;
 }
 
-checkUnnamed1026(core.List<api.Post> o) {
+checkUnnamed309(core.List<api.Post> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPost(o[0]);
   checkPost(o[1]);
@@ -78,7 +113,7 @@
   var o = new api.BlogPosts();
   buildCounterBlogPosts++;
   if (buildCounterBlogPosts < 3) {
-    o.items = buildUnnamed1026();
+    o.items = buildUnnamed309();
     o.selfLink = "foo";
     o.totalItems = 42;
   }
@@ -89,7 +124,7 @@
 checkBlogPosts(api.BlogPosts o) {
   buildCounterBlogPosts++;
   if (buildCounterBlogPosts < 3) {
-    checkUnnamed1026(o.items);
+    checkUnnamed309(o.items);
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
   }
@@ -139,27 +174,27 @@
   buildCounterBlog--;
 }
 
-buildUnnamed1027() {
+buildUnnamed310() {
   var o = new core.List<api.BlogUserInfo>();
   o.add(buildBlogUserInfo());
   o.add(buildBlogUserInfo());
   return o;
 }
 
-checkUnnamed1027(core.List<api.BlogUserInfo> o) {
+checkUnnamed310(core.List<api.BlogUserInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBlogUserInfo(o[0]);
   checkBlogUserInfo(o[1]);
 }
 
-buildUnnamed1028() {
+buildUnnamed311() {
   var o = new core.List<api.Blog>();
   o.add(buildBlog());
   o.add(buildBlog());
   return o;
 }
 
-checkUnnamed1028(core.List<api.Blog> o) {
+checkUnnamed311(core.List<api.Blog> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBlog(o[0]);
   checkBlog(o[1]);
@@ -170,8 +205,8 @@
   var o = new api.BlogList();
   buildCounterBlogList++;
   if (buildCounterBlogList < 3) {
-    o.blogUserInfos = buildUnnamed1027();
-    o.items = buildUnnamed1028();
+    o.blogUserInfos = buildUnnamed310();
+    o.items = buildUnnamed311();
     o.kind = "foo";
   }
   buildCounterBlogList--;
@@ -181,8 +216,8 @@
 checkBlogList(api.BlogList o) {
   buildCounterBlogList++;
   if (buildCounterBlogList < 3) {
-    checkUnnamed1027(o.blogUserInfos);
-    checkUnnamed1028(o.items);
+    checkUnnamed310(o.blogUserInfos);
+    checkUnnamed311(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterBlogList--;
@@ -380,14 +415,14 @@
   buildCounterComment--;
 }
 
-buildUnnamed1029() {
+buildUnnamed312() {
   var o = new core.List<api.Comment>();
   o.add(buildComment());
   o.add(buildComment());
   return o;
 }
 
-checkUnnamed1029(core.List<api.Comment> o) {
+checkUnnamed312(core.List<api.Comment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkComment(o[0]);
   checkComment(o[1]);
@@ -398,7 +433,7 @@
   var o = new api.CommentList();
   buildCounterCommentList++;
   if (buildCounterCommentList < 3) {
-    o.items = buildUnnamed1029();
+    o.items = buildUnnamed312();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.prevPageToken = "foo";
@@ -410,7 +445,7 @@
 checkCommentList(api.CommentList o) {
   buildCounterCommentList++;
   if (buildCounterCommentList < 3) {
-    checkUnnamed1029(o.items);
+    checkUnnamed312(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.prevPageToken, unittest.equals('foo'));
@@ -522,14 +557,14 @@
   buildCounterPage--;
 }
 
-buildUnnamed1030() {
+buildUnnamed313() {
   var o = new core.List<api.Page>();
   o.add(buildPage());
   o.add(buildPage());
   return o;
 }
 
-checkUnnamed1030(core.List<api.Page> o) {
+checkUnnamed313(core.List<api.Page> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPage(o[0]);
   checkPage(o[1]);
@@ -540,7 +575,7 @@
   var o = new api.PageList();
   buildCounterPageList++;
   if (buildCounterPageList < 3) {
-    o.items = buildUnnamed1030();
+    o.items = buildUnnamed313();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -551,7 +586,7 @@
 checkPageList(api.PageList o) {
   buildCounterPageList++;
   if (buildCounterPageList < 3) {
-    checkUnnamed1030(o.items);
+    checkUnnamed313(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -579,14 +614,14 @@
   buildCounterPageviewsCounts--;
 }
 
-buildUnnamed1031() {
+buildUnnamed314() {
   var o = new core.List<api.PageviewsCounts>();
   o.add(buildPageviewsCounts());
   o.add(buildPageviewsCounts());
   return o;
 }
 
-checkUnnamed1031(core.List<api.PageviewsCounts> o) {
+checkUnnamed314(core.List<api.PageviewsCounts> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPageviewsCounts(o[0]);
   checkPageviewsCounts(o[1]);
@@ -598,7 +633,7 @@
   buildCounterPageviews++;
   if (buildCounterPageviews < 3) {
     o.blogId = "foo";
-    o.counts = buildUnnamed1031();
+    o.counts = buildUnnamed314();
     o.kind = "foo";
   }
   buildCounterPageviews--;
@@ -609,7 +644,7 @@
   buildCounterPageviews++;
   if (buildCounterPageviews < 3) {
     unittest.expect(o.blogId, unittest.equals('foo'));
-    checkUnnamed1031(o.counts);
+    checkUnnamed314(o.counts);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterPageviews--;
@@ -697,27 +732,27 @@
   buildCounterPostImages--;
 }
 
-buildUnnamed1032() {
+buildUnnamed315() {
   var o = new core.List<api.PostImages>();
   o.add(buildPostImages());
   o.add(buildPostImages());
   return o;
 }
 
-checkUnnamed1032(core.List<api.PostImages> o) {
+checkUnnamed315(core.List<api.PostImages> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPostImages(o[0]);
   checkPostImages(o[1]);
 }
 
-buildUnnamed1033() {
+buildUnnamed316() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1033(core.List<core.String> o) {
+checkUnnamed316(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -748,14 +783,14 @@
   buildCounterPostLocation--;
 }
 
-buildUnnamed1034() {
+buildUnnamed317() {
   var o = new core.List<api.Comment>();
   o.add(buildComment());
   o.add(buildComment());
   return o;
 }
 
-checkUnnamed1034(core.List<api.Comment> o) {
+checkUnnamed317(core.List<api.Comment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkComment(o[0]);
   checkComment(o[1]);
@@ -766,7 +801,7 @@
   var o = new api.PostReplies();
   buildCounterPostReplies++;
   if (buildCounterPostReplies < 3) {
-    o.items = buildUnnamed1034();
+    o.items = buildUnnamed317();
     o.selfLink = "foo";
     o.totalItems = "foo";
   }
@@ -777,7 +812,7 @@
 checkPostReplies(api.PostReplies o) {
   buildCounterPostReplies++;
   if (buildCounterPostReplies < 3) {
-    checkUnnamed1034(o.items);
+    checkUnnamed317(o.items);
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals('foo'));
   }
@@ -795,9 +830,9 @@
     o.customMetaData = "foo";
     o.etag = "foo";
     o.id = "foo";
-    o.images = buildUnnamed1032();
+    o.images = buildUnnamed315();
     o.kind = "foo";
-    o.labels = buildUnnamed1033();
+    o.labels = buildUnnamed316();
     o.location = buildPostLocation();
     o.published = core.DateTime.parse("2002-02-27T14:01:02");
     o.readerComments = "foo";
@@ -822,9 +857,9 @@
     unittest.expect(o.customMetaData, unittest.equals('foo'));
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1032(o.images);
+    checkUnnamed315(o.images);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1033(o.labels);
+    checkUnnamed316(o.labels);
     checkPostLocation(o.location);
     unittest.expect(o.published, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.readerComments, unittest.equals('foo'));
@@ -839,14 +874,14 @@
   buildCounterPost--;
 }
 
-buildUnnamed1035() {
+buildUnnamed318() {
   var o = new core.List<api.Post>();
   o.add(buildPost());
   o.add(buildPost());
   return o;
 }
 
-checkUnnamed1035(core.List<api.Post> o) {
+checkUnnamed318(core.List<api.Post> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPost(o[0]);
   checkPost(o[1]);
@@ -857,7 +892,7 @@
   var o = new api.PostList();
   buildCounterPostList++;
   if (buildCounterPostList < 3) {
-    o.items = buildUnnamed1035();
+    o.items = buildUnnamed318();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -868,7 +903,7 @@
 checkPostList(api.PostList o) {
   buildCounterPostList++;
   if (buildCounterPostList < 3) {
-    checkUnnamed1035(o.items);
+    checkUnnamed318(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -925,14 +960,14 @@
   buildCounterPostUserInfo--;
 }
 
-buildUnnamed1036() {
+buildUnnamed319() {
   var o = new core.List<api.PostUserInfo>();
   o.add(buildPostUserInfo());
   o.add(buildPostUserInfo());
   return o;
 }
 
-checkUnnamed1036(core.List<api.PostUserInfo> o) {
+checkUnnamed319(core.List<api.PostUserInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPostUserInfo(o[0]);
   checkPostUserInfo(o[1]);
@@ -943,7 +978,7 @@
   var o = new api.PostUserInfosList();
   buildCounterPostUserInfosList++;
   if (buildCounterPostUserInfosList < 3) {
-    o.items = buildUnnamed1036();
+    o.items = buildUnnamed319();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -954,7 +989,7 @@
 checkPostUserInfosList(api.PostUserInfosList o) {
   buildCounterPostUserInfosList++;
   if (buildCounterPostUserInfosList < 3) {
-    checkUnnamed1036(o.items);
+    checkUnnamed319(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1038,105 +1073,105 @@
   buildCounterUser--;
 }
 
-buildUnnamed1037() {
+buildUnnamed320() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1037(core.List<core.String> o) {
+checkUnnamed320(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1038() {
+buildUnnamed321() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1038(core.List<core.String> o) {
+checkUnnamed321(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1039() {
+buildUnnamed322() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1039(core.List<core.String> o) {
+checkUnnamed322(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1040() {
+buildUnnamed323() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1040(core.List<core.String> o) {
+checkUnnamed323(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1041() {
+buildUnnamed324() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1041(core.List<core.String> o) {
+checkUnnamed324(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1042() {
+buildUnnamed325() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1042(core.List<core.String> o) {
+checkUnnamed325(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1043() {
+buildUnnamed326() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1043(core.List<core.String> o) {
+checkUnnamed326(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1044() {
+buildUnnamed327() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1044(core.List<core.String> o) {
+checkUnnamed327(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1462,7 +1497,7 @@
   unittest.group("resource-BlogUserInfosResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BlogUserInfosResourceApi res = new api.BloggerApi(mock).blogUserInfos;
       var arg_userId = "foo";
       var arg_blogId = "foo";
@@ -1512,7 +1547,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBlogUserInfo());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_userId, arg_blogId, maxPosts: arg_maxPosts).then(unittest.expectAsync(((api.BlogUserInfo response) {
         checkBlogUserInfo(response);
@@ -1525,7 +1560,7 @@
   unittest.group("resource-BlogsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BlogsResourceApi res = new api.BloggerApi(mock).blogs;
       var arg_blogId = "foo";
       var arg_maxPosts = 42;
@@ -1569,7 +1604,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBlog());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_blogId, maxPosts: arg_maxPosts, view: arg_view).then(unittest.expectAsync(((api.Blog response) {
         checkBlog(response);
@@ -1578,7 +1613,7 @@
 
     unittest.test("method--getByUrl", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BlogsResourceApi res = new api.BloggerApi(mock).blogs;
       var arg_url = "foo";
       var arg_view = "foo";
@@ -1618,7 +1653,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBlog());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.getByUrl(arg_url, view: arg_view).then(unittest.expectAsync(((api.Blog response) {
         checkBlog(response);
@@ -1627,12 +1662,12 @@
 
     unittest.test("method--listByUser", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BlogsResourceApi res = new api.BloggerApi(mock).blogs;
       var arg_userId = "foo";
       var arg_fetchUserInfo = true;
-      var arg_role = buildUnnamed1037();
-      var arg_status = buildUnnamed1038();
+      var arg_role = buildUnnamed320();
+      var arg_status = buildUnnamed321();
       var arg_view = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1679,7 +1714,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBlogList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.listByUser(arg_userId, fetchUserInfo: arg_fetchUserInfo, role: arg_role, status: arg_status, view: arg_view).then(unittest.expectAsync(((api.BlogList response) {
         checkBlogList(response);
@@ -1692,7 +1727,7 @@
   unittest.group("resource-CommentsResourceApi", () {
     unittest.test("method--approve", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CommentsResourceApi res = new api.BloggerApi(mock).comments;
       var arg_blogId = "foo";
       var arg_postId = "foo";
@@ -1752,7 +1787,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildComment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.approve(arg_blogId, arg_postId, arg_commentId).then(unittest.expectAsync(((api.Comment response) {
         checkComment(response);
@@ -1761,7 +1796,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CommentsResourceApi res = new api.BloggerApi(mock).comments;
       var arg_blogId = "foo";
       var arg_postId = "foo";
@@ -1817,14 +1852,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_blogId, arg_postId, arg_commentId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CommentsResourceApi res = new api.BloggerApi(mock).comments;
       var arg_blogId = "foo";
       var arg_postId = "foo";
@@ -1882,7 +1917,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildComment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_blogId, arg_postId, arg_commentId, view: arg_view).then(unittest.expectAsync(((api.Comment response) {
         checkComment(response);
@@ -1891,7 +1926,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CommentsResourceApi res = new api.BloggerApi(mock).comments;
       var arg_blogId = "foo";
       var arg_postId = "foo";
@@ -1900,7 +1935,7 @@
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_startDate = core.DateTime.parse("2002-02-27T14:01:02");
-      var arg_status = buildUnnamed1039();
+      var arg_status = buildUnnamed322();
       var arg_view = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1957,7 +1992,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCommentList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_blogId, arg_postId, endDate: arg_endDate, fetchBodies: arg_fetchBodies, maxResults: arg_maxResults, pageToken: arg_pageToken, startDate: arg_startDate, status: arg_status, view: arg_view).then(unittest.expectAsync(((api.CommentList response) {
         checkCommentList(response);
@@ -1966,7 +2001,7 @@
 
     unittest.test("method--listByBlog", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CommentsResourceApi res = new api.BloggerApi(mock).comments;
       var arg_blogId = "foo";
       var arg_endDate = core.DateTime.parse("2002-02-27T14:01:02");
@@ -1974,7 +2009,7 @@
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_startDate = core.DateTime.parse("2002-02-27T14:01:02");
-      var arg_status = buildUnnamed1040();
+      var arg_status = buildUnnamed323();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -2022,7 +2057,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCommentList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.listByBlog(arg_blogId, endDate: arg_endDate, fetchBodies: arg_fetchBodies, maxResults: arg_maxResults, pageToken: arg_pageToken, startDate: arg_startDate, status: arg_status).then(unittest.expectAsync(((api.CommentList response) {
         checkCommentList(response);
@@ -2031,7 +2066,7 @@
 
     unittest.test("method--markAsSpam", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CommentsResourceApi res = new api.BloggerApi(mock).comments;
       var arg_blogId = "foo";
       var arg_postId = "foo";
@@ -2091,7 +2126,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildComment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.markAsSpam(arg_blogId, arg_postId, arg_commentId).then(unittest.expectAsync(((api.Comment response) {
         checkComment(response);
@@ -2100,7 +2135,7 @@
 
     unittest.test("method--removeContent", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CommentsResourceApi res = new api.BloggerApi(mock).comments;
       var arg_blogId = "foo";
       var arg_postId = "foo";
@@ -2160,7 +2195,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildComment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.removeContent(arg_blogId, arg_postId, arg_commentId).then(unittest.expectAsync(((api.Comment response) {
         checkComment(response);
@@ -2173,10 +2208,10 @@
   unittest.group("resource-PageViewsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PageViewsResourceApi res = new api.BloggerApi(mock).pageViews;
       var arg_blogId = "foo";
-      var arg_range = buildUnnamed1041();
+      var arg_range = buildUnnamed324();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -2219,7 +2254,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPageviews());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_blogId, range: arg_range).then(unittest.expectAsync(((api.Pageviews response) {
         checkPageviews(response);
@@ -2232,7 +2267,7 @@
   unittest.group("resource-PagesResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PagesResourceApi res = new api.BloggerApi(mock).pages;
       var arg_blogId = "foo";
       var arg_pageId = "foo";
@@ -2280,14 +2315,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_blogId, arg_pageId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PagesResourceApi res = new api.BloggerApi(mock).pages;
       var arg_blogId = "foo";
       var arg_pageId = "foo";
@@ -2337,7 +2372,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPage());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_blogId, arg_pageId, view: arg_view).then(unittest.expectAsync(((api.Page response) {
         checkPage(response);
@@ -2346,7 +2381,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PagesResourceApi res = new api.BloggerApi(mock).pages;
       var arg_request = buildPage();
       var arg_blogId = "foo";
@@ -2396,7 +2431,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPage());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_blogId, isDraft: arg_isDraft).then(unittest.expectAsync(((api.Page response) {
         checkPage(response);
@@ -2405,13 +2440,13 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PagesResourceApi res = new api.BloggerApi(mock).pages;
       var arg_blogId = "foo";
       var arg_fetchBodies = true;
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
-      var arg_status = buildUnnamed1042();
+      var arg_status = buildUnnamed325();
       var arg_view = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -2459,7 +2494,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPageList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_blogId, fetchBodies: arg_fetchBodies, maxResults: arg_maxResults, pageToken: arg_pageToken, status: arg_status, view: arg_view).then(unittest.expectAsync(((api.PageList response) {
         checkPageList(response);
@@ -2468,7 +2503,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PagesResourceApi res = new api.BloggerApi(mock).pages;
       var arg_request = buildPage();
       var arg_blogId = "foo";
@@ -2524,7 +2559,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPage());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_blogId, arg_pageId, publish_1: arg_publish_1, revert_1: arg_revert_1).then(unittest.expectAsync(((api.Page response) {
         checkPage(response);
@@ -2533,7 +2568,7 @@
 
     unittest.test("method--publish", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PagesResourceApi res = new api.BloggerApi(mock).pages;
       var arg_blogId = "foo";
       var arg_pageId = "foo";
@@ -2585,7 +2620,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPage());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.publish(arg_blogId, arg_pageId).then(unittest.expectAsync(((api.Page response) {
         checkPage(response);
@@ -2594,7 +2629,7 @@
 
     unittest.test("method--revert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PagesResourceApi res = new api.BloggerApi(mock).pages;
       var arg_blogId = "foo";
       var arg_pageId = "foo";
@@ -2646,7 +2681,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPage());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.revert(arg_blogId, arg_pageId).then(unittest.expectAsync(((api.Page response) {
         checkPage(response);
@@ -2655,7 +2690,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PagesResourceApi res = new api.BloggerApi(mock).pages;
       var arg_request = buildPage();
       var arg_blogId = "foo";
@@ -2711,7 +2746,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPage());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_blogId, arg_pageId, publish_1: arg_publish_1, revert_1: arg_revert_1).then(unittest.expectAsync(((api.Page response) {
         checkPage(response);
@@ -2724,7 +2759,7 @@
   unittest.group("resource-PostUserInfosResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PostUserInfosResourceApi res = new api.BloggerApi(mock).postUserInfos;
       var arg_userId = "foo";
       var arg_blogId = "foo";
@@ -2782,7 +2817,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPostUserInfo());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_userId, arg_blogId, arg_postId, maxComments: arg_maxComments).then(unittest.expectAsync(((api.PostUserInfo response) {
         checkPostUserInfo(response);
@@ -2791,7 +2826,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PostUserInfosResourceApi res = new api.BloggerApi(mock).postUserInfos;
       var arg_userId = "foo";
       var arg_blogId = "foo";
@@ -2802,7 +2837,7 @@
       var arg_orderBy = "foo";
       var arg_pageToken = "foo";
       var arg_startDate = core.DateTime.parse("2002-02-27T14:01:02");
-      var arg_status = buildUnnamed1043();
+      var arg_status = buildUnnamed326();
       var arg_view = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -2861,7 +2896,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPostUserInfosList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userId, arg_blogId, endDate: arg_endDate, fetchBodies: arg_fetchBodies, labels: arg_labels, maxResults: arg_maxResults, orderBy: arg_orderBy, pageToken: arg_pageToken, startDate: arg_startDate, status: arg_status, view: arg_view).then(unittest.expectAsync(((api.PostUserInfosList response) {
         checkPostUserInfosList(response);
@@ -2874,7 +2909,7 @@
   unittest.group("resource-PostsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PostsResourceApi res = new api.BloggerApi(mock).posts;
       var arg_blogId = "foo";
       var arg_postId = "foo";
@@ -2922,14 +2957,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_blogId, arg_postId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PostsResourceApi res = new api.BloggerApi(mock).posts;
       var arg_blogId = "foo";
       var arg_postId = "foo";
@@ -2985,7 +3020,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPost());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_blogId, arg_postId, fetchBody: arg_fetchBody, fetchImages: arg_fetchImages, maxComments: arg_maxComments, view: arg_view).then(unittest.expectAsync(((api.Post response) {
         checkPost(response);
@@ -2994,7 +3029,7 @@
 
     unittest.test("method--getByPath", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PostsResourceApi res = new api.BloggerApi(mock).posts;
       var arg_blogId = "foo";
       var arg_path = "foo";
@@ -3044,7 +3079,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPost());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.getByPath(arg_blogId, arg_path, maxComments: arg_maxComments, view: arg_view).then(unittest.expectAsync(((api.Post response) {
         checkPost(response);
@@ -3053,7 +3088,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PostsResourceApi res = new api.BloggerApi(mock).posts;
       var arg_request = buildPost();
       var arg_blogId = "foo";
@@ -3107,7 +3142,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPost());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_blogId, fetchBody: arg_fetchBody, fetchImages: arg_fetchImages, isDraft: arg_isDraft).then(unittest.expectAsync(((api.Post response) {
         checkPost(response);
@@ -3116,7 +3151,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PostsResourceApi res = new api.BloggerApi(mock).posts;
       var arg_blogId = "foo";
       var arg_endDate = core.DateTime.parse("2002-02-27T14:01:02");
@@ -3127,7 +3162,7 @@
       var arg_orderBy = "foo";
       var arg_pageToken = "foo";
       var arg_startDate = core.DateTime.parse("2002-02-27T14:01:02");
-      var arg_status = buildUnnamed1044();
+      var arg_status = buildUnnamed327();
       var arg_view = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -3180,7 +3215,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPostList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_blogId, endDate: arg_endDate, fetchBodies: arg_fetchBodies, fetchImages: arg_fetchImages, labels: arg_labels, maxResults: arg_maxResults, orderBy: arg_orderBy, pageToken: arg_pageToken, startDate: arg_startDate, status: arg_status, view: arg_view).then(unittest.expectAsync(((api.PostList response) {
         checkPostList(response);
@@ -3189,7 +3224,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PostsResourceApi res = new api.BloggerApi(mock).posts;
       var arg_request = buildPost();
       var arg_blogId = "foo";
@@ -3251,7 +3286,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPost());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_blogId, arg_postId, fetchBody: arg_fetchBody, fetchImages: arg_fetchImages, maxComments: arg_maxComments, publish_1: arg_publish_1, revert_1: arg_revert_1).then(unittest.expectAsync(((api.Post response) {
         checkPost(response);
@@ -3260,7 +3295,7 @@
 
     unittest.test("method--publish", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PostsResourceApi res = new api.BloggerApi(mock).posts;
       var arg_blogId = "foo";
       var arg_postId = "foo";
@@ -3314,7 +3349,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPost());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.publish(arg_blogId, arg_postId, publishDate: arg_publishDate).then(unittest.expectAsync(((api.Post response) {
         checkPost(response);
@@ -3323,7 +3358,7 @@
 
     unittest.test("method--revert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PostsResourceApi res = new api.BloggerApi(mock).posts;
       var arg_blogId = "foo";
       var arg_postId = "foo";
@@ -3375,7 +3410,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPost());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.revert(arg_blogId, arg_postId).then(unittest.expectAsync(((api.Post response) {
         checkPost(response);
@@ -3384,7 +3419,7 @@
 
     unittest.test("method--search", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PostsResourceApi res = new api.BloggerApi(mock).posts;
       var arg_blogId = "foo";
       var arg_q = "foo";
@@ -3434,7 +3469,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPostList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.search(arg_blogId, arg_q, fetchBodies: arg_fetchBodies, orderBy: arg_orderBy).then(unittest.expectAsync(((api.PostList response) {
         checkPostList(response);
@@ -3443,7 +3478,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PostsResourceApi res = new api.BloggerApi(mock).posts;
       var arg_request = buildPost();
       var arg_blogId = "foo";
@@ -3505,7 +3540,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPost());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_blogId, arg_postId, fetchBody: arg_fetchBody, fetchImages: arg_fetchImages, maxComments: arg_maxComments, publish_1: arg_publish_1, revert_1: arg_revert_1).then(unittest.expectAsync(((api.Post response) {
         checkPost(response);
@@ -3518,7 +3553,7 @@
   unittest.group("resource-UsersResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersResourceApi res = new api.BloggerApi(mock).users;
       var arg_userId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -3558,7 +3593,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUser());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_userId).then(unittest.expectAsync(((api.User response) {
         checkUser(response);
diff --git a/generated/googleapis/test/books/v1_test.dart b/generated/googleapis/test/books/v1_test.dart
index e41c55f..a3bd2d2 100644
--- a/generated/googleapis/test/books/v1_test.dart
+++ b/generated/googleapis/test/books/v1_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/books/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterAnnotationClientVersionRanges = 0;
 buildAnnotationClientVersionRanges() {
@@ -93,14 +128,14 @@
   buildCounterAnnotationLayerSummary--;
 }
 
-buildUnnamed806() {
+buildUnnamed328() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed806(core.List<core.String> o) {
+checkUnnamed328(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -123,7 +158,7 @@
     o.kind = "foo";
     o.layerId = "foo";
     o.layerSummary = buildAnnotationLayerSummary();
-    o.pageIds = buildUnnamed806();
+    o.pageIds = buildUnnamed328();
     o.selectedText = "foo";
     o.selfLink = "foo";
     o.updated = core.DateTime.parse("2002-02-27T14:01:02");
@@ -148,7 +183,7 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.layerId, unittest.equals('foo'));
     checkAnnotationLayerSummary(o.layerSummary);
-    checkUnnamed806(o.pageIds);
+    checkUnnamed328(o.pageIds);
     unittest.expect(o.selectedText, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.updated, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
@@ -192,14 +227,14 @@
   buildCounterAnnotationdata--;
 }
 
-buildUnnamed807() {
+buildUnnamed329() {
   var o = new core.List<api.Annotation>();
   o.add(buildAnnotation());
   o.add(buildAnnotation());
   return o;
 }
 
-checkUnnamed807(core.List<api.Annotation> o) {
+checkUnnamed329(core.List<api.Annotation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAnnotation(o[0]);
   checkAnnotation(o[1]);
@@ -210,7 +245,7 @@
   var o = new api.Annotations();
   buildCounterAnnotations++;
   if (buildCounterAnnotations < 3) {
-    o.items = buildUnnamed807();
+    o.items = buildUnnamed329();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
@@ -222,7 +257,7 @@
 checkAnnotations(api.Annotations o) {
   buildCounterAnnotations++;
   if (buildCounterAnnotations < 3) {
-    checkUnnamed807(o.items);
+    checkUnnamed329(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -257,14 +292,14 @@
   buildCounterAnnotationsSummaryLayers--;
 }
 
-buildUnnamed808() {
+buildUnnamed330() {
   var o = new core.List<api.AnnotationsSummaryLayers>();
   o.add(buildAnnotationsSummaryLayers());
   o.add(buildAnnotationsSummaryLayers());
   return o;
 }
 
-checkUnnamed808(core.List<api.AnnotationsSummaryLayers> o) {
+checkUnnamed330(core.List<api.AnnotationsSummaryLayers> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAnnotationsSummaryLayers(o[0]);
   checkAnnotationsSummaryLayers(o[1]);
@@ -276,7 +311,7 @@
   buildCounterAnnotationsSummary++;
   if (buildCounterAnnotationsSummary < 3) {
     o.kind = "foo";
-    o.layers = buildUnnamed808();
+    o.layers = buildUnnamed330();
   }
   buildCounterAnnotationsSummary--;
   return o;
@@ -286,19 +321,19 @@
   buildCounterAnnotationsSummary++;
   if (buildCounterAnnotationsSummary < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed808(o.layers);
+    checkUnnamed330(o.layers);
   }
   buildCounterAnnotationsSummary--;
 }
 
-buildUnnamed809() {
+buildUnnamed331() {
   var o = new core.List<api.Annotationdata>();
   o.add(buildAnnotationdata());
   o.add(buildAnnotationdata());
   return o;
 }
 
-checkUnnamed809(core.List<api.Annotationdata> o) {
+checkUnnamed331(core.List<api.Annotationdata> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAnnotationdata(o[0]);
   checkAnnotationdata(o[1]);
@@ -309,7 +344,7 @@
   var o = new api.Annotationsdata();
   buildCounterAnnotationsdata++;
   if (buildCounterAnnotationsdata < 3) {
-    o.items = buildUnnamed809();
+    o.items = buildUnnamed331();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
@@ -321,7 +356,7 @@
 checkAnnotationsdata(api.Annotationsdata o) {
   buildCounterAnnotationsdata++;
   if (buildCounterAnnotationsdata < 3) {
-    checkUnnamed809(o.items);
+    checkUnnamed331(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -435,14 +470,14 @@
   buildCounterBookshelf--;
 }
 
-buildUnnamed810() {
+buildUnnamed332() {
   var o = new core.List<api.Bookshelf>();
   o.add(buildBookshelf());
   o.add(buildBookshelf());
   return o;
 }
 
-checkUnnamed810(core.List<api.Bookshelf> o) {
+checkUnnamed332(core.List<api.Bookshelf> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBookshelf(o[0]);
   checkBookshelf(o[1]);
@@ -453,7 +488,7 @@
   var o = new api.Bookshelves();
   buildCounterBookshelves++;
   if (buildCounterBookshelves < 3) {
-    o.items = buildUnnamed810();
+    o.items = buildUnnamed332();
     o.kind = "foo";
   }
   buildCounterBookshelves--;
@@ -463,7 +498,7 @@
 checkBookshelves(api.Bookshelves o) {
   buildCounterBookshelves++;
   if (buildCounterBookshelves < 3) {
-    checkUnnamed810(o.items);
+    checkUnnamed332(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterBookshelves--;
@@ -492,14 +527,14 @@
   buildCounterCategoryItems--;
 }
 
-buildUnnamed811() {
+buildUnnamed333() {
   var o = new core.List<api.CategoryItems>();
   o.add(buildCategoryItems());
   o.add(buildCategoryItems());
   return o;
 }
 
-checkUnnamed811(core.List<api.CategoryItems> o) {
+checkUnnamed333(core.List<api.CategoryItems> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCategoryItems(o[0]);
   checkCategoryItems(o[1]);
@@ -510,7 +545,7 @@
   var o = new api.Category();
   buildCounterCategory++;
   if (buildCounterCategory < 3) {
-    o.items = buildUnnamed811();
+    o.items = buildUnnamed333();
     o.kind = "foo";
   }
   buildCounterCategory--;
@@ -520,7 +555,7 @@
 checkCategory(api.Category o) {
   buildCounterCategory++;
   if (buildCounterCategory < 3) {
-    checkUnnamed811(o.items);
+    checkUnnamed333(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterCategory--;
@@ -647,14 +682,14 @@
   buildCounterDictlayerdataDictWordsDerivatives--;
 }
 
-buildUnnamed812() {
+buildUnnamed334() {
   var o = new core.List<api.DictlayerdataDictWordsDerivatives>();
   o.add(buildDictlayerdataDictWordsDerivatives());
   o.add(buildDictlayerdataDictWordsDerivatives());
   return o;
 }
 
-checkUnnamed812(core.List<api.DictlayerdataDictWordsDerivatives> o) {
+checkUnnamed334(core.List<api.DictlayerdataDictWordsDerivatives> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDictlayerdataDictWordsDerivatives(o[0]);
   checkDictlayerdataDictWordsDerivatives(o[1]);
@@ -702,14 +737,14 @@
   buildCounterDictlayerdataDictWordsExamples--;
 }
 
-buildUnnamed813() {
+buildUnnamed335() {
   var o = new core.List<api.DictlayerdataDictWordsExamples>();
   o.add(buildDictlayerdataDictWordsExamples());
   o.add(buildDictlayerdataDictWordsExamples());
   return o;
 }
 
-checkUnnamed813(core.List<api.DictlayerdataDictWordsExamples> o) {
+checkUnnamed335(core.List<api.DictlayerdataDictWordsExamples> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDictlayerdataDictWordsExamples(o[0]);
   checkDictlayerdataDictWordsExamples(o[1]);
@@ -736,14 +771,14 @@
   buildCounterDictlayerdataDictWordsSensesConjugations--;
 }
 
-buildUnnamed814() {
+buildUnnamed336() {
   var o = new core.List<api.DictlayerdataDictWordsSensesConjugations>();
   o.add(buildDictlayerdataDictWordsSensesConjugations());
   o.add(buildDictlayerdataDictWordsSensesConjugations());
   return o;
 }
 
-checkUnnamed814(core.List<api.DictlayerdataDictWordsSensesConjugations> o) {
+checkUnnamed336(core.List<api.DictlayerdataDictWordsSensesConjugations> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDictlayerdataDictWordsSensesConjugations(o[0]);
   checkDictlayerdataDictWordsSensesConjugations(o[1]);
@@ -791,14 +826,14 @@
   buildCounterDictlayerdataDictWordsSensesDefinitionsExamples--;
 }
 
-buildUnnamed815() {
+buildUnnamed337() {
   var o = new core.List<api.DictlayerdataDictWordsSensesDefinitionsExamples>();
   o.add(buildDictlayerdataDictWordsSensesDefinitionsExamples());
   o.add(buildDictlayerdataDictWordsSensesDefinitionsExamples());
   return o;
 }
 
-checkUnnamed815(core.List<api.DictlayerdataDictWordsSensesDefinitionsExamples> o) {
+checkUnnamed337(core.List<api.DictlayerdataDictWordsSensesDefinitionsExamples> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDictlayerdataDictWordsSensesDefinitionsExamples(o[0]);
   checkDictlayerdataDictWordsSensesDefinitionsExamples(o[1]);
@@ -810,7 +845,7 @@
   buildCounterDictlayerdataDictWordsSensesDefinitions++;
   if (buildCounterDictlayerdataDictWordsSensesDefinitions < 3) {
     o.definition = "foo";
-    o.examples = buildUnnamed815();
+    o.examples = buildUnnamed337();
   }
   buildCounterDictlayerdataDictWordsSensesDefinitions--;
   return o;
@@ -820,19 +855,19 @@
   buildCounterDictlayerdataDictWordsSensesDefinitions++;
   if (buildCounterDictlayerdataDictWordsSensesDefinitions < 3) {
     unittest.expect(o.definition, unittest.equals('foo'));
-    checkUnnamed815(o.examples);
+    checkUnnamed337(o.examples);
   }
   buildCounterDictlayerdataDictWordsSensesDefinitions--;
 }
 
-buildUnnamed816() {
+buildUnnamed338() {
   var o = new core.List<api.DictlayerdataDictWordsSensesDefinitions>();
   o.add(buildDictlayerdataDictWordsSensesDefinitions());
   o.add(buildDictlayerdataDictWordsSensesDefinitions());
   return o;
 }
 
-checkUnnamed816(core.List<api.DictlayerdataDictWordsSensesDefinitions> o) {
+checkUnnamed338(core.List<api.DictlayerdataDictWordsSensesDefinitions> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDictlayerdataDictWordsSensesDefinitions(o[0]);
   checkDictlayerdataDictWordsSensesDefinitions(o[1]);
@@ -901,14 +936,14 @@
   buildCounterDictlayerdataDictWordsSensesSynonyms--;
 }
 
-buildUnnamed817() {
+buildUnnamed339() {
   var o = new core.List<api.DictlayerdataDictWordsSensesSynonyms>();
   o.add(buildDictlayerdataDictWordsSensesSynonyms());
   o.add(buildDictlayerdataDictWordsSensesSynonyms());
   return o;
 }
 
-checkUnnamed817(core.List<api.DictlayerdataDictWordsSensesSynonyms> o) {
+checkUnnamed339(core.List<api.DictlayerdataDictWordsSensesSynonyms> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDictlayerdataDictWordsSensesSynonyms(o[0]);
   checkDictlayerdataDictWordsSensesSynonyms(o[1]);
@@ -919,14 +954,14 @@
   var o = new api.DictlayerdataDictWordsSenses();
   buildCounterDictlayerdataDictWordsSenses++;
   if (buildCounterDictlayerdataDictWordsSenses < 3) {
-    o.conjugations = buildUnnamed814();
-    o.definitions = buildUnnamed816();
+    o.conjugations = buildUnnamed336();
+    o.definitions = buildUnnamed338();
     o.partOfSpeech = "foo";
     o.pronunciation = "foo";
     o.pronunciationUrl = "foo";
     o.source = buildDictlayerdataDictWordsSensesSource();
     o.syllabification = "foo";
-    o.synonyms = buildUnnamed817();
+    o.synonyms = buildUnnamed339();
   }
   buildCounterDictlayerdataDictWordsSenses--;
   return o;
@@ -935,26 +970,26 @@
 checkDictlayerdataDictWordsSenses(api.DictlayerdataDictWordsSenses o) {
   buildCounterDictlayerdataDictWordsSenses++;
   if (buildCounterDictlayerdataDictWordsSenses < 3) {
-    checkUnnamed814(o.conjugations);
-    checkUnnamed816(o.definitions);
+    checkUnnamed336(o.conjugations);
+    checkUnnamed338(o.definitions);
     unittest.expect(o.partOfSpeech, unittest.equals('foo'));
     unittest.expect(o.pronunciation, unittest.equals('foo'));
     unittest.expect(o.pronunciationUrl, unittest.equals('foo'));
     checkDictlayerdataDictWordsSensesSource(o.source);
     unittest.expect(o.syllabification, unittest.equals('foo'));
-    checkUnnamed817(o.synonyms);
+    checkUnnamed339(o.synonyms);
   }
   buildCounterDictlayerdataDictWordsSenses--;
 }
 
-buildUnnamed818() {
+buildUnnamed340() {
   var o = new core.List<api.DictlayerdataDictWordsSenses>();
   o.add(buildDictlayerdataDictWordsSenses());
   o.add(buildDictlayerdataDictWordsSenses());
   return o;
 }
 
-checkUnnamed818(core.List<api.DictlayerdataDictWordsSenses> o) {
+checkUnnamed340(core.List<api.DictlayerdataDictWordsSenses> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDictlayerdataDictWordsSenses(o[0]);
   checkDictlayerdataDictWordsSenses(o[1]);
@@ -986,9 +1021,9 @@
   var o = new api.DictlayerdataDictWords();
   buildCounterDictlayerdataDictWords++;
   if (buildCounterDictlayerdataDictWords < 3) {
-    o.derivatives = buildUnnamed812();
-    o.examples = buildUnnamed813();
-    o.senses = buildUnnamed818();
+    o.derivatives = buildUnnamed334();
+    o.examples = buildUnnamed335();
+    o.senses = buildUnnamed340();
     o.source = buildDictlayerdataDictWordsSource();
   }
   buildCounterDictlayerdataDictWords--;
@@ -998,22 +1033,22 @@
 checkDictlayerdataDictWords(api.DictlayerdataDictWords o) {
   buildCounterDictlayerdataDictWords++;
   if (buildCounterDictlayerdataDictWords < 3) {
-    checkUnnamed812(o.derivatives);
-    checkUnnamed813(o.examples);
-    checkUnnamed818(o.senses);
+    checkUnnamed334(o.derivatives);
+    checkUnnamed335(o.examples);
+    checkUnnamed340(o.senses);
     checkDictlayerdataDictWordsSource(o.source);
   }
   buildCounterDictlayerdataDictWords--;
 }
 
-buildUnnamed819() {
+buildUnnamed341() {
   var o = new core.List<api.DictlayerdataDictWords>();
   o.add(buildDictlayerdataDictWords());
   o.add(buildDictlayerdataDictWords());
   return o;
 }
 
-checkUnnamed819(core.List<api.DictlayerdataDictWords> o) {
+checkUnnamed341(core.List<api.DictlayerdataDictWords> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDictlayerdataDictWords(o[0]);
   checkDictlayerdataDictWords(o[1]);
@@ -1025,7 +1060,7 @@
   buildCounterDictlayerdataDict++;
   if (buildCounterDictlayerdataDict < 3) {
     o.source = buildDictlayerdataDictSource();
-    o.words = buildUnnamed819();
+    o.words = buildUnnamed341();
   }
   buildCounterDictlayerdataDict--;
   return o;
@@ -1035,7 +1070,7 @@
   buildCounterDictlayerdataDict++;
   if (buildCounterDictlayerdataDict < 3) {
     checkDictlayerdataDictSource(o.source);
-    checkUnnamed819(o.words);
+    checkUnnamed341(o.words);
   }
   buildCounterDictlayerdataDict--;
 }
@@ -1104,14 +1139,14 @@
   buildCounterDownloadAccessRestriction--;
 }
 
-buildUnnamed820() {
+buildUnnamed342() {
   var o = new core.List<api.DownloadAccessRestriction>();
   o.add(buildDownloadAccessRestriction());
   o.add(buildDownloadAccessRestriction());
   return o;
 }
 
-checkUnnamed820(core.List<api.DownloadAccessRestriction> o) {
+checkUnnamed342(core.List<api.DownloadAccessRestriction> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDownloadAccessRestriction(o[0]);
   checkDownloadAccessRestriction(o[1]);
@@ -1122,7 +1157,7 @@
   var o = new api.DownloadAccesses();
   buildCounterDownloadAccesses++;
   if (buildCounterDownloadAccesses < 3) {
-    o.downloadAccessList = buildUnnamed820();
+    o.downloadAccessList = buildUnnamed342();
     o.kind = "foo";
   }
   buildCounterDownloadAccesses--;
@@ -1132,7 +1167,7 @@
 checkDownloadAccesses(api.DownloadAccesses o) {
   buildCounterDownloadAccesses++;
   if (buildCounterDownloadAccesses < 3) {
-    checkUnnamed820(o.downloadAccessList);
+    checkUnnamed342(o.downloadAccessList);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterDownloadAccesses--;
@@ -1186,30 +1221,30 @@
   buildCounterGeolayerdataGeoBoundary--;
 }
 
-buildUnnamed821() {
+buildUnnamed343() {
   var o = new core.List<api.GeolayerdataGeoBoundary>();
   o.add(buildGeolayerdataGeoBoundary());
   o.add(buildGeolayerdataGeoBoundary());
   return o;
 }
 
-checkUnnamed821(core.List<api.GeolayerdataGeoBoundary> o) {
+checkUnnamed343(core.List<api.GeolayerdataGeoBoundary> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGeolayerdataGeoBoundary(o[0]);
   checkGeolayerdataGeoBoundary(o[1]);
 }
 
-buildUnnamed822() {
+buildUnnamed344() {
   var o = new core.List<core.List<api.GeolayerdataGeoBoundary>>();
-  o.add(buildUnnamed821());
-  o.add(buildUnnamed821());
+  o.add(buildUnnamed343());
+  o.add(buildUnnamed343());
   return o;
 }
 
-checkUnnamed822(core.List<core.List<api.GeolayerdataGeoBoundary>> o) {
+checkUnnamed344(core.List<core.List<api.GeolayerdataGeoBoundary>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed821(o[0]);
-  checkUnnamed821(o[1]);
+  checkUnnamed343(o[0]);
+  checkUnnamed343(o[1]);
 }
 
 core.int buildCounterGeolayerdataGeoViewportHi = 0;
@@ -1280,7 +1315,7 @@
   var o = new api.GeolayerdataGeo();
   buildCounterGeolayerdataGeo++;
   if (buildCounterGeolayerdataGeo < 3) {
-    o.boundary = buildUnnamed822();
+    o.boundary = buildUnnamed344();
     o.cachePolicy = "foo";
     o.countryCode = "foo";
     o.latitude = 42.0;
@@ -1296,7 +1331,7 @@
 checkGeolayerdataGeo(api.GeolayerdataGeo o) {
   buildCounterGeolayerdataGeo++;
   if (buildCounterGeolayerdataGeo < 3) {
-    checkUnnamed822(o.boundary);
+    checkUnnamed344(o.boundary);
     unittest.expect(o.cachePolicy, unittest.equals('foo'));
     unittest.expect(o.countryCode, unittest.equals('foo'));
     unittest.expect(o.latitude, unittest.equals(42.0));
@@ -1331,14 +1366,14 @@
   buildCounterGeolayerdata--;
 }
 
-buildUnnamed823() {
+buildUnnamed345() {
   var o = new core.List<api.Layersummary>();
   o.add(buildLayersummary());
   o.add(buildLayersummary());
   return o;
 }
 
-checkUnnamed823(core.List<api.Layersummary> o) {
+checkUnnamed345(core.List<api.Layersummary> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLayersummary(o[0]);
   checkLayersummary(o[1]);
@@ -1349,7 +1384,7 @@
   var o = new api.Layersummaries();
   buildCounterLayersummaries++;
   if (buildCounterLayersummaries < 3) {
-    o.items = buildUnnamed823();
+    o.items = buildUnnamed345();
     o.kind = "foo";
     o.totalItems = 42;
   }
@@ -1360,21 +1395,21 @@
 checkLayersummaries(api.Layersummaries o) {
   buildCounterLayersummaries++;
   if (buildCounterLayersummaries < 3) {
-    checkUnnamed823(o.items);
+    checkUnnamed345(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
   }
   buildCounterLayersummaries--;
 }
 
-buildUnnamed824() {
+buildUnnamed346() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed824(core.List<core.String> o) {
+checkUnnamed346(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1386,7 +1421,7 @@
   buildCounterLayersummary++;
   if (buildCounterLayersummary < 3) {
     o.annotationCount = 42;
-    o.annotationTypes = buildUnnamed824();
+    o.annotationTypes = buildUnnamed346();
     o.annotationsDataLink = "foo";
     o.annotationsLink = "foo";
     o.contentVersion = "foo";
@@ -1407,7 +1442,7 @@
   buildCounterLayersummary++;
   if (buildCounterLayersummary < 3) {
     unittest.expect(o.annotationCount, unittest.equals(42));
-    checkUnnamed824(o.annotationTypes);
+    checkUnnamed346(o.annotationTypes);
     unittest.expect(o.annotationsDataLink, unittest.equals('foo'));
     unittest.expect(o.annotationsLink, unittest.equals('foo'));
     unittest.expect(o.contentVersion, unittest.equals('foo'));
@@ -1450,14 +1485,14 @@
   buildCounterMetadataItems--;
 }
 
-buildUnnamed825() {
+buildUnnamed347() {
   var o = new core.List<api.MetadataItems>();
   o.add(buildMetadataItems());
   o.add(buildMetadataItems());
   return o;
 }
 
-checkUnnamed825(core.List<api.MetadataItems> o) {
+checkUnnamed347(core.List<api.MetadataItems> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetadataItems(o[0]);
   checkMetadataItems(o[1]);
@@ -1468,7 +1503,7 @@
   var o = new api.Metadata();
   buildCounterMetadata++;
   if (buildCounterMetadata < 3) {
-    o.items = buildUnnamed825();
+    o.items = buildUnnamed347();
     o.kind = "foo";
   }
   buildCounterMetadata--;
@@ -1478,7 +1513,7 @@
 checkMetadata(api.Metadata o) {
   buildCounterMetadata++;
   if (buildCounterMetadata < 3) {
-    checkUnnamed825(o.items);
+    checkUnnamed347(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterMetadata--;
@@ -1513,14 +1548,14 @@
   buildCounterOffersItemsItems--;
 }
 
-buildUnnamed826() {
+buildUnnamed348() {
   var o = new core.List<api.OffersItemsItems>();
   o.add(buildOffersItemsItems());
   o.add(buildOffersItemsItems());
   return o;
 }
 
-checkUnnamed826(core.List<api.OffersItemsItems> o) {
+checkUnnamed348(core.List<api.OffersItemsItems> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOffersItemsItems(o[0]);
   checkOffersItemsItems(o[1]);
@@ -1534,7 +1569,7 @@
     o.artUrl = "foo";
     o.gservicesKey = "foo";
     o.id = "foo";
-    o.items = buildUnnamed826();
+    o.items = buildUnnamed348();
   }
   buildCounterOffersItems--;
   return o;
@@ -1546,19 +1581,19 @@
     unittest.expect(o.artUrl, unittest.equals('foo'));
     unittest.expect(o.gservicesKey, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed826(o.items);
+    checkUnnamed348(o.items);
   }
   buildCounterOffersItems--;
 }
 
-buildUnnamed827() {
+buildUnnamed349() {
   var o = new core.List<api.OffersItems>();
   o.add(buildOffersItems());
   o.add(buildOffersItems());
   return o;
 }
 
-checkUnnamed827(core.List<api.OffersItems> o) {
+checkUnnamed349(core.List<api.OffersItems> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOffersItems(o[0]);
   checkOffersItems(o[1]);
@@ -1569,7 +1604,7 @@
   var o = new api.Offers();
   buildCounterOffers++;
   if (buildCounterOffers < 3) {
-    o.items = buildUnnamed827();
+    o.items = buildUnnamed349();
     o.kind = "foo";
   }
   buildCounterOffers--;
@@ -1579,7 +1614,7 @@
 checkOffers(api.Offers o) {
   buildCounterOffers++;
   if (buildCounterOffers < 3) {
-    checkUnnamed827(o.items);
+    checkUnnamed349(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterOffers--;
@@ -1872,14 +1907,14 @@
   buildCounterVolumeLayerInfoLayers--;
 }
 
-buildUnnamed828() {
+buildUnnamed350() {
   var o = new core.List<api.VolumeLayerInfoLayers>();
   o.add(buildVolumeLayerInfoLayers());
   o.add(buildVolumeLayerInfoLayers());
   return o;
 }
 
-checkUnnamed828(core.List<api.VolumeLayerInfoLayers> o) {
+checkUnnamed350(core.List<api.VolumeLayerInfoLayers> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVolumeLayerInfoLayers(o[0]);
   checkVolumeLayerInfoLayers(o[1]);
@@ -1890,7 +1925,7 @@
   var o = new api.VolumeLayerInfo();
   buildCounterVolumeLayerInfo++;
   if (buildCounterVolumeLayerInfo < 3) {
-    o.layers = buildUnnamed828();
+    o.layers = buildUnnamed350();
   }
   buildCounterVolumeLayerInfo--;
   return o;
@@ -1899,7 +1934,7 @@
 checkVolumeLayerInfo(api.VolumeLayerInfo o) {
   buildCounterVolumeLayerInfo++;
   if (buildCounterVolumeLayerInfo < 3) {
-    checkUnnamed828(o.layers);
+    checkUnnamed350(o.layers);
   }
   buildCounterVolumeLayerInfo--;
 }
@@ -2032,14 +2067,14 @@
   buildCounterVolumeSaleInfoOffers--;
 }
 
-buildUnnamed829() {
+buildUnnamed351() {
   var o = new core.List<api.VolumeSaleInfoOffers>();
   o.add(buildVolumeSaleInfoOffers());
   o.add(buildVolumeSaleInfoOffers());
   return o;
 }
 
-checkUnnamed829(core.List<api.VolumeSaleInfoOffers> o) {
+checkUnnamed351(core.List<api.VolumeSaleInfoOffers> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVolumeSaleInfoOffers(o[0]);
   checkVolumeSaleInfoOffers(o[1]);
@@ -2075,7 +2110,7 @@
     o.country = "foo";
     o.isEbook = true;
     o.listPrice = buildVolumeSaleInfoListPrice();
-    o.offers = buildUnnamed829();
+    o.offers = buildUnnamed351();
     o.onSaleDate = core.DateTime.parse("2002-02-27T14:01:02");
     o.retailPrice = buildVolumeSaleInfoRetailPrice();
     o.saleability = "foo";
@@ -2091,7 +2126,7 @@
     unittest.expect(o.country, unittest.equals('foo'));
     unittest.expect(o.isEbook, unittest.isTrue);
     checkVolumeSaleInfoListPrice(o.listPrice);
-    checkUnnamed829(o.offers);
+    checkUnnamed351(o.offers);
     unittest.expect(o.onSaleDate, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     checkVolumeSaleInfoRetailPrice(o.retailPrice);
     unittest.expect(o.saleability, unittest.equals('foo'));
@@ -2222,27 +2257,27 @@
   buildCounterVolumeUserInfo--;
 }
 
-buildUnnamed830() {
+buildUnnamed352() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed830(core.List<core.String> o) {
+checkUnnamed352(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed831() {
+buildUnnamed353() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed831(core.List<core.String> o) {
+checkUnnamed353(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2321,14 +2356,14 @@
   buildCounterVolumeVolumeInfoIndustryIdentifiers--;
 }
 
-buildUnnamed832() {
+buildUnnamed354() {
   var o = new core.List<api.VolumeVolumeInfoIndustryIdentifiers>();
   o.add(buildVolumeVolumeInfoIndustryIdentifiers());
   o.add(buildVolumeVolumeInfoIndustryIdentifiers());
   return o;
 }
 
-checkUnnamed832(core.List<api.VolumeVolumeInfoIndustryIdentifiers> o) {
+checkUnnamed354(core.List<api.VolumeVolumeInfoIndustryIdentifiers> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVolumeVolumeInfoIndustryIdentifiers(o[0]);
   checkVolumeVolumeInfoIndustryIdentifiers(o[1]);
@@ -2339,15 +2374,15 @@
   var o = new api.VolumeVolumeInfo();
   buildCounterVolumeVolumeInfo++;
   if (buildCounterVolumeVolumeInfo < 3) {
-    o.authors = buildUnnamed830();
+    o.authors = buildUnnamed352();
     o.averageRating = 42.0;
     o.canonicalVolumeLink = "foo";
-    o.categories = buildUnnamed831();
+    o.categories = buildUnnamed353();
     o.contentVersion = "foo";
     o.description = "foo";
     o.dimensions = buildVolumeVolumeInfoDimensions();
     o.imageLinks = buildVolumeVolumeInfoImageLinks();
-    o.industryIdentifiers = buildUnnamed832();
+    o.industryIdentifiers = buildUnnamed354();
     o.infoLink = "foo";
     o.language = "foo";
     o.mainCategory = "foo";
@@ -2370,15 +2405,15 @@
 checkVolumeVolumeInfo(api.VolumeVolumeInfo o) {
   buildCounterVolumeVolumeInfo++;
   if (buildCounterVolumeVolumeInfo < 3) {
-    checkUnnamed830(o.authors);
+    checkUnnamed352(o.authors);
     unittest.expect(o.averageRating, unittest.equals(42.0));
     unittest.expect(o.canonicalVolumeLink, unittest.equals('foo'));
-    checkUnnamed831(o.categories);
+    checkUnnamed353(o.categories);
     unittest.expect(o.contentVersion, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     checkVolumeVolumeInfoDimensions(o.dimensions);
     checkVolumeVolumeInfoImageLinks(o.imageLinks);
-    checkUnnamed832(o.industryIdentifiers);
+    checkUnnamed354(o.industryIdentifiers);
     unittest.expect(o.infoLink, unittest.equals('foo'));
     unittest.expect(o.language, unittest.equals('foo'));
     unittest.expect(o.mainCategory, unittest.equals('foo'));
@@ -2436,14 +2471,14 @@
   buildCounterVolume--;
 }
 
-buildUnnamed833() {
+buildUnnamed355() {
   var o = new core.List<api.Volume>();
   o.add(buildVolume());
   o.add(buildVolume());
   return o;
 }
 
-checkUnnamed833(core.List<api.Volume> o) {
+checkUnnamed355(core.List<api.Volume> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVolume(o[0]);
   checkVolume(o[1]);
@@ -2454,7 +2489,7 @@
   var o = new api.Volume2();
   buildCounterVolume2++;
   if (buildCounterVolume2 < 3) {
-    o.items = buildUnnamed833();
+    o.items = buildUnnamed355();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -2465,7 +2500,7 @@
 checkVolume2(api.Volume2 o) {
   buildCounterVolume2++;
   if (buildCounterVolume2 < 3) {
-    checkUnnamed833(o.items);
+    checkUnnamed355(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -2497,14 +2532,14 @@
   buildCounterVolumeannotationContentRanges--;
 }
 
-buildUnnamed834() {
+buildUnnamed356() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed834(core.List<core.String> o) {
+checkUnnamed356(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2524,7 +2559,7 @@
     o.id = "foo";
     o.kind = "foo";
     o.layerId = "foo";
-    o.pageIds = buildUnnamed834();
+    o.pageIds = buildUnnamed356();
     o.selectedText = "foo";
     o.selfLink = "foo";
     o.updated = core.DateTime.parse("2002-02-27T14:01:02");
@@ -2546,7 +2581,7 @@
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.layerId, unittest.equals('foo'));
-    checkUnnamed834(o.pageIds);
+    checkUnnamed356(o.pageIds);
     unittest.expect(o.selectedText, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.updated, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
@@ -2555,14 +2590,14 @@
   buildCounterVolumeannotation--;
 }
 
-buildUnnamed835() {
+buildUnnamed357() {
   var o = new core.List<api.Volumeannotation>();
   o.add(buildVolumeannotation());
   o.add(buildVolumeannotation());
   return o;
 }
 
-checkUnnamed835(core.List<api.Volumeannotation> o) {
+checkUnnamed357(core.List<api.Volumeannotation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVolumeannotation(o[0]);
   checkVolumeannotation(o[1]);
@@ -2573,7 +2608,7 @@
   var o = new api.Volumeannotations();
   buildCounterVolumeannotations++;
   if (buildCounterVolumeannotations < 3) {
-    o.items = buildUnnamed835();
+    o.items = buildUnnamed357();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
@@ -2586,7 +2621,7 @@
 checkVolumeannotations(api.Volumeannotations o) {
   buildCounterVolumeannotations++;
   if (buildCounterVolumeannotations < 3) {
-    checkUnnamed835(o.items);
+    checkUnnamed357(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -2595,14 +2630,14 @@
   buildCounterVolumeannotations--;
 }
 
-buildUnnamed836() {
+buildUnnamed358() {
   var o = new core.List<api.Volume>();
   o.add(buildVolume());
   o.add(buildVolume());
   return o;
 }
 
-checkUnnamed836(core.List<api.Volume> o) {
+checkUnnamed358(core.List<api.Volume> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVolume(o[0]);
   checkVolume(o[1]);
@@ -2613,7 +2648,7 @@
   var o = new api.Volumes();
   buildCounterVolumes++;
   if (buildCounterVolumes < 3) {
-    o.items = buildUnnamed836();
+    o.items = buildUnnamed358();
     o.kind = "foo";
     o.totalItems = 42;
   }
@@ -2624,164 +2659,151 @@
 checkVolumes(api.Volumes o) {
   buildCounterVolumes++;
   if (buildCounterVolumes < 3) {
-    checkUnnamed836(o.items);
+    checkUnnamed358(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
   }
   buildCounterVolumes--;
 }
 
-buildUnnamed837() {
+buildUnnamed359() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed837(core.List<core.String> o) {
+checkUnnamed359(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed838() {
+buildUnnamed360() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed838(core.List<core.String> o) {
+checkUnnamed360(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed839() {
+buildUnnamed361() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed839(core.List<core.String> o) {
+checkUnnamed361(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed840() {
+buildUnnamed362() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed840(core.List<core.String> o) {
+checkUnnamed362(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed841() {
+buildUnnamed363() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed841(core.List<core.String> o) {
+checkUnnamed363(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed842() {
+buildUnnamed364() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed842(core.List<core.String> o) {
+checkUnnamed364(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed843() {
+buildUnnamed365() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed843(core.List<core.String> o) {
+checkUnnamed365(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed844() {
+buildUnnamed366() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed844(core.List<core.String> o) {
+checkUnnamed366(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed845() {
+buildUnnamed367() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed845(core.List<core.String> o) {
+checkUnnamed367(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed846() {
+buildUnnamed368() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed846(core.List<core.String> o) {
+checkUnnamed368(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed847() {
+buildUnnamed369() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed847(core.List<core.String> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  unittest.expect(o[0], unittest.equals('foo'));
-  unittest.expect(o[1], unittest.equals('foo'));
-}
-
-buildUnnamed848() {
-  var o = new core.List<core.String>();
-  o.add("foo");
-  o.add("foo");
-  return o;
-}
-
-checkUnnamed848(core.List<core.String> o) {
+checkUnnamed369(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3566,7 +3588,7 @@
   unittest.group("resource-BookshelvesResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BookshelvesResourceApi res = new api.BooksApi(mock).bookshelves;
       var arg_userId = "foo";
       var arg_shelf = "foo";
@@ -3616,7 +3638,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBookshelf());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_userId, arg_shelf, source: arg_source).then(unittest.expectAsync(((api.Bookshelf response) {
         checkBookshelf(response);
@@ -3625,7 +3647,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BookshelvesResourceApi res = new api.BooksApi(mock).bookshelves;
       var arg_userId = "foo";
       var arg_source = "foo";
@@ -3671,7 +3693,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBookshelves());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userId, source: arg_source).then(unittest.expectAsync(((api.Bookshelves response) {
         checkBookshelves(response);
@@ -3684,7 +3706,7 @@
   unittest.group("resource-BookshelvesVolumesResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BookshelvesVolumesResourceApi res = new api.BooksApi(mock).bookshelves.volumes;
       var arg_userId = "foo";
       var arg_shelf = "foo";
@@ -3744,7 +3766,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildVolumes());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userId, arg_shelf, maxResults: arg_maxResults, showPreorders: arg_showPreorders, source: arg_source, startIndex: arg_startIndex).then(unittest.expectAsync(((api.Volumes response) {
         checkVolumes(response);
@@ -3757,7 +3779,7 @@
   unittest.group("resource-CloudloadingResourceApi", () {
     unittest.test("method--addBook", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CloudloadingResourceApi res = new api.BooksApi(mock).cloudloading;
       var arg_driveDocumentId = "foo";
       var arg_mimeType = "foo";
@@ -3801,7 +3823,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBooksCloudloadingResource());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.addBook(driveDocumentId: arg_driveDocumentId, mimeType: arg_mimeType, name: arg_name, uploadClientToken: arg_uploadClientToken).then(unittest.expectAsync(((api.BooksCloudloadingResource response) {
         checkBooksCloudloadingResource(response);
@@ -3810,7 +3832,7 @@
 
     unittest.test("method--deleteBook", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CloudloadingResourceApi res = new api.BooksApi(mock).cloudloading;
       var arg_volumeId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -3848,14 +3870,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.deleteBook(arg_volumeId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--updateBook", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CloudloadingResourceApi res = new api.BooksApi(mock).cloudloading;
       var arg_request = buildBooksCloudloadingResource();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -3895,7 +3917,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBooksCloudloadingResource());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.updateBook(arg_request).then(unittest.expectAsync(((api.BooksCloudloadingResource response) {
         checkBooksCloudloadingResource(response);
@@ -3908,7 +3930,7 @@
   unittest.group("resource-DictionaryResourceApi", () {
     unittest.test("method--listOfflineMetadata", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DictionaryResourceApi res = new api.BooksApi(mock).dictionary;
       var arg_cpksver = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -3946,7 +3968,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMetadata());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.listOfflineMetadata(arg_cpksver).then(unittest.expectAsync(((api.Metadata response) {
         checkMetadata(response);
@@ -3959,7 +3981,7 @@
   unittest.group("resource-LayersResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LayersResourceApi res = new api.BooksApi(mock).layers;
       var arg_volumeId = "foo";
       var arg_summaryId = "foo";
@@ -4011,7 +4033,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLayersummary());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_volumeId, arg_summaryId, contentVersion: arg_contentVersion, source: arg_source).then(unittest.expectAsync(((api.Layersummary response) {
         checkLayersummary(response);
@@ -4020,7 +4042,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LayersResourceApi res = new api.BooksApi(mock).layers;
       var arg_volumeId = "foo";
       var arg_contentVersion = "foo";
@@ -4072,7 +4094,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLayersummaries());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_volumeId, contentVersion: arg_contentVersion, maxResults: arg_maxResults, pageToken: arg_pageToken, source: arg_source).then(unittest.expectAsync(((api.Layersummaries response) {
         checkLayersummaries(response);
@@ -4085,7 +4107,7 @@
   unittest.group("resource-LayersAnnotationDataResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LayersAnnotationDataResourceApi res = new api.BooksApi(mock).layers.annotationData;
       var arg_volumeId = "foo";
       var arg_layerId = "foo";
@@ -4155,7 +4177,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAnnotationdata());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_volumeId, arg_layerId, arg_annotationDataId, arg_contentVersion, allowWebDefinitions: arg_allowWebDefinitions, h: arg_h, locale: arg_locale, scale: arg_scale, source: arg_source, w: arg_w).then(unittest.expectAsync(((api.Annotationdata response) {
         checkAnnotationdata(response);
@@ -4164,12 +4186,12 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LayersAnnotationDataResourceApi res = new api.BooksApi(mock).layers.annotationData;
       var arg_volumeId = "foo";
       var arg_layerId = "foo";
       var arg_contentVersion = "foo";
-      var arg_annotationDataId = buildUnnamed837();
+      var arg_annotationDataId = buildUnnamed359();
       var arg_h = 42;
       var arg_locale = "foo";
       var arg_maxResults = 42;
@@ -4238,7 +4260,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAnnotationsdata());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_volumeId, arg_layerId, arg_contentVersion, annotationDataId: arg_annotationDataId, h: arg_h, locale: arg_locale, maxResults: arg_maxResults, pageToken: arg_pageToken, scale: arg_scale, source: arg_source, updatedMax: arg_updatedMax, updatedMin: arg_updatedMin, w: arg_w).then(unittest.expectAsync(((api.Annotationsdata response) {
         checkAnnotationsdata(response);
@@ -4251,7 +4273,7 @@
   unittest.group("resource-LayersVolumeAnnotationsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LayersVolumeAnnotationsResourceApi res = new api.BooksApi(mock).layers.volumeAnnotations;
       var arg_volumeId = "foo";
       var arg_layerId = "foo";
@@ -4311,7 +4333,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildVolumeannotation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_volumeId, arg_layerId, arg_annotationId, locale: arg_locale, source: arg_source).then(unittest.expectAsync(((api.Volumeannotation response) {
         checkVolumeannotation(response);
@@ -4320,7 +4342,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LayersVolumeAnnotationsResourceApi res = new api.BooksApi(mock).layers.volumeAnnotations;
       var arg_volumeId = "foo";
       var arg_layerId = "foo";
@@ -4394,7 +4416,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildVolumeannotations());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_volumeId, arg_layerId, arg_contentVersion, endOffset: arg_endOffset, endPosition: arg_endPosition, locale: arg_locale, maxResults: arg_maxResults, pageToken: arg_pageToken, showDeleted: arg_showDeleted, source: arg_source, startOffset: arg_startOffset, startPosition: arg_startPosition, updatedMax: arg_updatedMax, updatedMin: arg_updatedMin, volumeAnnotationsVersion: arg_volumeAnnotationsVersion).then(unittest.expectAsync(((api.Volumeannotations response) {
         checkVolumeannotations(response);
@@ -4407,7 +4429,7 @@
   unittest.group("resource-MyconfigResourceApi", () {
     unittest.test("method--getUserSettings", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MyconfigResourceApi res = new api.BooksApi(mock).myconfig;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -4443,7 +4465,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUsersettings());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.getUserSettings().then(unittest.expectAsync(((api.Usersettings response) {
         checkUsersettings(response);
@@ -4452,9 +4474,9 @@
 
     unittest.test("method--releaseDownloadAccess", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MyconfigResourceApi res = new api.BooksApi(mock).myconfig;
-      var arg_volumeIds = buildUnnamed838();
+      var arg_volumeIds = buildUnnamed360();
       var arg_cpksver = "foo";
       var arg_locale = "foo";
       var arg_source = "foo";
@@ -4496,7 +4518,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDownloadAccesses());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.releaseDownloadAccess(arg_volumeIds, arg_cpksver, locale: arg_locale, source: arg_source).then(unittest.expectAsync(((api.DownloadAccesses response) {
         checkDownloadAccesses(response);
@@ -4505,7 +4527,7 @@
 
     unittest.test("method--requestAccess", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MyconfigResourceApi res = new api.BooksApi(mock).myconfig;
       var arg_source = "foo";
       var arg_volumeId = "foo";
@@ -4553,7 +4575,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRequestAccess());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.requestAccess(arg_source, arg_volumeId, arg_nonce, arg_cpksver, licenseTypes: arg_licenseTypes, locale: arg_locale).then(unittest.expectAsync(((api.RequestAccess response) {
         checkRequestAccess(response);
@@ -4562,15 +4584,15 @@
 
     unittest.test("method--syncVolumeLicenses", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MyconfigResourceApi res = new api.BooksApi(mock).myconfig;
       var arg_source = "foo";
       var arg_nonce = "foo";
       var arg_cpksver = "foo";
-      var arg_features = buildUnnamed839();
+      var arg_features = buildUnnamed361();
       var arg_locale = "foo";
       var arg_showPreorders = true;
-      var arg_volumeIds = buildUnnamed840();
+      var arg_volumeIds = buildUnnamed362();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -4612,7 +4634,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildVolumes());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.syncVolumeLicenses(arg_source, arg_nonce, arg_cpksver, features: arg_features, locale: arg_locale, showPreorders: arg_showPreorders, volumeIds: arg_volumeIds).then(unittest.expectAsync(((api.Volumes response) {
         checkVolumes(response);
@@ -4621,7 +4643,7 @@
 
     unittest.test("method--updateUserSettings", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MyconfigResourceApi res = new api.BooksApi(mock).myconfig;
       var arg_request = buildUsersettings();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -4661,7 +4683,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUsersettings());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.updateUserSettings(arg_request).then(unittest.expectAsync(((api.Usersettings response) {
         checkUsersettings(response);
@@ -4674,7 +4696,7 @@
   unittest.group("resource-MylibraryAnnotationsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MylibraryAnnotationsResourceApi res = new api.BooksApi(mock).mylibrary.annotations;
       var arg_annotationId = "foo";
       var arg_source = "foo";
@@ -4716,65 +4738,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_annotationId, source: arg_source).then(unittest.expectAsync((_) {}));
     });
 
-    unittest.test("method--get", () {
-
-      var mock = new common_test.HttpServerMock();
-      api.MylibraryAnnotationsResourceApi res = new api.BooksApi(mock).mylibrary.annotations;
-      var arg_annotationId = "foo";
-      var arg_source = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
-        var path = (req.url).path;
-        var pathOffset = 0;
-        var index;
-        var subPart;
-        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
-        pathOffset += 1;
-        unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("books/v1/"));
-        pathOffset += 9;
-        unittest.expect(path.substring(pathOffset, pathOffset + 22), unittest.equals("mylibrary/annotations/"));
-        pathOffset += 22;
-        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
-        pathOffset = path.length;
-        unittest.expect(subPart, unittest.equals("$arg_annotationId"));
-
-        var query = (req.url).query;
-        var queryOffset = 0;
-        var queryMap = {};
-        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
-        parseBool(n) {
-          if (n == "true") return true;
-          if (n == "false") return false;
-          if (n == null) return null;
-          throw new core.ArgumentError("Invalid boolean: $n");
-        }
-        if (query.length > 0) {
-          for (var part in query.split("&")) {
-            var keyvalue = part.split("=");
-            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
-          }
-        }
-        unittest.expect(queryMap["source"].first, unittest.equals(arg_source));
-
-
-        var h = {
-          "content-type" : "application/json; charset=utf-8",
-        };
-        var resp = convert.JSON.encode(buildAnnotation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
-      }), true);
-      res.get(arg_annotationId, source: arg_source).then(unittest.expectAsync(((api.Annotation response) {
-        checkAnnotation(response);
-      })));
-    });
-
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MylibraryAnnotationsResourceApi res = new api.BooksApi(mock).mylibrary.annotations;
       var arg_request = buildAnnotation();
       var arg_country = "foo";
@@ -4820,7 +4791,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAnnotation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, country: arg_country, showOnlySummaryInResponse: arg_showOnlySummaryInResponse, source: arg_source).then(unittest.expectAsync(((api.Annotation response) {
         checkAnnotation(response);
@@ -4829,13 +4800,12 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MylibraryAnnotationsResourceApi res = new api.BooksApi(mock).mylibrary.annotations;
       var arg_contentVersion = "foo";
       var arg_layerId = "foo";
-      var arg_layerIds = buildUnnamed841();
+      var arg_layerIds = buildUnnamed363();
       var arg_maxResults = 42;
-      var arg_pageIds = buildUnnamed842();
       var arg_pageToken = "foo";
       var arg_showDeleted = true;
       var arg_source = "foo";
@@ -4874,7 +4844,6 @@
         unittest.expect(queryMap["layerId"].first, unittest.equals(arg_layerId));
         unittest.expect(queryMap["layerIds"], unittest.equals(arg_layerIds));
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
-        unittest.expect(queryMap["pageIds"], unittest.equals(arg_pageIds));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
         unittest.expect(queryMap["showDeleted"].first, unittest.equals("$arg_showDeleted"));
         unittest.expect(queryMap["source"].first, unittest.equals(arg_source));
@@ -4887,18 +4856,18 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAnnotations());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(contentVersion: arg_contentVersion, layerId: arg_layerId, layerIds: arg_layerIds, maxResults: arg_maxResults, pageIds: arg_pageIds, pageToken: arg_pageToken, showDeleted: arg_showDeleted, source: arg_source, updatedMax: arg_updatedMax, updatedMin: arg_updatedMin, volumeId: arg_volumeId).then(unittest.expectAsync(((api.Annotations response) {
+      res.list(contentVersion: arg_contentVersion, layerId: arg_layerId, layerIds: arg_layerIds, maxResults: arg_maxResults, pageToken: arg_pageToken, showDeleted: arg_showDeleted, source: arg_source, updatedMax: arg_updatedMax, updatedMin: arg_updatedMin, volumeId: arg_volumeId).then(unittest.expectAsync(((api.Annotations response) {
         checkAnnotations(response);
       })));
     });
 
     unittest.test("method--summary", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MylibraryAnnotationsResourceApi res = new api.BooksApi(mock).mylibrary.annotations;
-      var arg_layerIds = buildUnnamed843();
+      var arg_layerIds = buildUnnamed364();
       var arg_volumeId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -4936,7 +4905,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAnnotationsSummary());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.summary(arg_layerIds, arg_volumeId).then(unittest.expectAsync(((api.AnnotationsSummary response) {
         checkAnnotationsSummary(response);
@@ -4945,7 +4914,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MylibraryAnnotationsResourceApi res = new api.BooksApi(mock).mylibrary.annotations;
       var arg_request = buildAnnotation();
       var arg_annotationId = "foo";
@@ -4991,7 +4960,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAnnotation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_annotationId, source: arg_source).then(unittest.expectAsync(((api.Annotation response) {
         checkAnnotation(response);
@@ -5004,7 +4973,7 @@
   unittest.group("resource-MylibraryBookshelvesResourceApi", () {
     unittest.test("method--addVolume", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MylibraryBookshelvesResourceApi res = new api.BooksApi(mock).mylibrary.bookshelves;
       var arg_shelf = "foo";
       var arg_volumeId = "foo";
@@ -5054,14 +5023,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.addVolume(arg_shelf, arg_volumeId, reason: arg_reason, source: arg_source).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--clearVolumes", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MylibraryBookshelvesResourceApi res = new api.BooksApi(mock).mylibrary.bookshelves;
       var arg_shelf = "foo";
       var arg_source = "foo";
@@ -5107,14 +5076,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.clearVolumes(arg_shelf, source: arg_source).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MylibraryBookshelvesResourceApi res = new api.BooksApi(mock).mylibrary.bookshelves;
       var arg_shelf = "foo";
       var arg_source = "foo";
@@ -5156,7 +5125,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBookshelf());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_shelf, source: arg_source).then(unittest.expectAsync(((api.Bookshelf response) {
         checkBookshelf(response);
@@ -5165,7 +5134,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MylibraryBookshelvesResourceApi res = new api.BooksApi(mock).mylibrary.bookshelves;
       var arg_source = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -5203,7 +5172,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBookshelves());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(source: arg_source).then(unittest.expectAsync(((api.Bookshelves response) {
         checkBookshelves(response);
@@ -5212,7 +5181,7 @@
 
     unittest.test("method--moveVolume", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MylibraryBookshelvesResourceApi res = new api.BooksApi(mock).mylibrary.bookshelves;
       var arg_shelf = "foo";
       var arg_volumeId = "foo";
@@ -5262,14 +5231,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.moveVolume(arg_shelf, arg_volumeId, arg_volumePosition, source: arg_source).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--removeVolume", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MylibraryBookshelvesResourceApi res = new api.BooksApi(mock).mylibrary.bookshelves;
       var arg_shelf = "foo";
       var arg_volumeId = "foo";
@@ -5319,7 +5288,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.removeVolume(arg_shelf, arg_volumeId, reason: arg_reason, source: arg_source).then(unittest.expectAsync((_) {}));
     });
@@ -5330,7 +5299,7 @@
   unittest.group("resource-MylibraryBookshelvesVolumesResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MylibraryBookshelvesVolumesResourceApi res = new api.BooksApi(mock).mylibrary.bookshelves.volumes;
       var arg_shelf = "foo";
       var arg_country = "foo";
@@ -5388,7 +5357,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildVolumes());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_shelf, country: arg_country, maxResults: arg_maxResults, projection: arg_projection, q: arg_q, showPreorders: arg_showPreorders, source: arg_source, startIndex: arg_startIndex).then(unittest.expectAsync(((api.Volumes response) {
         checkVolumes(response);
@@ -5401,7 +5370,7 @@
   unittest.group("resource-MylibraryReadingpositionsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MylibraryReadingpositionsResourceApi res = new api.BooksApi(mock).mylibrary.readingpositions;
       var arg_volumeId = "foo";
       var arg_contentVersion = "foo";
@@ -5445,7 +5414,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildReadingPosition());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_volumeId, contentVersion: arg_contentVersion, source: arg_source).then(unittest.expectAsync(((api.ReadingPosition response) {
         checkReadingPosition(response);
@@ -5454,7 +5423,7 @@
 
     unittest.test("method--setPosition", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MylibraryReadingpositionsResourceApi res = new api.BooksApi(mock).mylibrary.readingpositions;
       var arg_volumeId = "foo";
       var arg_timestamp = "foo";
@@ -5510,7 +5479,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.setPosition(arg_volumeId, arg_timestamp, arg_position, action: arg_action, contentVersion: arg_contentVersion, deviceCookie: arg_deviceCookie, source: arg_source).then(unittest.expectAsync((_) {}));
     });
@@ -5521,7 +5490,7 @@
   unittest.group("resource-OnboardingResourceApi", () {
     unittest.test("method--listCategories", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.OnboardingResourceApi res = new api.BooksApi(mock).onboarding;
       var arg_locale = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -5559,7 +5528,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCategory());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.listCategories(locale: arg_locale).then(unittest.expectAsync(((api.Category response) {
         checkCategory(response);
@@ -5568,9 +5537,9 @@
 
     unittest.test("method--listCategoryVolumes", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.OnboardingResourceApi res = new api.BooksApi(mock).onboarding;
-      var arg_categoryId = buildUnnamed844();
+      var arg_categoryId = buildUnnamed365();
       var arg_locale = "foo";
       var arg_pageSize = 42;
       var arg_pageToken = "foo";
@@ -5612,7 +5581,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildVolume2());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.listCategoryVolumes(categoryId: arg_categoryId, locale: arg_locale, pageSize: arg_pageSize, pageToken: arg_pageToken).then(unittest.expectAsync(((api.Volume2 response) {
         checkVolume2(response);
@@ -5625,7 +5594,7 @@
   unittest.group("resource-PromoofferResourceApi", () {
     unittest.test("method--accept", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PromoofferResourceApi res = new api.BooksApi(mock).promooffer;
       var arg_androidId = "foo";
       var arg_device = "foo";
@@ -5677,14 +5646,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.accept(androidId: arg_androidId, device: arg_device, manufacturer: arg_manufacturer, model: arg_model, offerId: arg_offerId, product: arg_product, serial: arg_serial, volumeId: arg_volumeId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--dismiss", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PromoofferResourceApi res = new api.BooksApi(mock).promooffer;
       var arg_androidId = "foo";
       var arg_device = "foo";
@@ -5734,14 +5703,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.dismiss(androidId: arg_androidId, device: arg_device, manufacturer: arg_manufacturer, model: arg_model, offerId: arg_offerId, product: arg_product, serial: arg_serial).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PromoofferResourceApi res = new api.BooksApi(mock).promooffer;
       var arg_androidId = "foo";
       var arg_device = "foo";
@@ -5789,7 +5758,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOffers());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(androidId: arg_androidId, device: arg_device, manufacturer: arg_manufacturer, model: arg_model, product: arg_product, serial: arg_serial).then(unittest.expectAsync(((api.Offers response) {
         checkOffers(response);
@@ -5802,7 +5771,7 @@
   unittest.group("resource-VolumesResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.VolumesResourceApi res = new api.BooksApi(mock).volumes;
       var arg_volumeId = "foo";
       var arg_country = "foo";
@@ -5852,7 +5821,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildVolume());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_volumeId, country: arg_country, partner: arg_partner, projection: arg_projection, source: arg_source, userLibraryConsistentRead: arg_userLibraryConsistentRead).then(unittest.expectAsync(((api.Volume response) {
         checkVolume(response);
@@ -5861,7 +5830,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.VolumesResourceApi res = new api.BooksApi(mock).volumes;
       var arg_q = "foo";
       var arg_download = "foo";
@@ -5923,7 +5892,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildVolumes());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_q, download: arg_download, filter: arg_filter, langRestrict: arg_langRestrict, libraryRestrict: arg_libraryRestrict, maxResults: arg_maxResults, orderBy: arg_orderBy, partner: arg_partner, printType: arg_printType, projection: arg_projection, showPreorders: arg_showPreorders, source: arg_source, startIndex: arg_startIndex).then(unittest.expectAsync(((api.Volumes response) {
         checkVolumes(response);
@@ -5936,7 +5905,7 @@
   unittest.group("resource-VolumesAssociatedResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.VolumesAssociatedResourceApi res = new api.BooksApi(mock).volumes.associated;
       var arg_volumeId = "foo";
       var arg_association = "foo";
@@ -5986,7 +5955,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildVolumes());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_volumeId, association: arg_association, locale: arg_locale, source: arg_source).then(unittest.expectAsync(((api.Volumes response) {
         checkVolumes(response);
@@ -5999,12 +5968,12 @@
   unittest.group("resource-VolumesMybooksResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.VolumesMybooksResourceApi res = new api.BooksApi(mock).volumes.mybooks;
-      var arg_acquireMethod = buildUnnamed845();
+      var arg_acquireMethod = buildUnnamed366();
       var arg_locale = "foo";
       var arg_maxResults = 42;
-      var arg_processingState = buildUnnamed846();
+      var arg_processingState = buildUnnamed367();
       var arg_source = "foo";
       var arg_startIndex = 42;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -6047,7 +6016,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildVolumes());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(acquireMethod: arg_acquireMethod, locale: arg_locale, maxResults: arg_maxResults, processingState: arg_processingState, source: arg_source, startIndex: arg_startIndex).then(unittest.expectAsync(((api.Volumes response) {
         checkVolumes(response);
@@ -6060,7 +6029,7 @@
   unittest.group("resource-VolumesRecommendedResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.VolumesRecommendedResourceApi res = new api.BooksApi(mock).volumes.recommended;
       var arg_locale = "foo";
       var arg_source = "foo";
@@ -6100,7 +6069,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildVolumes());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(locale: arg_locale, source: arg_source).then(unittest.expectAsync(((api.Volumes response) {
         checkVolumes(response);
@@ -6109,7 +6078,7 @@
 
     unittest.test("method--rate", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.VolumesRecommendedResourceApi res = new api.BooksApi(mock).volumes.recommended;
       var arg_rating = "foo";
       var arg_volumeId = "foo";
@@ -6153,7 +6122,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBooksVolumesRecommendedRateResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.rate(arg_rating, arg_volumeId, locale: arg_locale, source: arg_source).then(unittest.expectAsync(((api.BooksVolumesRecommendedRateResponse response) {
         checkBooksVolumesRecommendedRateResponse(response);
@@ -6166,14 +6135,14 @@
   unittest.group("resource-VolumesUseruploadedResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.VolumesUseruploadedResourceApi res = new api.BooksApi(mock).volumes.useruploaded;
       var arg_locale = "foo";
       var arg_maxResults = 42;
-      var arg_processingState = buildUnnamed847();
+      var arg_processingState = buildUnnamed368();
       var arg_source = "foo";
       var arg_startIndex = 42;
-      var arg_volumeId = buildUnnamed848();
+      var arg_volumeId = buildUnnamed369();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -6214,7 +6183,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildVolumes());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(locale: arg_locale, maxResults: arg_maxResults, processingState: arg_processingState, source: arg_source, startIndex: arg_startIndex, volumeId: arg_volumeId).then(unittest.expectAsync(((api.Volumes response) {
         checkVolumes(response);
diff --git a/generated/googleapis/test/calendar/v3_test.dart b/generated/googleapis/test/calendar/v3_test.dart
index a8d7ea0..ae92890 100644
--- a/generated/googleapis/test/calendar/v3_test.dart
+++ b/generated/googleapis/test/calendar/v3_test.dart
@@ -8,22 +8,57 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/calendar/v3.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
 
-buildUnnamed978() {
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+buildUnnamed370() {
   var o = new core.List<api.AclRule>();
   o.add(buildAclRule());
   o.add(buildAclRule());
   return o;
 }
 
-checkUnnamed978(core.List<api.AclRule> o) {
+checkUnnamed370(core.List<api.AclRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAclRule(o[0]);
   checkAclRule(o[1]);
@@ -35,7 +70,7 @@
   buildCounterAcl++;
   if (buildCounterAcl < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed978();
+    o.items = buildUnnamed370();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.nextSyncToken = "foo";
@@ -48,7 +83,7 @@
   buildCounterAcl++;
   if (buildCounterAcl < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed978(o.items);
+    checkUnnamed370(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.nextSyncToken, unittest.equals('foo'));
@@ -135,14 +170,14 @@
   buildCounterCalendar--;
 }
 
-buildUnnamed979() {
+buildUnnamed371() {
   var o = new core.List<api.CalendarListEntry>();
   o.add(buildCalendarListEntry());
   o.add(buildCalendarListEntry());
   return o;
 }
 
-checkUnnamed979(core.List<api.CalendarListEntry> o) {
+checkUnnamed371(core.List<api.CalendarListEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCalendarListEntry(o[0]);
   checkCalendarListEntry(o[1]);
@@ -154,7 +189,7 @@
   buildCounterCalendarList++;
   if (buildCounterCalendarList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed979();
+    o.items = buildUnnamed371();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.nextSyncToken = "foo";
@@ -167,7 +202,7 @@
   buildCounterCalendarList++;
   if (buildCounterCalendarList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed979(o.items);
+    checkUnnamed371(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.nextSyncToken, unittest.equals('foo'));
@@ -175,27 +210,27 @@
   buildCounterCalendarList--;
 }
 
-buildUnnamed980() {
+buildUnnamed372() {
   var o = new core.List<api.EventReminder>();
   o.add(buildEventReminder());
   o.add(buildEventReminder());
   return o;
 }
 
-checkUnnamed980(core.List<api.EventReminder> o) {
+checkUnnamed372(core.List<api.EventReminder> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventReminder(o[0]);
   checkEventReminder(o[1]);
 }
 
-buildUnnamed981() {
+buildUnnamed373() {
   var o = new core.List<api.CalendarNotification>();
   o.add(buildCalendarNotification());
   o.add(buildCalendarNotification());
   return o;
 }
 
-checkUnnamed981(core.List<api.CalendarNotification> o) {
+checkUnnamed373(core.List<api.CalendarNotification> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCalendarNotification(o[0]);
   checkCalendarNotification(o[1]);
@@ -206,7 +241,7 @@
   var o = new api.CalendarListEntryNotificationSettings();
   buildCounterCalendarListEntryNotificationSettings++;
   if (buildCounterCalendarListEntryNotificationSettings < 3) {
-    o.notifications = buildUnnamed981();
+    o.notifications = buildUnnamed373();
   }
   buildCounterCalendarListEntryNotificationSettings--;
   return o;
@@ -215,7 +250,7 @@
 checkCalendarListEntryNotificationSettings(api.CalendarListEntryNotificationSettings o) {
   buildCounterCalendarListEntryNotificationSettings++;
   if (buildCounterCalendarListEntryNotificationSettings < 3) {
-    checkUnnamed981(o.notifications);
+    checkUnnamed373(o.notifications);
   }
   buildCounterCalendarListEntryNotificationSettings--;
 }
@@ -228,7 +263,7 @@
     o.accessRole = "foo";
     o.backgroundColor = "foo";
     o.colorId = "foo";
-    o.defaultReminders = buildUnnamed980();
+    o.defaultReminders = buildUnnamed372();
     o.deleted = true;
     o.description = "foo";
     o.etag = "foo";
@@ -254,7 +289,7 @@
     unittest.expect(o.accessRole, unittest.equals('foo'));
     unittest.expect(o.backgroundColor, unittest.equals('foo'));
     unittest.expect(o.colorId, unittest.equals('foo'));
-    checkUnnamed980(o.defaultReminders);
+    checkUnnamed372(o.defaultReminders);
     unittest.expect(o.deleted, unittest.isTrue);
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.etag, unittest.equals('foo'));
@@ -294,14 +329,14 @@
   buildCounterCalendarNotification--;
 }
 
-buildUnnamed982() {
+buildUnnamed374() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed982(core.Map<core.String, core.String> o) {
+checkUnnamed374(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -316,7 +351,7 @@
     o.expiration = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.params = buildUnnamed982();
+    o.params = buildUnnamed374();
     o.payload = true;
     o.resourceId = "foo";
     o.resourceUri = "foo";
@@ -334,7 +369,7 @@
     unittest.expect(o.expiration, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed982(o.params);
+    checkUnnamed374(o.params);
     unittest.expect(o.payload, unittest.isTrue);
     unittest.expect(o.resourceId, unittest.equals('foo'));
     unittest.expect(o.resourceUri, unittest.equals('foo'));
@@ -365,27 +400,27 @@
   buildCounterColorDefinition--;
 }
 
-buildUnnamed983() {
+buildUnnamed375() {
   var o = new core.Map<core.String, api.ColorDefinition>();
   o["x"] = buildColorDefinition();
   o["y"] = buildColorDefinition();
   return o;
 }
 
-checkUnnamed983(core.Map<core.String, api.ColorDefinition> o) {
+checkUnnamed375(core.Map<core.String, api.ColorDefinition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkColorDefinition(o["x"]);
   checkColorDefinition(o["y"]);
 }
 
-buildUnnamed984() {
+buildUnnamed376() {
   var o = new core.Map<core.String, api.ColorDefinition>();
   o["x"] = buildColorDefinition();
   o["y"] = buildColorDefinition();
   return o;
 }
 
-checkUnnamed984(core.Map<core.String, api.ColorDefinition> o) {
+checkUnnamed376(core.Map<core.String, api.ColorDefinition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkColorDefinition(o["x"]);
   checkColorDefinition(o["y"]);
@@ -396,8 +431,8 @@
   var o = new api.Colors();
   buildCounterColors++;
   if (buildCounterColors < 3) {
-    o.calendar = buildUnnamed983();
-    o.event = buildUnnamed984();
+    o.calendar = buildUnnamed375();
+    o.event = buildUnnamed376();
     o.kind = "foo";
     o.updated = core.DateTime.parse("2002-02-27T14:01:02");
   }
@@ -408,8 +443,8 @@
 checkColors(api.Colors o) {
   buildCounterColors++;
   if (buildCounterColors < 3) {
-    checkUnnamed983(o.calendar);
-    checkUnnamed984(o.event);
+    checkUnnamed375(o.calendar);
+    checkUnnamed376(o.event);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.updated, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
   }
@@ -437,14 +472,14 @@
   buildCounterError--;
 }
 
-buildUnnamed985() {
+buildUnnamed377() {
   var o = new core.List<api.EventAttendee>();
   o.add(buildEventAttendee());
   o.add(buildEventAttendee());
   return o;
 }
 
-checkUnnamed985(core.List<api.EventAttendee> o) {
+checkUnnamed377(core.List<api.EventAttendee> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventAttendee(o[0]);
   checkEventAttendee(o[1]);
@@ -475,27 +510,27 @@
   buildCounterEventCreator--;
 }
 
-buildUnnamed986() {
+buildUnnamed378() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed986(core.Map<core.String, core.String> o) {
+checkUnnamed378(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed987() {
+buildUnnamed379() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed987(core.Map<core.String, core.String> o) {
+checkUnnamed379(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -506,8 +541,8 @@
   var o = new api.EventExtendedProperties();
   buildCounterEventExtendedProperties++;
   if (buildCounterEventExtendedProperties < 3) {
-    o.private = buildUnnamed986();
-    o.shared = buildUnnamed987();
+    o.private = buildUnnamed378();
+    o.shared = buildUnnamed379();
   }
   buildCounterEventExtendedProperties--;
   return o;
@@ -516,20 +551,20 @@
 checkEventExtendedProperties(api.EventExtendedProperties o) {
   buildCounterEventExtendedProperties++;
   if (buildCounterEventExtendedProperties < 3) {
-    checkUnnamed986(o.private);
-    checkUnnamed987(o.shared);
+    checkUnnamed378(o.private);
+    checkUnnamed379(o.shared);
   }
   buildCounterEventExtendedProperties--;
 }
 
-buildUnnamed988() {
+buildUnnamed380() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed988(core.Map<core.String, core.String> o) {
+checkUnnamed380(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -544,7 +579,7 @@
     o.height = 42;
     o.iconLink = "foo";
     o.link = "foo";
-    o.preferences = buildUnnamed988();
+    o.preferences = buildUnnamed380();
     o.title = "foo";
     o.type = "foo";
     o.width = 42;
@@ -560,7 +595,7 @@
     unittest.expect(o.height, unittest.equals(42));
     unittest.expect(o.iconLink, unittest.equals('foo'));
     unittest.expect(o.link, unittest.equals('foo'));
-    checkUnnamed988(o.preferences);
+    checkUnnamed380(o.preferences);
     unittest.expect(o.title, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(o.width, unittest.equals(42));
@@ -593,27 +628,27 @@
   buildCounterEventOrganizer--;
 }
 
-buildUnnamed989() {
+buildUnnamed381() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed989(core.List<core.String> o) {
+checkUnnamed381(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed990() {
+buildUnnamed382() {
   var o = new core.List<api.EventReminder>();
   o.add(buildEventReminder());
   o.add(buildEventReminder());
   return o;
 }
 
-checkUnnamed990(core.List<api.EventReminder> o) {
+checkUnnamed382(core.List<api.EventReminder> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventReminder(o[0]);
   checkEventReminder(o[1]);
@@ -624,7 +659,7 @@
   var o = new api.EventReminders();
   buildCounterEventReminders++;
   if (buildCounterEventReminders < 3) {
-    o.overrides = buildUnnamed990();
+    o.overrides = buildUnnamed382();
     o.useDefault = true;
   }
   buildCounterEventReminders--;
@@ -634,7 +669,7 @@
 checkEventReminders(api.EventReminders o) {
   buildCounterEventReminders++;
   if (buildCounterEventReminders < 3) {
-    checkUnnamed990(o.overrides);
+    checkUnnamed382(o.overrides);
     unittest.expect(o.useDefault, unittest.isTrue);
   }
   buildCounterEventReminders--;
@@ -667,7 +702,7 @@
   buildCounterEvent++;
   if (buildCounterEvent < 3) {
     o.anyoneCanAddSelf = true;
-    o.attendees = buildUnnamed985();
+    o.attendees = buildUnnamed377();
     o.attendeesOmitted = true;
     o.colorId = "foo";
     o.created = core.DateTime.parse("2002-02-27T14:01:02");
@@ -691,7 +726,7 @@
     o.organizer = buildEventOrganizer();
     o.originalStartTime = buildEventDateTime();
     o.privateCopy = true;
-    o.recurrence = buildUnnamed989();
+    o.recurrence = buildUnnamed381();
     o.recurringEventId = "foo";
     o.reminders = buildEventReminders();
     o.sequence = 42;
@@ -711,7 +746,7 @@
   buildCounterEvent++;
   if (buildCounterEvent < 3) {
     unittest.expect(o.anyoneCanAddSelf, unittest.isTrue);
-    checkUnnamed985(o.attendees);
+    checkUnnamed377(o.attendees);
     unittest.expect(o.attendeesOmitted, unittest.isTrue);
     unittest.expect(o.colorId, unittest.equals('foo'));
     unittest.expect(o.created, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
@@ -735,7 +770,7 @@
     checkEventOrganizer(o.organizer);
     checkEventDateTime(o.originalStartTime);
     unittest.expect(o.privateCopy, unittest.isTrue);
-    checkUnnamed989(o.recurrence);
+    checkUnnamed381(o.recurrence);
     unittest.expect(o.recurringEventId, unittest.equals('foo'));
     checkEventReminders(o.reminders);
     unittest.expect(o.sequence, unittest.equals(42));
@@ -848,27 +883,27 @@
   buildCounterEventReminder--;
 }
 
-buildUnnamed991() {
+buildUnnamed383() {
   var o = new core.List<api.EventReminder>();
   o.add(buildEventReminder());
   o.add(buildEventReminder());
   return o;
 }
 
-checkUnnamed991(core.List<api.EventReminder> o) {
+checkUnnamed383(core.List<api.EventReminder> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventReminder(o[0]);
   checkEventReminder(o[1]);
 }
 
-buildUnnamed992() {
+buildUnnamed384() {
   var o = new core.List<api.Event>();
   o.add(buildEvent());
   o.add(buildEvent());
   return o;
 }
 
-checkUnnamed992(core.List<api.Event> o) {
+checkUnnamed384(core.List<api.Event> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEvent(o[0]);
   checkEvent(o[1]);
@@ -880,10 +915,10 @@
   buildCounterEvents++;
   if (buildCounterEvents < 3) {
     o.accessRole = "foo";
-    o.defaultReminders = buildUnnamed991();
+    o.defaultReminders = buildUnnamed383();
     o.description = "foo";
     o.etag = "foo";
-    o.items = buildUnnamed992();
+    o.items = buildUnnamed384();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.nextSyncToken = "foo";
@@ -899,10 +934,10 @@
   buildCounterEvents++;
   if (buildCounterEvents < 3) {
     unittest.expect(o.accessRole, unittest.equals('foo'));
-    checkUnnamed991(o.defaultReminders);
+    checkUnnamed383(o.defaultReminders);
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed992(o.items);
+    checkUnnamed384(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.nextSyncToken, unittest.equals('foo'));
@@ -913,27 +948,27 @@
   buildCounterEvents--;
 }
 
-buildUnnamed993() {
+buildUnnamed385() {
   var o = new core.List<api.TimePeriod>();
   o.add(buildTimePeriod());
   o.add(buildTimePeriod());
   return o;
 }
 
-checkUnnamed993(core.List<api.TimePeriod> o) {
+checkUnnamed385(core.List<api.TimePeriod> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTimePeriod(o[0]);
   checkTimePeriod(o[1]);
 }
 
-buildUnnamed994() {
+buildUnnamed386() {
   var o = new core.List<api.Error>();
   o.add(buildError());
   o.add(buildError());
   return o;
 }
 
-checkUnnamed994(core.List<api.Error> o) {
+checkUnnamed386(core.List<api.Error> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkError(o[0]);
   checkError(o[1]);
@@ -944,8 +979,8 @@
   var o = new api.FreeBusyCalendar();
   buildCounterFreeBusyCalendar++;
   if (buildCounterFreeBusyCalendar < 3) {
-    o.busy = buildUnnamed993();
-    o.errors = buildUnnamed994();
+    o.busy = buildUnnamed385();
+    o.errors = buildUnnamed386();
   }
   buildCounterFreeBusyCalendar--;
   return o;
@@ -954,33 +989,33 @@
 checkFreeBusyCalendar(api.FreeBusyCalendar o) {
   buildCounterFreeBusyCalendar++;
   if (buildCounterFreeBusyCalendar < 3) {
-    checkUnnamed993(o.busy);
-    checkUnnamed994(o.errors);
+    checkUnnamed385(o.busy);
+    checkUnnamed386(o.errors);
   }
   buildCounterFreeBusyCalendar--;
 }
 
-buildUnnamed995() {
+buildUnnamed387() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed995(core.List<core.String> o) {
+checkUnnamed387(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed996() {
+buildUnnamed388() {
   var o = new core.List<api.Error>();
   o.add(buildError());
   o.add(buildError());
   return o;
 }
 
-checkUnnamed996(core.List<api.Error> o) {
+checkUnnamed388(core.List<api.Error> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkError(o[0]);
   checkError(o[1]);
@@ -991,8 +1026,8 @@
   var o = new api.FreeBusyGroup();
   buildCounterFreeBusyGroup++;
   if (buildCounterFreeBusyGroup < 3) {
-    o.calendars = buildUnnamed995();
-    o.errors = buildUnnamed996();
+    o.calendars = buildUnnamed387();
+    o.errors = buildUnnamed388();
   }
   buildCounterFreeBusyGroup--;
   return o;
@@ -1001,20 +1036,20 @@
 checkFreeBusyGroup(api.FreeBusyGroup o) {
   buildCounterFreeBusyGroup++;
   if (buildCounterFreeBusyGroup < 3) {
-    checkUnnamed995(o.calendars);
-    checkUnnamed996(o.errors);
+    checkUnnamed387(o.calendars);
+    checkUnnamed388(o.errors);
   }
   buildCounterFreeBusyGroup--;
 }
 
-buildUnnamed997() {
+buildUnnamed389() {
   var o = new core.List<api.FreeBusyRequestItem>();
   o.add(buildFreeBusyRequestItem());
   o.add(buildFreeBusyRequestItem());
   return o;
 }
 
-checkUnnamed997(core.List<api.FreeBusyRequestItem> o) {
+checkUnnamed389(core.List<api.FreeBusyRequestItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFreeBusyRequestItem(o[0]);
   checkFreeBusyRequestItem(o[1]);
@@ -1027,7 +1062,7 @@
   if (buildCounterFreeBusyRequest < 3) {
     o.calendarExpansionMax = 42;
     o.groupExpansionMax = 42;
-    o.items = buildUnnamed997();
+    o.items = buildUnnamed389();
     o.timeMax = core.DateTime.parse("2002-02-27T14:01:02");
     o.timeMin = core.DateTime.parse("2002-02-27T14:01:02");
     o.timeZone = "foo";
@@ -1041,7 +1076,7 @@
   if (buildCounterFreeBusyRequest < 3) {
     unittest.expect(o.calendarExpansionMax, unittest.equals(42));
     unittest.expect(o.groupExpansionMax, unittest.equals(42));
-    checkUnnamed997(o.items);
+    checkUnnamed389(o.items);
     unittest.expect(o.timeMax, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.timeMin, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.timeZone, unittest.equals('foo'));
@@ -1068,27 +1103,27 @@
   buildCounterFreeBusyRequestItem--;
 }
 
-buildUnnamed998() {
+buildUnnamed390() {
   var o = new core.Map<core.String, api.FreeBusyCalendar>();
   o["x"] = buildFreeBusyCalendar();
   o["y"] = buildFreeBusyCalendar();
   return o;
 }
 
-checkUnnamed998(core.Map<core.String, api.FreeBusyCalendar> o) {
+checkUnnamed390(core.Map<core.String, api.FreeBusyCalendar> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFreeBusyCalendar(o["x"]);
   checkFreeBusyCalendar(o["y"]);
 }
 
-buildUnnamed999() {
+buildUnnamed391() {
   var o = new core.Map<core.String, api.FreeBusyGroup>();
   o["x"] = buildFreeBusyGroup();
   o["y"] = buildFreeBusyGroup();
   return o;
 }
 
-checkUnnamed999(core.Map<core.String, api.FreeBusyGroup> o) {
+checkUnnamed391(core.Map<core.String, api.FreeBusyGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFreeBusyGroup(o["x"]);
   checkFreeBusyGroup(o["y"]);
@@ -1099,8 +1134,8 @@
   var o = new api.FreeBusyResponse();
   buildCounterFreeBusyResponse++;
   if (buildCounterFreeBusyResponse < 3) {
-    o.calendars = buildUnnamed998();
-    o.groups = buildUnnamed999();
+    o.calendars = buildUnnamed390();
+    o.groups = buildUnnamed391();
     o.kind = "foo";
     o.timeMax = core.DateTime.parse("2002-02-27T14:01:02");
     o.timeMin = core.DateTime.parse("2002-02-27T14:01:02");
@@ -1112,8 +1147,8 @@
 checkFreeBusyResponse(api.FreeBusyResponse o) {
   buildCounterFreeBusyResponse++;
   if (buildCounterFreeBusyResponse < 3) {
-    checkUnnamed998(o.calendars);
-    checkUnnamed999(o.groups);
+    checkUnnamed390(o.calendars);
+    checkUnnamed391(o.groups);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.timeMax, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.timeMin, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
@@ -1146,14 +1181,14 @@
   buildCounterSetting--;
 }
 
-buildUnnamed1000() {
+buildUnnamed392() {
   var o = new core.List<api.Setting>();
   o.add(buildSetting());
   o.add(buildSetting());
   return o;
 }
 
-checkUnnamed1000(core.List<api.Setting> o) {
+checkUnnamed392(core.List<api.Setting> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSetting(o[0]);
   checkSetting(o[1]);
@@ -1165,7 +1200,7 @@
   buildCounterSettings++;
   if (buildCounterSettings < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1000();
+    o.items = buildUnnamed392();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.nextSyncToken = "foo";
@@ -1178,7 +1213,7 @@
   buildCounterSettings++;
   if (buildCounterSettings < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1000(o.items);
+    checkUnnamed392(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.nextSyncToken, unittest.equals('foo'));
@@ -1207,53 +1242,53 @@
   buildCounterTimePeriod--;
 }
 
-buildUnnamed1001() {
+buildUnnamed393() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1001(core.List<core.String> o) {
+checkUnnamed393(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1002() {
+buildUnnamed394() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1002(core.List<core.String> o) {
+checkUnnamed394(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1003() {
+buildUnnamed395() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1003(core.List<core.String> o) {
+checkUnnamed395(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1004() {
+buildUnnamed396() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1004(core.List<core.String> o) {
+checkUnnamed396(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1552,7 +1587,7 @@
   unittest.group("resource-AclResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AclResourceApi res = new api.CalendarApi(mock).acl;
       var arg_calendarId = "foo";
       var arg_ruleId = "foo";
@@ -1600,14 +1635,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_calendarId, arg_ruleId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AclResourceApi res = new api.CalendarApi(mock).acl;
       var arg_calendarId = "foo";
       var arg_ruleId = "foo";
@@ -1655,7 +1690,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAclRule());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_calendarId, arg_ruleId).then(unittest.expectAsync(((api.AclRule response) {
         checkAclRule(response);
@@ -1664,7 +1699,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AclResourceApi res = new api.CalendarApi(mock).acl;
       var arg_request = buildAclRule();
       var arg_calendarId = "foo";
@@ -1712,7 +1747,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAclRule());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_calendarId).then(unittest.expectAsync(((api.AclRule response) {
         checkAclRule(response);
@@ -1721,7 +1756,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AclResourceApi res = new api.CalendarApi(mock).acl;
       var arg_calendarId = "foo";
       var arg_maxResults = 42;
@@ -1773,7 +1808,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAcl());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_calendarId, maxResults: arg_maxResults, pageToken: arg_pageToken, showDeleted: arg_showDeleted, syncToken: arg_syncToken).then(unittest.expectAsync(((api.Acl response) {
         checkAcl(response);
@@ -1782,7 +1817,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AclResourceApi res = new api.CalendarApi(mock).acl;
       var arg_request = buildAclRule();
       var arg_calendarId = "foo";
@@ -1834,7 +1869,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAclRule());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_calendarId, arg_ruleId).then(unittest.expectAsync(((api.AclRule response) {
         checkAclRule(response);
@@ -1843,7 +1878,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AclResourceApi res = new api.CalendarApi(mock).acl;
       var arg_request = buildAclRule();
       var arg_calendarId = "foo";
@@ -1895,7 +1930,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAclRule());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_calendarId, arg_ruleId).then(unittest.expectAsync(((api.AclRule response) {
         checkAclRule(response);
@@ -1904,7 +1939,7 @@
 
     unittest.test("method--watch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AclResourceApi res = new api.CalendarApi(mock).acl;
       var arg_request = buildChannel();
       var arg_calendarId = "foo";
@@ -1960,7 +1995,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChannel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.watch(arg_request, arg_calendarId, maxResults: arg_maxResults, pageToken: arg_pageToken, showDeleted: arg_showDeleted, syncToken: arg_syncToken).then(unittest.expectAsync(((api.Channel response) {
         checkChannel(response);
@@ -1973,7 +2008,7 @@
   unittest.group("resource-CalendarListResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CalendarListResourceApi res = new api.CalendarApi(mock).calendarList;
       var arg_calendarId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2013,14 +2048,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_calendarId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CalendarListResourceApi res = new api.CalendarApi(mock).calendarList;
       var arg_calendarId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2060,7 +2095,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCalendarListEntry());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_calendarId).then(unittest.expectAsync(((api.CalendarListEntry response) {
         checkCalendarListEntry(response);
@@ -2069,7 +2104,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CalendarListResourceApi res = new api.CalendarApi(mock).calendarList;
       var arg_request = buildCalendarListEntry();
       var arg_colorRgbFormat = true;
@@ -2111,7 +2146,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCalendarListEntry());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, colorRgbFormat: arg_colorRgbFormat).then(unittest.expectAsync(((api.CalendarListEntry response) {
         checkCalendarListEntry(response);
@@ -2120,7 +2155,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CalendarListResourceApi res = new api.CalendarApi(mock).calendarList;
       var arg_maxResults = 42;
       var arg_minAccessRole = "foo";
@@ -2168,7 +2203,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCalendarList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(maxResults: arg_maxResults, minAccessRole: arg_minAccessRole, pageToken: arg_pageToken, showDeleted: arg_showDeleted, showHidden: arg_showHidden, syncToken: arg_syncToken).then(unittest.expectAsync(((api.CalendarList response) {
         checkCalendarList(response);
@@ -2177,7 +2212,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CalendarListResourceApi res = new api.CalendarApi(mock).calendarList;
       var arg_request = buildCalendarListEntry();
       var arg_calendarId = "foo";
@@ -2223,7 +2258,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCalendarListEntry());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_calendarId, colorRgbFormat: arg_colorRgbFormat).then(unittest.expectAsync(((api.CalendarListEntry response) {
         checkCalendarListEntry(response);
@@ -2232,7 +2267,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CalendarListResourceApi res = new api.CalendarApi(mock).calendarList;
       var arg_request = buildCalendarListEntry();
       var arg_calendarId = "foo";
@@ -2278,7 +2313,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCalendarListEntry());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_calendarId, colorRgbFormat: arg_colorRgbFormat).then(unittest.expectAsync(((api.CalendarListEntry response) {
         checkCalendarListEntry(response);
@@ -2287,7 +2322,7 @@
 
     unittest.test("method--watch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CalendarListResourceApi res = new api.CalendarApi(mock).calendarList;
       var arg_request = buildChannel();
       var arg_maxResults = 42;
@@ -2339,7 +2374,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChannel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.watch(arg_request, maxResults: arg_maxResults, minAccessRole: arg_minAccessRole, pageToken: arg_pageToken, showDeleted: arg_showDeleted, showHidden: arg_showHidden, syncToken: arg_syncToken).then(unittest.expectAsync(((api.Channel response) {
         checkChannel(response);
@@ -2352,7 +2387,7 @@
   unittest.group("resource-CalendarsResourceApi", () {
     unittest.test("method--clear", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CalendarsResourceApi res = new api.CalendarApi(mock).calendars;
       var arg_calendarId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2396,14 +2431,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.clear(arg_calendarId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CalendarsResourceApi res = new api.CalendarApi(mock).calendars;
       var arg_calendarId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2443,14 +2478,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_calendarId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CalendarsResourceApi res = new api.CalendarApi(mock).calendars;
       var arg_calendarId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2490,7 +2525,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCalendar());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_calendarId).then(unittest.expectAsync(((api.Calendar response) {
         checkCalendar(response);
@@ -2499,7 +2534,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CalendarsResourceApi res = new api.CalendarApi(mock).calendars;
       var arg_request = buildCalendar();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2539,7 +2574,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCalendar());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request).then(unittest.expectAsync(((api.Calendar response) {
         checkCalendar(response);
@@ -2548,7 +2583,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CalendarsResourceApi res = new api.CalendarApi(mock).calendars;
       var arg_request = buildCalendar();
       var arg_calendarId = "foo";
@@ -2592,7 +2627,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCalendar());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_calendarId).then(unittest.expectAsync(((api.Calendar response) {
         checkCalendar(response);
@@ -2601,7 +2636,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CalendarsResourceApi res = new api.CalendarApi(mock).calendars;
       var arg_request = buildCalendar();
       var arg_calendarId = "foo";
@@ -2645,7 +2680,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCalendar());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_calendarId).then(unittest.expectAsync(((api.Calendar response) {
         checkCalendar(response);
@@ -2658,7 +2693,7 @@
   unittest.group("resource-ChannelsResourceApi", () {
     unittest.test("method--stop", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ChannelsResourceApi res = new api.CalendarApi(mock).channels;
       var arg_request = buildChannel();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2698,7 +2733,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.stop(arg_request).then(unittest.expectAsync((_) {}));
     });
@@ -2709,7 +2744,7 @@
   unittest.group("resource-ColorsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ColorsResourceApi res = new api.CalendarApi(mock).colors;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -2745,7 +2780,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildColors());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get().then(unittest.expectAsync(((api.Colors response) {
         checkColors(response);
@@ -2758,7 +2793,7 @@
   unittest.group("resource-EventsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EventsResourceApi res = new api.CalendarApi(mock).events;
       var arg_calendarId = "foo";
       var arg_eventId = "foo";
@@ -2808,14 +2843,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_calendarId, arg_eventId, sendNotifications: arg_sendNotifications).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EventsResourceApi res = new api.CalendarApi(mock).events;
       var arg_calendarId = "foo";
       var arg_eventId = "foo";
@@ -2869,7 +2904,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEvent());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_calendarId, arg_eventId, alwaysIncludeEmail: arg_alwaysIncludeEmail, maxAttendees: arg_maxAttendees, timeZone: arg_timeZone).then(unittest.expectAsync(((api.Event response) {
         checkEvent(response);
@@ -2878,7 +2913,7 @@
 
     unittest.test("method--import", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EventsResourceApi res = new api.CalendarApi(mock).events;
       var arg_request = buildEvent();
       var arg_calendarId = "foo";
@@ -2926,7 +2961,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEvent());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.import(arg_request, arg_calendarId).then(unittest.expectAsync(((api.Event response) {
         checkEvent(response);
@@ -2935,7 +2970,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EventsResourceApi res = new api.CalendarApi(mock).events;
       var arg_request = buildEvent();
       var arg_calendarId = "foo";
@@ -2987,7 +3022,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEvent());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_calendarId, maxAttendees: arg_maxAttendees, sendNotifications: arg_sendNotifications).then(unittest.expectAsync(((api.Event response) {
         checkEvent(response);
@@ -2996,7 +3031,7 @@
 
     unittest.test("method--instances", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EventsResourceApi res = new api.CalendarApi(mock).events;
       var arg_calendarId = "foo";
       var arg_eventId = "foo";
@@ -3066,7 +3101,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEvents());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.instances(arg_calendarId, arg_eventId, alwaysIncludeEmail: arg_alwaysIncludeEmail, maxAttendees: arg_maxAttendees, maxResults: arg_maxResults, originalStart: arg_originalStart, pageToken: arg_pageToken, showDeleted: arg_showDeleted, timeMax: arg_timeMax, timeMin: arg_timeMin, timeZone: arg_timeZone).then(unittest.expectAsync(((api.Events response) {
         checkEvents(response);
@@ -3075,7 +3110,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EventsResourceApi res = new api.CalendarApi(mock).events;
       var arg_calendarId = "foo";
       var arg_alwaysIncludeEmail = true;
@@ -3084,9 +3119,9 @@
       var arg_maxResults = 42;
       var arg_orderBy = "foo";
       var arg_pageToken = "foo";
-      var arg_privateExtendedProperty = buildUnnamed1001();
+      var arg_privateExtendedProperty = buildUnnamed393();
       var arg_q = "foo";
-      var arg_sharedExtendedProperty = buildUnnamed1002();
+      var arg_sharedExtendedProperty = buildUnnamed394();
       var arg_showDeleted = true;
       var arg_showHiddenInvitations = true;
       var arg_singleEvents = true;
@@ -3153,7 +3188,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEvents());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_calendarId, alwaysIncludeEmail: arg_alwaysIncludeEmail, iCalUID: arg_iCalUID, maxAttendees: arg_maxAttendees, maxResults: arg_maxResults, orderBy: arg_orderBy, pageToken: arg_pageToken, privateExtendedProperty: arg_privateExtendedProperty, q: arg_q, sharedExtendedProperty: arg_sharedExtendedProperty, showDeleted: arg_showDeleted, showHiddenInvitations: arg_showHiddenInvitations, singleEvents: arg_singleEvents, syncToken: arg_syncToken, timeMax: arg_timeMax, timeMin: arg_timeMin, timeZone: arg_timeZone, updatedMin: arg_updatedMin).then(unittest.expectAsync(((api.Events response) {
         checkEvents(response);
@@ -3162,7 +3197,7 @@
 
     unittest.test("method--move", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EventsResourceApi res = new api.CalendarApi(mock).events;
       var arg_calendarId = "foo";
       var arg_eventId = "foo";
@@ -3218,7 +3253,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEvent());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.move(arg_calendarId, arg_eventId, arg_destination, sendNotifications: arg_sendNotifications).then(unittest.expectAsync(((api.Event response) {
         checkEvent(response);
@@ -3227,7 +3262,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EventsResourceApi res = new api.CalendarApi(mock).events;
       var arg_request = buildEvent();
       var arg_calendarId = "foo";
@@ -3285,7 +3320,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEvent());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_calendarId, arg_eventId, alwaysIncludeEmail: arg_alwaysIncludeEmail, maxAttendees: arg_maxAttendees, sendNotifications: arg_sendNotifications).then(unittest.expectAsync(((api.Event response) {
         checkEvent(response);
@@ -3294,7 +3329,7 @@
 
     unittest.test("method--quickAdd", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EventsResourceApi res = new api.CalendarApi(mock).events;
       var arg_calendarId = "foo";
       var arg_text = "foo";
@@ -3342,7 +3377,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEvent());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.quickAdd(arg_calendarId, arg_text, sendNotifications: arg_sendNotifications).then(unittest.expectAsync(((api.Event response) {
         checkEvent(response);
@@ -3351,7 +3386,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EventsResourceApi res = new api.CalendarApi(mock).events;
       var arg_request = buildEvent();
       var arg_calendarId = "foo";
@@ -3409,7 +3444,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEvent());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_calendarId, arg_eventId, alwaysIncludeEmail: arg_alwaysIncludeEmail, maxAttendees: arg_maxAttendees, sendNotifications: arg_sendNotifications).then(unittest.expectAsync(((api.Event response) {
         checkEvent(response);
@@ -3418,7 +3453,7 @@
 
     unittest.test("method--watch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EventsResourceApi res = new api.CalendarApi(mock).events;
       var arg_request = buildChannel();
       var arg_calendarId = "foo";
@@ -3428,9 +3463,9 @@
       var arg_maxResults = 42;
       var arg_orderBy = "foo";
       var arg_pageToken = "foo";
-      var arg_privateExtendedProperty = buildUnnamed1003();
+      var arg_privateExtendedProperty = buildUnnamed395();
       var arg_q = "foo";
-      var arg_sharedExtendedProperty = buildUnnamed1004();
+      var arg_sharedExtendedProperty = buildUnnamed396();
       var arg_showDeleted = true;
       var arg_showHiddenInvitations = true;
       var arg_singleEvents = true;
@@ -3500,7 +3535,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChannel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.watch(arg_request, arg_calendarId, alwaysIncludeEmail: arg_alwaysIncludeEmail, iCalUID: arg_iCalUID, maxAttendees: arg_maxAttendees, maxResults: arg_maxResults, orderBy: arg_orderBy, pageToken: arg_pageToken, privateExtendedProperty: arg_privateExtendedProperty, q: arg_q, sharedExtendedProperty: arg_sharedExtendedProperty, showDeleted: arg_showDeleted, showHiddenInvitations: arg_showHiddenInvitations, singleEvents: arg_singleEvents, syncToken: arg_syncToken, timeMax: arg_timeMax, timeMin: arg_timeMin, timeZone: arg_timeZone, updatedMin: arg_updatedMin).then(unittest.expectAsync(((api.Channel response) {
         checkChannel(response);
@@ -3513,7 +3548,7 @@
   unittest.group("resource-FreebusyResourceApi", () {
     unittest.test("method--query", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FreebusyResourceApi res = new api.CalendarApi(mock).freebusy;
       var arg_request = buildFreeBusyRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -3553,7 +3588,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFreeBusyResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.query(arg_request).then(unittest.expectAsync(((api.FreeBusyResponse response) {
         checkFreeBusyResponse(response);
@@ -3566,7 +3601,7 @@
   unittest.group("resource-SettingsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SettingsResourceApi res = new api.CalendarApi(mock).settings;
       var arg_setting = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -3606,7 +3641,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSetting());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_setting).then(unittest.expectAsync(((api.Setting response) {
         checkSetting(response);
@@ -3615,7 +3650,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SettingsResourceApi res = new api.CalendarApi(mock).settings;
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
@@ -3657,7 +3692,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSettings());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(maxResults: arg_maxResults, pageToken: arg_pageToken, syncToken: arg_syncToken).then(unittest.expectAsync(((api.Settings response) {
         checkSettings(response);
@@ -3666,7 +3701,7 @@
 
     unittest.test("method--watch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SettingsResourceApi res = new api.CalendarApi(mock).settings;
       var arg_request = buildChannel();
       var arg_maxResults = 42;
@@ -3712,7 +3747,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChannel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.watch(arg_request, maxResults: arg_maxResults, pageToken: arg_pageToken, syncToken: arg_syncToken).then(unittest.expectAsync(((api.Channel response) {
         checkChannel(response);
diff --git a/generated/googleapis/test/civicinfo/us_v1_test.dart b/generated/googleapis/test/civicinfo/us_v1_test.dart
deleted file mode 100644
index c8fefc6..0000000
--- a/generated/googleapis/test/civicinfo/us_v1_test.dart
+++ /dev/null
@@ -1,1369 +0,0 @@
-library googleapis.civicinfo.us_v1.test;
-
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
-
-import 'package:http/http.dart' as http;
-import 'package:http/testing.dart' as http_testing;
-import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
-
-import 'package:googleapis/civicinfo/us_v1.dart' as api;
-
-
-
-buildUnnamed1169() {
-  var o = new core.List<api.Source>();
-  o.add(buildSource());
-  o.add(buildSource());
-  return o;
-}
-
-checkUnnamed1169(core.List<api.Source> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkSource(o[0]);
-  checkSource(o[1]);
-}
-
-core.int buildCounterAdministrationRegion = 0;
-buildAdministrationRegion() {
-  var o = new api.AdministrationRegion();
-  buildCounterAdministrationRegion++;
-  if (buildCounterAdministrationRegion < 3) {
-    o.electionAdministrationBody = buildAdministrativeBody();
-    o.id = "foo";
-    o.localJurisdiction = buildAdministrationRegion();
-    o.name = "foo";
-    o.sources = buildUnnamed1169();
-  }
-  buildCounterAdministrationRegion--;
-  return o;
-}
-
-checkAdministrationRegion(api.AdministrationRegion o) {
-  buildCounterAdministrationRegion++;
-  if (buildCounterAdministrationRegion < 3) {
-    checkAdministrativeBody(o.electionAdministrationBody);
-    unittest.expect(o.id, unittest.equals('foo'));
-    checkAdministrationRegion(o.localJurisdiction);
-    unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1169(o.sources);
-  }
-  buildCounterAdministrationRegion--;
-}
-
-buildUnnamed1170() {
-  var o = new core.List<api.ElectionOfficial>();
-  o.add(buildElectionOfficial());
-  o.add(buildElectionOfficial());
-  return o;
-}
-
-checkUnnamed1170(core.List<api.ElectionOfficial> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkElectionOfficial(o[0]);
-  checkElectionOfficial(o[1]);
-}
-
-buildUnnamed1171() {
-  var o = new core.List<core.String>();
-  o.add("foo");
-  o.add("foo");
-  return o;
-}
-
-checkUnnamed1171(core.List<core.String> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  unittest.expect(o[0], unittest.equals('foo'));
-  unittest.expect(o[1], unittest.equals('foo'));
-}
-
-core.int buildCounterAdministrativeBody = 0;
-buildAdministrativeBody() {
-  var o = new api.AdministrativeBody();
-  buildCounterAdministrativeBody++;
-  if (buildCounterAdministrativeBody < 3) {
-    o.absenteeVotingInfoUrl = "foo";
-    o.ballotInfoUrl = "foo";
-    o.correspondenceAddress = buildSimpleAddressType();
-    o.electionInfoUrl = "foo";
-    o.electionOfficials = buildUnnamed1170();
-    o.electionRegistrationConfirmationUrl = "foo";
-    o.electionRegistrationUrl = "foo";
-    o.electionRulesUrl = "foo";
-    o.hoursOfOperation = "foo";
-    o.name = "foo";
-    o.physicalAddress = buildSimpleAddressType();
-    o.voterServices = buildUnnamed1171();
-    o.votingLocationFinderUrl = "foo";
-  }
-  buildCounterAdministrativeBody--;
-  return o;
-}
-
-checkAdministrativeBody(api.AdministrativeBody o) {
-  buildCounterAdministrativeBody++;
-  if (buildCounterAdministrativeBody < 3) {
-    unittest.expect(o.absenteeVotingInfoUrl, unittest.equals('foo'));
-    unittest.expect(o.ballotInfoUrl, unittest.equals('foo'));
-    checkSimpleAddressType(o.correspondenceAddress);
-    unittest.expect(o.electionInfoUrl, unittest.equals('foo'));
-    checkUnnamed1170(o.electionOfficials);
-    unittest.expect(o.electionRegistrationConfirmationUrl, unittest.equals('foo'));
-    unittest.expect(o.electionRegistrationUrl, unittest.equals('foo'));
-    unittest.expect(o.electionRulesUrl, unittest.equals('foo'));
-    unittest.expect(o.hoursOfOperation, unittest.equals('foo'));
-    unittest.expect(o.name, unittest.equals('foo'));
-    checkSimpleAddressType(o.physicalAddress);
-    checkUnnamed1171(o.voterServices);
-    unittest.expect(o.votingLocationFinderUrl, unittest.equals('foo'));
-  }
-  buildCounterAdministrativeBody--;
-}
-
-buildUnnamed1172() {
-  var o = new core.List<api.Channel>();
-  o.add(buildChannel());
-  o.add(buildChannel());
-  return o;
-}
-
-checkUnnamed1172(core.List<api.Channel> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkChannel(o[0]);
-  checkChannel(o[1]);
-}
-
-core.int buildCounterCandidate = 0;
-buildCandidate() {
-  var o = new api.Candidate();
-  buildCounterCandidate++;
-  if (buildCounterCandidate < 3) {
-    o.candidateUrl = "foo";
-    o.channels = buildUnnamed1172();
-    o.email = "foo";
-    o.name = "foo";
-    o.orderOnBallot = "foo";
-    o.party = "foo";
-    o.phone = "foo";
-    o.photoUrl = "foo";
-  }
-  buildCounterCandidate--;
-  return o;
-}
-
-checkCandidate(api.Candidate o) {
-  buildCounterCandidate++;
-  if (buildCounterCandidate < 3) {
-    unittest.expect(o.candidateUrl, unittest.equals('foo'));
-    checkUnnamed1172(o.channels);
-    unittest.expect(o.email, unittest.equals('foo'));
-    unittest.expect(o.name, unittest.equals('foo'));
-    unittest.expect(o.orderOnBallot, unittest.equals('foo'));
-    unittest.expect(o.party, unittest.equals('foo'));
-    unittest.expect(o.phone, unittest.equals('foo'));
-    unittest.expect(o.photoUrl, unittest.equals('foo'));
-  }
-  buildCounterCandidate--;
-}
-
-core.int buildCounterChannel = 0;
-buildChannel() {
-  var o = new api.Channel();
-  buildCounterChannel++;
-  if (buildCounterChannel < 3) {
-    o.id = "foo";
-    o.type = "foo";
-  }
-  buildCounterChannel--;
-  return o;
-}
-
-checkChannel(api.Channel o) {
-  buildCounterChannel++;
-  if (buildCounterChannel < 3) {
-    unittest.expect(o.id, unittest.equals('foo'));
-    unittest.expect(o.type, unittest.equals('foo'));
-  }
-  buildCounterChannel--;
-}
-
-buildUnnamed1173() {
-  var o = new core.List<api.Candidate>();
-  o.add(buildCandidate());
-  o.add(buildCandidate());
-  return o;
-}
-
-checkUnnamed1173(core.List<api.Candidate> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkCandidate(o[0]);
-  checkCandidate(o[1]);
-}
-
-buildUnnamed1174() {
-  var o = new core.List<api.Source>();
-  o.add(buildSource());
-  o.add(buildSource());
-  return o;
-}
-
-checkUnnamed1174(core.List<api.Source> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkSource(o[0]);
-  checkSource(o[1]);
-}
-
-core.int buildCounterContest = 0;
-buildContest() {
-  var o = new api.Contest();
-  buildCounterContest++;
-  if (buildCounterContest < 3) {
-    o.ballotPlacement = "foo";
-    o.candidates = buildUnnamed1173();
-    o.district = buildElectoralDistrict();
-    o.electorateSpecifications = "foo";
-    o.id = "foo";
-    o.level = "foo";
-    o.numberElected = "foo";
-    o.numberVotingFor = "foo";
-    o.office = "foo";
-    o.primaryParty = "foo";
-    o.referendumSubtitle = "foo";
-    o.referendumTitle = "foo";
-    o.referendumUrl = "foo";
-    o.sources = buildUnnamed1174();
-    o.special = "foo";
-    o.type = "foo";
-  }
-  buildCounterContest--;
-  return o;
-}
-
-checkContest(api.Contest o) {
-  buildCounterContest++;
-  if (buildCounterContest < 3) {
-    unittest.expect(o.ballotPlacement, unittest.equals('foo'));
-    checkUnnamed1173(o.candidates);
-    checkElectoralDistrict(o.district);
-    unittest.expect(o.electorateSpecifications, unittest.equals('foo'));
-    unittest.expect(o.id, unittest.equals('foo'));
-    unittest.expect(o.level, unittest.equals('foo'));
-    unittest.expect(o.numberElected, unittest.equals('foo'));
-    unittest.expect(o.numberVotingFor, unittest.equals('foo'));
-    unittest.expect(o.office, unittest.equals('foo'));
-    unittest.expect(o.primaryParty, unittest.equals('foo'));
-    unittest.expect(o.referendumSubtitle, unittest.equals('foo'));
-    unittest.expect(o.referendumTitle, unittest.equals('foo'));
-    unittest.expect(o.referendumUrl, unittest.equals('foo'));
-    checkUnnamed1174(o.sources);
-    unittest.expect(o.special, unittest.equals('foo'));
-    unittest.expect(o.type, unittest.equals('foo'));
-  }
-  buildCounterContest--;
-}
-
-buildUnnamed1175() {
-  var o = new core.List<api.DivisionSearchResult>();
-  o.add(buildDivisionSearchResult());
-  o.add(buildDivisionSearchResult());
-  return o;
-}
-
-checkUnnamed1175(core.List<api.DivisionSearchResult> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkDivisionSearchResult(o[0]);
-  checkDivisionSearchResult(o[1]);
-}
-
-core.int buildCounterDivisionSearchResponse = 0;
-buildDivisionSearchResponse() {
-  var o = new api.DivisionSearchResponse();
-  buildCounterDivisionSearchResponse++;
-  if (buildCounterDivisionSearchResponse < 3) {
-    o.kind = "foo";
-    o.results = buildUnnamed1175();
-    o.status = "foo";
-  }
-  buildCounterDivisionSearchResponse--;
-  return o;
-}
-
-checkDivisionSearchResponse(api.DivisionSearchResponse o) {
-  buildCounterDivisionSearchResponse++;
-  if (buildCounterDivisionSearchResponse < 3) {
-    unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1175(o.results);
-    unittest.expect(o.status, unittest.equals('foo'));
-  }
-  buildCounterDivisionSearchResponse--;
-}
-
-buildUnnamed1176() {
-  var o = new core.List<core.String>();
-  o.add("foo");
-  o.add("foo");
-  return o;
-}
-
-checkUnnamed1176(core.List<core.String> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  unittest.expect(o[0], unittest.equals('foo'));
-  unittest.expect(o[1], unittest.equals('foo'));
-}
-
-core.int buildCounterDivisionSearchResult = 0;
-buildDivisionSearchResult() {
-  var o = new api.DivisionSearchResult();
-  buildCounterDivisionSearchResult++;
-  if (buildCounterDivisionSearchResult < 3) {
-    o.aliases = buildUnnamed1176();
-    o.name = "foo";
-    o.ocdId = "foo";
-  }
-  buildCounterDivisionSearchResult--;
-  return o;
-}
-
-checkDivisionSearchResult(api.DivisionSearchResult o) {
-  buildCounterDivisionSearchResult++;
-  if (buildCounterDivisionSearchResult < 3) {
-    checkUnnamed1176(o.aliases);
-    unittest.expect(o.name, unittest.equals('foo'));
-    unittest.expect(o.ocdId, unittest.equals('foo'));
-  }
-  buildCounterDivisionSearchResult--;
-}
-
-core.int buildCounterElection = 0;
-buildElection() {
-  var o = new api.Election();
-  buildCounterElection++;
-  if (buildCounterElection < 3) {
-    o.electionDay = "foo";
-    o.id = "foo";
-    o.name = "foo";
-  }
-  buildCounterElection--;
-  return o;
-}
-
-checkElection(api.Election o) {
-  buildCounterElection++;
-  if (buildCounterElection < 3) {
-    unittest.expect(o.electionDay, unittest.equals('foo'));
-    unittest.expect(o.id, unittest.equals('foo'));
-    unittest.expect(o.name, unittest.equals('foo'));
-  }
-  buildCounterElection--;
-}
-
-core.int buildCounterElectionOfficial = 0;
-buildElectionOfficial() {
-  var o = new api.ElectionOfficial();
-  buildCounterElectionOfficial++;
-  if (buildCounterElectionOfficial < 3) {
-    o.emailAddress = "foo";
-    o.faxNumber = "foo";
-    o.name = "foo";
-    o.officePhoneNumber = "foo";
-    o.title = "foo";
-  }
-  buildCounterElectionOfficial--;
-  return o;
-}
-
-checkElectionOfficial(api.ElectionOfficial o) {
-  buildCounterElectionOfficial++;
-  if (buildCounterElectionOfficial < 3) {
-    unittest.expect(o.emailAddress, unittest.equals('foo'));
-    unittest.expect(o.faxNumber, unittest.equals('foo'));
-    unittest.expect(o.name, unittest.equals('foo'));
-    unittest.expect(o.officePhoneNumber, unittest.equals('foo'));
-    unittest.expect(o.title, unittest.equals('foo'));
-  }
-  buildCounterElectionOfficial--;
-}
-
-buildUnnamed1177() {
-  var o = new core.List<api.Election>();
-  o.add(buildElection());
-  o.add(buildElection());
-  return o;
-}
-
-checkUnnamed1177(core.List<api.Election> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkElection(o[0]);
-  checkElection(o[1]);
-}
-
-core.int buildCounterElectionsQueryResponse = 0;
-buildElectionsQueryResponse() {
-  var o = new api.ElectionsQueryResponse();
-  buildCounterElectionsQueryResponse++;
-  if (buildCounterElectionsQueryResponse < 3) {
-    o.elections = buildUnnamed1177();
-    o.kind = "foo";
-  }
-  buildCounterElectionsQueryResponse--;
-  return o;
-}
-
-checkElectionsQueryResponse(api.ElectionsQueryResponse o) {
-  buildCounterElectionsQueryResponse++;
-  if (buildCounterElectionsQueryResponse < 3) {
-    checkUnnamed1177(o.elections);
-    unittest.expect(o.kind, unittest.equals('foo'));
-  }
-  buildCounterElectionsQueryResponse--;
-}
-
-core.int buildCounterElectoralDistrict = 0;
-buildElectoralDistrict() {
-  var o = new api.ElectoralDistrict();
-  buildCounterElectoralDistrict++;
-  if (buildCounterElectoralDistrict < 3) {
-    o.id = "foo";
-    o.name = "foo";
-    o.scope = "foo";
-  }
-  buildCounterElectoralDistrict--;
-  return o;
-}
-
-checkElectoralDistrict(api.ElectoralDistrict o) {
-  buildCounterElectoralDistrict++;
-  if (buildCounterElectoralDistrict < 3) {
-    unittest.expect(o.id, unittest.equals('foo'));
-    unittest.expect(o.name, unittest.equals('foo'));
-    unittest.expect(o.scope, unittest.equals('foo'));
-  }
-  buildCounterElectoralDistrict--;
-}
-
-buildUnnamed1178() {
-  var o = new core.List<core.String>();
-  o.add("foo");
-  o.add("foo");
-  return o;
-}
-
-checkUnnamed1178(core.List<core.String> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  unittest.expect(o[0], unittest.equals('foo'));
-  unittest.expect(o[1], unittest.equals('foo'));
-}
-
-buildUnnamed1179() {
-  var o = new core.List<core.String>();
-  o.add("foo");
-  o.add("foo");
-  return o;
-}
-
-checkUnnamed1179(core.List<core.String> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  unittest.expect(o[0], unittest.equals('foo'));
-  unittest.expect(o[1], unittest.equals('foo'));
-}
-
-core.int buildCounterGeographicDivision = 0;
-buildGeographicDivision() {
-  var o = new api.GeographicDivision();
-  buildCounterGeographicDivision++;
-  if (buildCounterGeographicDivision < 3) {
-    o.alsoKnownAs = buildUnnamed1178();
-    o.name = "foo";
-    o.officeIds = buildUnnamed1179();
-    o.scope = "foo";
-  }
-  buildCounterGeographicDivision--;
-  return o;
-}
-
-checkGeographicDivision(api.GeographicDivision o) {
-  buildCounterGeographicDivision++;
-  if (buildCounterGeographicDivision < 3) {
-    checkUnnamed1178(o.alsoKnownAs);
-    unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1179(o.officeIds);
-    unittest.expect(o.scope, unittest.equals('foo'));
-  }
-  buildCounterGeographicDivision--;
-}
-
-buildUnnamed1180() {
-  var o = new core.List<core.String>();
-  o.add("foo");
-  o.add("foo");
-  return o;
-}
-
-checkUnnamed1180(core.List<core.String> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  unittest.expect(o[0], unittest.equals('foo'));
-  unittest.expect(o[1], unittest.equals('foo'));
-}
-
-buildUnnamed1181() {
-  var o = new core.List<api.Source>();
-  o.add(buildSource());
-  o.add(buildSource());
-  return o;
-}
-
-checkUnnamed1181(core.List<api.Source> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkSource(o[0]);
-  checkSource(o[1]);
-}
-
-core.int buildCounterOffice = 0;
-buildOffice() {
-  var o = new api.Office();
-  buildCounterOffice++;
-  if (buildCounterOffice < 3) {
-    o.divisionId = "foo";
-    o.level = "foo";
-    o.name = "foo";
-    o.officialIds = buildUnnamed1180();
-    o.sources = buildUnnamed1181();
-  }
-  buildCounterOffice--;
-  return o;
-}
-
-checkOffice(api.Office o) {
-  buildCounterOffice++;
-  if (buildCounterOffice < 3) {
-    unittest.expect(o.divisionId, unittest.equals('foo'));
-    unittest.expect(o.level, unittest.equals('foo'));
-    unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1180(o.officialIds);
-    checkUnnamed1181(o.sources);
-  }
-  buildCounterOffice--;
-}
-
-buildUnnamed1182() {
-  var o = new core.List<api.SimpleAddressType>();
-  o.add(buildSimpleAddressType());
-  o.add(buildSimpleAddressType());
-  return o;
-}
-
-checkUnnamed1182(core.List<api.SimpleAddressType> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkSimpleAddressType(o[0]);
-  checkSimpleAddressType(o[1]);
-}
-
-buildUnnamed1183() {
-  var o = new core.List<api.Channel>();
-  o.add(buildChannel());
-  o.add(buildChannel());
-  return o;
-}
-
-checkUnnamed1183(core.List<api.Channel> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkChannel(o[0]);
-  checkChannel(o[1]);
-}
-
-buildUnnamed1184() {
-  var o = new core.List<core.String>();
-  o.add("foo");
-  o.add("foo");
-  return o;
-}
-
-checkUnnamed1184(core.List<core.String> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  unittest.expect(o[0], unittest.equals('foo'));
-  unittest.expect(o[1], unittest.equals('foo'));
-}
-
-buildUnnamed1185() {
-  var o = new core.List<core.String>();
-  o.add("foo");
-  o.add("foo");
-  return o;
-}
-
-checkUnnamed1185(core.List<core.String> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  unittest.expect(o[0], unittest.equals('foo'));
-  unittest.expect(o[1], unittest.equals('foo'));
-}
-
-buildUnnamed1186() {
-  var o = new core.List<core.String>();
-  o.add("foo");
-  o.add("foo");
-  return o;
-}
-
-checkUnnamed1186(core.List<core.String> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  unittest.expect(o[0], unittest.equals('foo'));
-  unittest.expect(o[1], unittest.equals('foo'));
-}
-
-core.int buildCounterOfficial = 0;
-buildOfficial() {
-  var o = new api.Official();
-  buildCounterOfficial++;
-  if (buildCounterOfficial < 3) {
-    o.address = buildUnnamed1182();
-    o.channels = buildUnnamed1183();
-    o.emails = buildUnnamed1184();
-    o.name = "foo";
-    o.party = "foo";
-    o.phones = buildUnnamed1185();
-    o.photoUrl = "foo";
-    o.urls = buildUnnamed1186();
-  }
-  buildCounterOfficial--;
-  return o;
-}
-
-checkOfficial(api.Official o) {
-  buildCounterOfficial++;
-  if (buildCounterOfficial < 3) {
-    checkUnnamed1182(o.address);
-    checkUnnamed1183(o.channels);
-    checkUnnamed1184(o.emails);
-    unittest.expect(o.name, unittest.equals('foo'));
-    unittest.expect(o.party, unittest.equals('foo'));
-    checkUnnamed1185(o.phones);
-    unittest.expect(o.photoUrl, unittest.equals('foo'));
-    checkUnnamed1186(o.urls);
-  }
-  buildCounterOfficial--;
-}
-
-buildUnnamed1187() {
-  var o = new core.List<api.Source>();
-  o.add(buildSource());
-  o.add(buildSource());
-  return o;
-}
-
-checkUnnamed1187(core.List<api.Source> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkSource(o[0]);
-  checkSource(o[1]);
-}
-
-core.int buildCounterPollingLocation = 0;
-buildPollingLocation() {
-  var o = new api.PollingLocation();
-  buildCounterPollingLocation++;
-  if (buildCounterPollingLocation < 3) {
-    o.address = buildSimpleAddressType();
-    o.endDate = "foo";
-    o.id = "foo";
-    o.name = "foo";
-    o.notes = "foo";
-    o.pollingHours = "foo";
-    o.sources = buildUnnamed1187();
-    o.startDate = "foo";
-    o.voterServices = "foo";
-  }
-  buildCounterPollingLocation--;
-  return o;
-}
-
-checkPollingLocation(api.PollingLocation o) {
-  buildCounterPollingLocation++;
-  if (buildCounterPollingLocation < 3) {
-    checkSimpleAddressType(o.address);
-    unittest.expect(o.endDate, unittest.equals('foo'));
-    unittest.expect(o.id, unittest.equals('foo'));
-    unittest.expect(o.name, unittest.equals('foo'));
-    unittest.expect(o.notes, unittest.equals('foo'));
-    unittest.expect(o.pollingHours, unittest.equals('foo'));
-    checkUnnamed1187(o.sources);
-    unittest.expect(o.startDate, unittest.equals('foo'));
-    unittest.expect(o.voterServices, unittest.equals('foo'));
-  }
-  buildCounterPollingLocation--;
-}
-
-core.int buildCounterRepresentativeInfoRequest = 0;
-buildRepresentativeInfoRequest() {
-  var o = new api.RepresentativeInfoRequest();
-  buildCounterRepresentativeInfoRequest++;
-  if (buildCounterRepresentativeInfoRequest < 3) {
-    o.address = "foo";
-  }
-  buildCounterRepresentativeInfoRequest--;
-  return o;
-}
-
-checkRepresentativeInfoRequest(api.RepresentativeInfoRequest o) {
-  buildCounterRepresentativeInfoRequest++;
-  if (buildCounterRepresentativeInfoRequest < 3) {
-    unittest.expect(o.address, unittest.equals('foo'));
-  }
-  buildCounterRepresentativeInfoRequest--;
-}
-
-buildUnnamed1188() {
-  var o = new core.Map<core.String, api.GeographicDivision>();
-  o["x"] = buildGeographicDivision();
-  o["y"] = buildGeographicDivision();
-  return o;
-}
-
-checkUnnamed1188(core.Map<core.String, api.GeographicDivision> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkGeographicDivision(o["x"]);
-  checkGeographicDivision(o["y"]);
-}
-
-buildUnnamed1189() {
-  var o = new core.Map<core.String, api.Office>();
-  o["x"] = buildOffice();
-  o["y"] = buildOffice();
-  return o;
-}
-
-checkUnnamed1189(core.Map<core.String, api.Office> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkOffice(o["x"]);
-  checkOffice(o["y"]);
-}
-
-buildUnnamed1190() {
-  var o = new core.Map<core.String, api.Official>();
-  o["x"] = buildOfficial();
-  o["y"] = buildOfficial();
-  return o;
-}
-
-checkUnnamed1190(core.Map<core.String, api.Official> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkOfficial(o["x"]);
-  checkOfficial(o["y"]);
-}
-
-core.int buildCounterRepresentativeInfoResponse = 0;
-buildRepresentativeInfoResponse() {
-  var o = new api.RepresentativeInfoResponse();
-  buildCounterRepresentativeInfoResponse++;
-  if (buildCounterRepresentativeInfoResponse < 3) {
-    o.divisions = buildUnnamed1188();
-    o.kind = "foo";
-    o.normalizedInput = buildSimpleAddressType();
-    o.offices = buildUnnamed1189();
-    o.officials = buildUnnamed1190();
-    o.status = "foo";
-  }
-  buildCounterRepresentativeInfoResponse--;
-  return o;
-}
-
-checkRepresentativeInfoResponse(api.RepresentativeInfoResponse o) {
-  buildCounterRepresentativeInfoResponse++;
-  if (buildCounterRepresentativeInfoResponse < 3) {
-    checkUnnamed1188(o.divisions);
-    unittest.expect(o.kind, unittest.equals('foo'));
-    checkSimpleAddressType(o.normalizedInput);
-    checkUnnamed1189(o.offices);
-    checkUnnamed1190(o.officials);
-    unittest.expect(o.status, unittest.equals('foo'));
-  }
-  buildCounterRepresentativeInfoResponse--;
-}
-
-core.int buildCounterSimpleAddressType = 0;
-buildSimpleAddressType() {
-  var o = new api.SimpleAddressType();
-  buildCounterSimpleAddressType++;
-  if (buildCounterSimpleAddressType < 3) {
-    o.city = "foo";
-    o.line1 = "foo";
-    o.line2 = "foo";
-    o.line3 = "foo";
-    o.locationName = "foo";
-    o.state = "foo";
-    o.zip = "foo";
-  }
-  buildCounterSimpleAddressType--;
-  return o;
-}
-
-checkSimpleAddressType(api.SimpleAddressType o) {
-  buildCounterSimpleAddressType++;
-  if (buildCounterSimpleAddressType < 3) {
-    unittest.expect(o.city, unittest.equals('foo'));
-    unittest.expect(o.line1, unittest.equals('foo'));
-    unittest.expect(o.line2, unittest.equals('foo'));
-    unittest.expect(o.line3, unittest.equals('foo'));
-    unittest.expect(o.locationName, unittest.equals('foo'));
-    unittest.expect(o.state, unittest.equals('foo'));
-    unittest.expect(o.zip, unittest.equals('foo'));
-  }
-  buildCounterSimpleAddressType--;
-}
-
-core.int buildCounterSource = 0;
-buildSource() {
-  var o = new api.Source();
-  buildCounterSource++;
-  if (buildCounterSource < 3) {
-    o.name = "foo";
-    o.official = true;
-  }
-  buildCounterSource--;
-  return o;
-}
-
-checkSource(api.Source o) {
-  buildCounterSource++;
-  if (buildCounterSource < 3) {
-    unittest.expect(o.name, unittest.equals('foo'));
-    unittest.expect(o.official, unittest.isTrue);
-  }
-  buildCounterSource--;
-}
-
-core.int buildCounterVoterInfoRequest = 0;
-buildVoterInfoRequest() {
-  var o = new api.VoterInfoRequest();
-  buildCounterVoterInfoRequest++;
-  if (buildCounterVoterInfoRequest < 3) {
-    o.address = "foo";
-  }
-  buildCounterVoterInfoRequest--;
-  return o;
-}
-
-checkVoterInfoRequest(api.VoterInfoRequest o) {
-  buildCounterVoterInfoRequest++;
-  if (buildCounterVoterInfoRequest < 3) {
-    unittest.expect(o.address, unittest.equals('foo'));
-  }
-  buildCounterVoterInfoRequest--;
-}
-
-buildUnnamed1191() {
-  var o = new core.List<api.Contest>();
-  o.add(buildContest());
-  o.add(buildContest());
-  return o;
-}
-
-checkUnnamed1191(core.List<api.Contest> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkContest(o[0]);
-  checkContest(o[1]);
-}
-
-buildUnnamed1192() {
-  var o = new core.List<api.PollingLocation>();
-  o.add(buildPollingLocation());
-  o.add(buildPollingLocation());
-  return o;
-}
-
-checkUnnamed1192(core.List<api.PollingLocation> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkPollingLocation(o[0]);
-  checkPollingLocation(o[1]);
-}
-
-buildUnnamed1193() {
-  var o = new core.List<api.PollingLocation>();
-  o.add(buildPollingLocation());
-  o.add(buildPollingLocation());
-  return o;
-}
-
-checkUnnamed1193(core.List<api.PollingLocation> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkPollingLocation(o[0]);
-  checkPollingLocation(o[1]);
-}
-
-buildUnnamed1194() {
-  var o = new core.List<api.PollingLocation>();
-  o.add(buildPollingLocation());
-  o.add(buildPollingLocation());
-  return o;
-}
-
-checkUnnamed1194(core.List<api.PollingLocation> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkPollingLocation(o[0]);
-  checkPollingLocation(o[1]);
-}
-
-buildUnnamed1195() {
-  var o = new core.List<api.AdministrationRegion>();
-  o.add(buildAdministrationRegion());
-  o.add(buildAdministrationRegion());
-  return o;
-}
-
-checkUnnamed1195(core.List<api.AdministrationRegion> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkAdministrationRegion(o[0]);
-  checkAdministrationRegion(o[1]);
-}
-
-core.int buildCounterVoterInfoResponse = 0;
-buildVoterInfoResponse() {
-  var o = new api.VoterInfoResponse();
-  buildCounterVoterInfoResponse++;
-  if (buildCounterVoterInfoResponse < 3) {
-    o.contests = buildUnnamed1191();
-    o.dropOffLocations = buildUnnamed1192();
-    o.earlyVoteSites = buildUnnamed1193();
-    o.election = buildElection();
-    o.kind = "foo";
-    o.normalizedInput = buildSimpleAddressType();
-    o.pollingLocations = buildUnnamed1194();
-    o.precinctId = "foo";
-    o.state = buildUnnamed1195();
-    o.status = "foo";
-  }
-  buildCounterVoterInfoResponse--;
-  return o;
-}
-
-checkVoterInfoResponse(api.VoterInfoResponse o) {
-  buildCounterVoterInfoResponse++;
-  if (buildCounterVoterInfoResponse < 3) {
-    checkUnnamed1191(o.contests);
-    checkUnnamed1192(o.dropOffLocations);
-    checkUnnamed1193(o.earlyVoteSites);
-    checkElection(o.election);
-    unittest.expect(o.kind, unittest.equals('foo'));
-    checkSimpleAddressType(o.normalizedInput);
-    checkUnnamed1194(o.pollingLocations);
-    unittest.expect(o.precinctId, unittest.equals('foo'));
-    checkUnnamed1195(o.state);
-    unittest.expect(o.status, unittest.equals('foo'));
-  }
-  buildCounterVoterInfoResponse--;
-}
-
-
-main() {
-  unittest.group("obj-schema-AdministrationRegion", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildAdministrationRegion();
-      var od = new api.AdministrationRegion.fromJson(o.toJson());
-      checkAdministrationRegion(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-AdministrativeBody", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildAdministrativeBody();
-      var od = new api.AdministrativeBody.fromJson(o.toJson());
-      checkAdministrativeBody(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-Candidate", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildCandidate();
-      var od = new api.Candidate.fromJson(o.toJson());
-      checkCandidate(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-Channel", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildChannel();
-      var od = new api.Channel.fromJson(o.toJson());
-      checkChannel(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-Contest", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildContest();
-      var od = new api.Contest.fromJson(o.toJson());
-      checkContest(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-DivisionSearchResponse", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildDivisionSearchResponse();
-      var od = new api.DivisionSearchResponse.fromJson(o.toJson());
-      checkDivisionSearchResponse(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-DivisionSearchResult", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildDivisionSearchResult();
-      var od = new api.DivisionSearchResult.fromJson(o.toJson());
-      checkDivisionSearchResult(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-Election", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildElection();
-      var od = new api.Election.fromJson(o.toJson());
-      checkElection(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-ElectionOfficial", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildElectionOfficial();
-      var od = new api.ElectionOfficial.fromJson(o.toJson());
-      checkElectionOfficial(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-ElectionsQueryResponse", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildElectionsQueryResponse();
-      var od = new api.ElectionsQueryResponse.fromJson(o.toJson());
-      checkElectionsQueryResponse(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-ElectoralDistrict", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildElectoralDistrict();
-      var od = new api.ElectoralDistrict.fromJson(o.toJson());
-      checkElectoralDistrict(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-GeographicDivision", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildGeographicDivision();
-      var od = new api.GeographicDivision.fromJson(o.toJson());
-      checkGeographicDivision(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-Office", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildOffice();
-      var od = new api.Office.fromJson(o.toJson());
-      checkOffice(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-Official", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildOfficial();
-      var od = new api.Official.fromJson(o.toJson());
-      checkOfficial(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-PollingLocation", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildPollingLocation();
-      var od = new api.PollingLocation.fromJson(o.toJson());
-      checkPollingLocation(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-RepresentativeInfoRequest", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildRepresentativeInfoRequest();
-      var od = new api.RepresentativeInfoRequest.fromJson(o.toJson());
-      checkRepresentativeInfoRequest(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-RepresentativeInfoResponse", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildRepresentativeInfoResponse();
-      var od = new api.RepresentativeInfoResponse.fromJson(o.toJson());
-      checkRepresentativeInfoResponse(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-SimpleAddressType", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildSimpleAddressType();
-      var od = new api.SimpleAddressType.fromJson(o.toJson());
-      checkSimpleAddressType(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-Source", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildSource();
-      var od = new api.Source.fromJson(o.toJson());
-      checkSource(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-VoterInfoRequest", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildVoterInfoRequest();
-      var od = new api.VoterInfoRequest.fromJson(o.toJson());
-      checkVoterInfoRequest(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-VoterInfoResponse", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildVoterInfoResponse();
-      var od = new api.VoterInfoResponse.fromJson(o.toJson());
-      checkVoterInfoResponse(od);
-    });
-  });
-
-
-  unittest.group("resource-DivisionsResourceApi", () {
-    unittest.test("method--search", () {
-
-      var mock = new common_test.HttpServerMock();
-      api.DivisionsResourceApi res = new api.CivicinfoApi(mock).divisions;
-      var arg_query = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
-        var path = (req.url).path;
-        var pathOffset = 0;
-        var index;
-        var subPart;
-        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
-        pathOffset += 1;
-        unittest.expect(path.substring(pathOffset, pathOffset + 16), unittest.equals("civicinfo/us_v1/"));
-        pathOffset += 16;
-        unittest.expect(path.substring(pathOffset, pathOffset + 31), unittest.equals("representatives/division_search"));
-        pathOffset += 31;
-
-        var query = (req.url).query;
-        var queryOffset = 0;
-        var queryMap = {};
-        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
-        parseBool(n) {
-          if (n == "true") return true;
-          if (n == "false") return false;
-          if (n == null) return null;
-          throw new core.ArgumentError("Invalid boolean: $n");
-        }
-        if (query.length > 0) {
-          for (var part in query.split("&")) {
-            var keyvalue = part.split("=");
-            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
-          }
-        }
-        unittest.expect(queryMap["query"].first, unittest.equals(arg_query));
-
-
-        var h = {
-          "content-type" : "application/json; charset=utf-8",
-        };
-        var resp = convert.JSON.encode(buildDivisionSearchResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
-      }), true);
-      res.search(query: arg_query).then(unittest.expectAsync(((api.DivisionSearchResponse response) {
-        checkDivisionSearchResponse(response);
-      })));
-    });
-
-  });
-
-
-  unittest.group("resource-ElectionsResourceApi", () {
-    unittest.test("method--electionQuery", () {
-
-      var mock = new common_test.HttpServerMock();
-      api.ElectionsResourceApi res = new api.CivicinfoApi(mock).elections;
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
-        var path = (req.url).path;
-        var pathOffset = 0;
-        var index;
-        var subPart;
-        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
-        pathOffset += 1;
-        unittest.expect(path.substring(pathOffset, pathOffset + 16), unittest.equals("civicinfo/us_v1/"));
-        pathOffset += 16;
-        unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("elections"));
-        pathOffset += 9;
-
-        var query = (req.url).query;
-        var queryOffset = 0;
-        var queryMap = {};
-        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
-        parseBool(n) {
-          if (n == "true") return true;
-          if (n == "false") return false;
-          if (n == null) return null;
-          throw new core.ArgumentError("Invalid boolean: $n");
-        }
-        if (query.length > 0) {
-          for (var part in query.split("&")) {
-            var keyvalue = part.split("=");
-            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
-          }
-        }
-
-
-        var h = {
-          "content-type" : "application/json; charset=utf-8",
-        };
-        var resp = convert.JSON.encode(buildElectionsQueryResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
-      }), true);
-      res.electionQuery().then(unittest.expectAsync(((api.ElectionsQueryResponse response) {
-        checkElectionsQueryResponse(response);
-      })));
-    });
-
-    unittest.test("method--voterInfoQuery", () {
-
-      var mock = new common_test.HttpServerMock();
-      api.ElectionsResourceApi res = new api.CivicinfoApi(mock).elections;
-      var arg_request = buildVoterInfoRequest();
-      var arg_electionId = "foo";
-      var arg_officialOnly = true;
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
-        var obj = new api.VoterInfoRequest.fromJson(json);
-        checkVoterInfoRequest(obj);
-
-        var path = (req.url).path;
-        var pathOffset = 0;
-        var index;
-        var subPart;
-        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
-        pathOffset += 1;
-        unittest.expect(path.substring(pathOffset, pathOffset + 16), unittest.equals("civicinfo/us_v1/"));
-        pathOffset += 16;
-        unittest.expect(path.substring(pathOffset, pathOffset + 10), unittest.equals("voterinfo/"));
-        pathOffset += 10;
-        index = path.indexOf("/lookup", pathOffset);
-        unittest.expect(index >= 0, unittest.isTrue);
-        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
-        pathOffset = index;
-        unittest.expect(subPart, unittest.equals("$arg_electionId"));
-        unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("/lookup"));
-        pathOffset += 7;
-
-        var query = (req.url).query;
-        var queryOffset = 0;
-        var queryMap = {};
-        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
-        parseBool(n) {
-          if (n == "true") return true;
-          if (n == "false") return false;
-          if (n == null) return null;
-          throw new core.ArgumentError("Invalid boolean: $n");
-        }
-        if (query.length > 0) {
-          for (var part in query.split("&")) {
-            var keyvalue = part.split("=");
-            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
-          }
-        }
-        unittest.expect(queryMap["officialOnly"].first, unittest.equals("$arg_officialOnly"));
-
-
-        var h = {
-          "content-type" : "application/json; charset=utf-8",
-        };
-        var resp = convert.JSON.encode(buildVoterInfoResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
-      }), true);
-      res.voterInfoQuery(arg_request, arg_electionId, officialOnly: arg_officialOnly).then(unittest.expectAsync(((api.VoterInfoResponse response) {
-        checkVoterInfoResponse(response);
-      })));
-    });
-
-  });
-
-
-  unittest.group("resource-RepresentativesResourceApi", () {
-    unittest.test("method--representativeInfoQuery", () {
-
-      var mock = new common_test.HttpServerMock();
-      api.RepresentativesResourceApi res = new api.CivicinfoApi(mock).representatives;
-      var arg_request = buildRepresentativeInfoRequest();
-      var arg_includeOffices = true;
-      var arg_ocdId = "foo";
-      var arg_recursive = true;
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
-        var obj = new api.RepresentativeInfoRequest.fromJson(json);
-        checkRepresentativeInfoRequest(obj);
-
-        var path = (req.url).path;
-        var pathOffset = 0;
-        var index;
-        var subPart;
-        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
-        pathOffset += 1;
-        unittest.expect(path.substring(pathOffset, pathOffset + 16), unittest.equals("civicinfo/us_v1/"));
-        pathOffset += 16;
-        unittest.expect(path.substring(pathOffset, pathOffset + 22), unittest.equals("representatives/lookup"));
-        pathOffset += 22;
-
-        var query = (req.url).query;
-        var queryOffset = 0;
-        var queryMap = {};
-        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
-        parseBool(n) {
-          if (n == "true") return true;
-          if (n == "false") return false;
-          if (n == null) return null;
-          throw new core.ArgumentError("Invalid boolean: $n");
-        }
-        if (query.length > 0) {
-          for (var part in query.split("&")) {
-            var keyvalue = part.split("=");
-            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
-          }
-        }
-        unittest.expect(queryMap["includeOffices"].first, unittest.equals("$arg_includeOffices"));
-        unittest.expect(queryMap["ocdId"].first, unittest.equals(arg_ocdId));
-        unittest.expect(queryMap["recursive"].first, unittest.equals("$arg_recursive"));
-
-
-        var h = {
-          "content-type" : "application/json; charset=utf-8",
-        };
-        var resp = convert.JSON.encode(buildRepresentativeInfoResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
-      }), true);
-      res.representativeInfoQuery(arg_request, includeOffices: arg_includeOffices, ocdId: arg_ocdId, recursive: arg_recursive).then(unittest.expectAsync(((api.RepresentativeInfoResponse response) {
-        checkRepresentativeInfoResponse(response);
-      })));
-    });
-
-  });
-
-
-}
-
diff --git a/generated/googleapis/test/civicinfo/v1_test.dart b/generated/googleapis/test/civicinfo/v1_test.dart
deleted file mode 100644
index cba198a..0000000
--- a/generated/googleapis/test/civicinfo/v1_test.dart
+++ /dev/null
@@ -1,1369 +0,0 @@
-library googleapis.civicinfo.v1.test;
-
-import "dart:core" as core;
-import "dart:collection" as collection;
-import "dart:async" as async;
-import "dart:convert" as convert;
-
-import 'package:http/http.dart' as http;
-import 'package:http/testing.dart' as http_testing;
-import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
-
-import 'package:googleapis/civicinfo/v1.dart' as api;
-
-
-
-buildUnnamed65() {
-  var o = new core.List<api.Source>();
-  o.add(buildSource());
-  o.add(buildSource());
-  return o;
-}
-
-checkUnnamed65(core.List<api.Source> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkSource(o[0]);
-  checkSource(o[1]);
-}
-
-core.int buildCounterAdministrationRegion = 0;
-buildAdministrationRegion() {
-  var o = new api.AdministrationRegion();
-  buildCounterAdministrationRegion++;
-  if (buildCounterAdministrationRegion < 3) {
-    o.electionAdministrationBody = buildAdministrativeBody();
-    o.id = "foo";
-    o.localJurisdiction = buildAdministrationRegion();
-    o.name = "foo";
-    o.sources = buildUnnamed65();
-  }
-  buildCounterAdministrationRegion--;
-  return o;
-}
-
-checkAdministrationRegion(api.AdministrationRegion o) {
-  buildCounterAdministrationRegion++;
-  if (buildCounterAdministrationRegion < 3) {
-    checkAdministrativeBody(o.electionAdministrationBody);
-    unittest.expect(o.id, unittest.equals('foo'));
-    checkAdministrationRegion(o.localJurisdiction);
-    unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed65(o.sources);
-  }
-  buildCounterAdministrationRegion--;
-}
-
-buildUnnamed66() {
-  var o = new core.List<api.ElectionOfficial>();
-  o.add(buildElectionOfficial());
-  o.add(buildElectionOfficial());
-  return o;
-}
-
-checkUnnamed66(core.List<api.ElectionOfficial> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkElectionOfficial(o[0]);
-  checkElectionOfficial(o[1]);
-}
-
-buildUnnamed67() {
-  var o = new core.List<core.String>();
-  o.add("foo");
-  o.add("foo");
-  return o;
-}
-
-checkUnnamed67(core.List<core.String> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  unittest.expect(o[0], unittest.equals('foo'));
-  unittest.expect(o[1], unittest.equals('foo'));
-}
-
-core.int buildCounterAdministrativeBody = 0;
-buildAdministrativeBody() {
-  var o = new api.AdministrativeBody();
-  buildCounterAdministrativeBody++;
-  if (buildCounterAdministrativeBody < 3) {
-    o.absenteeVotingInfoUrl = "foo";
-    o.ballotInfoUrl = "foo";
-    o.correspondenceAddress = buildSimpleAddressType();
-    o.electionInfoUrl = "foo";
-    o.electionOfficials = buildUnnamed66();
-    o.electionRegistrationConfirmationUrl = "foo";
-    o.electionRegistrationUrl = "foo";
-    o.electionRulesUrl = "foo";
-    o.hoursOfOperation = "foo";
-    o.name = "foo";
-    o.physicalAddress = buildSimpleAddressType();
-    o.voterServices = buildUnnamed67();
-    o.votingLocationFinderUrl = "foo";
-  }
-  buildCounterAdministrativeBody--;
-  return o;
-}
-
-checkAdministrativeBody(api.AdministrativeBody o) {
-  buildCounterAdministrativeBody++;
-  if (buildCounterAdministrativeBody < 3) {
-    unittest.expect(o.absenteeVotingInfoUrl, unittest.equals('foo'));
-    unittest.expect(o.ballotInfoUrl, unittest.equals('foo'));
-    checkSimpleAddressType(o.correspondenceAddress);
-    unittest.expect(o.electionInfoUrl, unittest.equals('foo'));
-    checkUnnamed66(o.electionOfficials);
-    unittest.expect(o.electionRegistrationConfirmationUrl, unittest.equals('foo'));
-    unittest.expect(o.electionRegistrationUrl, unittest.equals('foo'));
-    unittest.expect(o.electionRulesUrl, unittest.equals('foo'));
-    unittest.expect(o.hoursOfOperation, unittest.equals('foo'));
-    unittest.expect(o.name, unittest.equals('foo'));
-    checkSimpleAddressType(o.physicalAddress);
-    checkUnnamed67(o.voterServices);
-    unittest.expect(o.votingLocationFinderUrl, unittest.equals('foo'));
-  }
-  buildCounterAdministrativeBody--;
-}
-
-buildUnnamed68() {
-  var o = new core.List<api.Channel>();
-  o.add(buildChannel());
-  o.add(buildChannel());
-  return o;
-}
-
-checkUnnamed68(core.List<api.Channel> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkChannel(o[0]);
-  checkChannel(o[1]);
-}
-
-core.int buildCounterCandidate = 0;
-buildCandidate() {
-  var o = new api.Candidate();
-  buildCounterCandidate++;
-  if (buildCounterCandidate < 3) {
-    o.candidateUrl = "foo";
-    o.channels = buildUnnamed68();
-    o.email = "foo";
-    o.name = "foo";
-    o.orderOnBallot = "foo";
-    o.party = "foo";
-    o.phone = "foo";
-    o.photoUrl = "foo";
-  }
-  buildCounterCandidate--;
-  return o;
-}
-
-checkCandidate(api.Candidate o) {
-  buildCounterCandidate++;
-  if (buildCounterCandidate < 3) {
-    unittest.expect(o.candidateUrl, unittest.equals('foo'));
-    checkUnnamed68(o.channels);
-    unittest.expect(o.email, unittest.equals('foo'));
-    unittest.expect(o.name, unittest.equals('foo'));
-    unittest.expect(o.orderOnBallot, unittest.equals('foo'));
-    unittest.expect(o.party, unittest.equals('foo'));
-    unittest.expect(o.phone, unittest.equals('foo'));
-    unittest.expect(o.photoUrl, unittest.equals('foo'));
-  }
-  buildCounterCandidate--;
-}
-
-core.int buildCounterChannel = 0;
-buildChannel() {
-  var o = new api.Channel();
-  buildCounterChannel++;
-  if (buildCounterChannel < 3) {
-    o.id = "foo";
-    o.type = "foo";
-  }
-  buildCounterChannel--;
-  return o;
-}
-
-checkChannel(api.Channel o) {
-  buildCounterChannel++;
-  if (buildCounterChannel < 3) {
-    unittest.expect(o.id, unittest.equals('foo'));
-    unittest.expect(o.type, unittest.equals('foo'));
-  }
-  buildCounterChannel--;
-}
-
-buildUnnamed69() {
-  var o = new core.List<api.Candidate>();
-  o.add(buildCandidate());
-  o.add(buildCandidate());
-  return o;
-}
-
-checkUnnamed69(core.List<api.Candidate> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkCandidate(o[0]);
-  checkCandidate(o[1]);
-}
-
-buildUnnamed70() {
-  var o = new core.List<api.Source>();
-  o.add(buildSource());
-  o.add(buildSource());
-  return o;
-}
-
-checkUnnamed70(core.List<api.Source> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkSource(o[0]);
-  checkSource(o[1]);
-}
-
-core.int buildCounterContest = 0;
-buildContest() {
-  var o = new api.Contest();
-  buildCounterContest++;
-  if (buildCounterContest < 3) {
-    o.ballotPlacement = "foo";
-    o.candidates = buildUnnamed69();
-    o.district = buildElectoralDistrict();
-    o.electorateSpecifications = "foo";
-    o.id = "foo";
-    o.level = "foo";
-    o.numberElected = "foo";
-    o.numberVotingFor = "foo";
-    o.office = "foo";
-    o.primaryParty = "foo";
-    o.referendumSubtitle = "foo";
-    o.referendumTitle = "foo";
-    o.referendumUrl = "foo";
-    o.sources = buildUnnamed70();
-    o.special = "foo";
-    o.type = "foo";
-  }
-  buildCounterContest--;
-  return o;
-}
-
-checkContest(api.Contest o) {
-  buildCounterContest++;
-  if (buildCounterContest < 3) {
-    unittest.expect(o.ballotPlacement, unittest.equals('foo'));
-    checkUnnamed69(o.candidates);
-    checkElectoralDistrict(o.district);
-    unittest.expect(o.electorateSpecifications, unittest.equals('foo'));
-    unittest.expect(o.id, unittest.equals('foo'));
-    unittest.expect(o.level, unittest.equals('foo'));
-    unittest.expect(o.numberElected, unittest.equals('foo'));
-    unittest.expect(o.numberVotingFor, unittest.equals('foo'));
-    unittest.expect(o.office, unittest.equals('foo'));
-    unittest.expect(o.primaryParty, unittest.equals('foo'));
-    unittest.expect(o.referendumSubtitle, unittest.equals('foo'));
-    unittest.expect(o.referendumTitle, unittest.equals('foo'));
-    unittest.expect(o.referendumUrl, unittest.equals('foo'));
-    checkUnnamed70(o.sources);
-    unittest.expect(o.special, unittest.equals('foo'));
-    unittest.expect(o.type, unittest.equals('foo'));
-  }
-  buildCounterContest--;
-}
-
-buildUnnamed71() {
-  var o = new core.List<api.DivisionSearchResult>();
-  o.add(buildDivisionSearchResult());
-  o.add(buildDivisionSearchResult());
-  return o;
-}
-
-checkUnnamed71(core.List<api.DivisionSearchResult> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkDivisionSearchResult(o[0]);
-  checkDivisionSearchResult(o[1]);
-}
-
-core.int buildCounterDivisionSearchResponse = 0;
-buildDivisionSearchResponse() {
-  var o = new api.DivisionSearchResponse();
-  buildCounterDivisionSearchResponse++;
-  if (buildCounterDivisionSearchResponse < 3) {
-    o.kind = "foo";
-    o.results = buildUnnamed71();
-    o.status = "foo";
-  }
-  buildCounterDivisionSearchResponse--;
-  return o;
-}
-
-checkDivisionSearchResponse(api.DivisionSearchResponse o) {
-  buildCounterDivisionSearchResponse++;
-  if (buildCounterDivisionSearchResponse < 3) {
-    unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed71(o.results);
-    unittest.expect(o.status, unittest.equals('foo'));
-  }
-  buildCounterDivisionSearchResponse--;
-}
-
-buildUnnamed72() {
-  var o = new core.List<core.String>();
-  o.add("foo");
-  o.add("foo");
-  return o;
-}
-
-checkUnnamed72(core.List<core.String> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  unittest.expect(o[0], unittest.equals('foo'));
-  unittest.expect(o[1], unittest.equals('foo'));
-}
-
-core.int buildCounterDivisionSearchResult = 0;
-buildDivisionSearchResult() {
-  var o = new api.DivisionSearchResult();
-  buildCounterDivisionSearchResult++;
-  if (buildCounterDivisionSearchResult < 3) {
-    o.aliases = buildUnnamed72();
-    o.name = "foo";
-    o.ocdId = "foo";
-  }
-  buildCounterDivisionSearchResult--;
-  return o;
-}
-
-checkDivisionSearchResult(api.DivisionSearchResult o) {
-  buildCounterDivisionSearchResult++;
-  if (buildCounterDivisionSearchResult < 3) {
-    checkUnnamed72(o.aliases);
-    unittest.expect(o.name, unittest.equals('foo'));
-    unittest.expect(o.ocdId, unittest.equals('foo'));
-  }
-  buildCounterDivisionSearchResult--;
-}
-
-core.int buildCounterElection = 0;
-buildElection() {
-  var o = new api.Election();
-  buildCounterElection++;
-  if (buildCounterElection < 3) {
-    o.electionDay = "foo";
-    o.id = "foo";
-    o.name = "foo";
-  }
-  buildCounterElection--;
-  return o;
-}
-
-checkElection(api.Election o) {
-  buildCounterElection++;
-  if (buildCounterElection < 3) {
-    unittest.expect(o.electionDay, unittest.equals('foo'));
-    unittest.expect(o.id, unittest.equals('foo'));
-    unittest.expect(o.name, unittest.equals('foo'));
-  }
-  buildCounterElection--;
-}
-
-core.int buildCounterElectionOfficial = 0;
-buildElectionOfficial() {
-  var o = new api.ElectionOfficial();
-  buildCounterElectionOfficial++;
-  if (buildCounterElectionOfficial < 3) {
-    o.emailAddress = "foo";
-    o.faxNumber = "foo";
-    o.name = "foo";
-    o.officePhoneNumber = "foo";
-    o.title = "foo";
-  }
-  buildCounterElectionOfficial--;
-  return o;
-}
-
-checkElectionOfficial(api.ElectionOfficial o) {
-  buildCounterElectionOfficial++;
-  if (buildCounterElectionOfficial < 3) {
-    unittest.expect(o.emailAddress, unittest.equals('foo'));
-    unittest.expect(o.faxNumber, unittest.equals('foo'));
-    unittest.expect(o.name, unittest.equals('foo'));
-    unittest.expect(o.officePhoneNumber, unittest.equals('foo'));
-    unittest.expect(o.title, unittest.equals('foo'));
-  }
-  buildCounterElectionOfficial--;
-}
-
-buildUnnamed73() {
-  var o = new core.List<api.Election>();
-  o.add(buildElection());
-  o.add(buildElection());
-  return o;
-}
-
-checkUnnamed73(core.List<api.Election> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkElection(o[0]);
-  checkElection(o[1]);
-}
-
-core.int buildCounterElectionsQueryResponse = 0;
-buildElectionsQueryResponse() {
-  var o = new api.ElectionsQueryResponse();
-  buildCounterElectionsQueryResponse++;
-  if (buildCounterElectionsQueryResponse < 3) {
-    o.elections = buildUnnamed73();
-    o.kind = "foo";
-  }
-  buildCounterElectionsQueryResponse--;
-  return o;
-}
-
-checkElectionsQueryResponse(api.ElectionsQueryResponse o) {
-  buildCounterElectionsQueryResponse++;
-  if (buildCounterElectionsQueryResponse < 3) {
-    checkUnnamed73(o.elections);
-    unittest.expect(o.kind, unittest.equals('foo'));
-  }
-  buildCounterElectionsQueryResponse--;
-}
-
-core.int buildCounterElectoralDistrict = 0;
-buildElectoralDistrict() {
-  var o = new api.ElectoralDistrict();
-  buildCounterElectoralDistrict++;
-  if (buildCounterElectoralDistrict < 3) {
-    o.id = "foo";
-    o.name = "foo";
-    o.scope = "foo";
-  }
-  buildCounterElectoralDistrict--;
-  return o;
-}
-
-checkElectoralDistrict(api.ElectoralDistrict o) {
-  buildCounterElectoralDistrict++;
-  if (buildCounterElectoralDistrict < 3) {
-    unittest.expect(o.id, unittest.equals('foo'));
-    unittest.expect(o.name, unittest.equals('foo'));
-    unittest.expect(o.scope, unittest.equals('foo'));
-  }
-  buildCounterElectoralDistrict--;
-}
-
-buildUnnamed74() {
-  var o = new core.List<core.String>();
-  o.add("foo");
-  o.add("foo");
-  return o;
-}
-
-checkUnnamed74(core.List<core.String> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  unittest.expect(o[0], unittest.equals('foo'));
-  unittest.expect(o[1], unittest.equals('foo'));
-}
-
-buildUnnamed75() {
-  var o = new core.List<core.String>();
-  o.add("foo");
-  o.add("foo");
-  return o;
-}
-
-checkUnnamed75(core.List<core.String> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  unittest.expect(o[0], unittest.equals('foo'));
-  unittest.expect(o[1], unittest.equals('foo'));
-}
-
-core.int buildCounterGeographicDivision = 0;
-buildGeographicDivision() {
-  var o = new api.GeographicDivision();
-  buildCounterGeographicDivision++;
-  if (buildCounterGeographicDivision < 3) {
-    o.alsoKnownAs = buildUnnamed74();
-    o.name = "foo";
-    o.officeIds = buildUnnamed75();
-    o.scope = "foo";
-  }
-  buildCounterGeographicDivision--;
-  return o;
-}
-
-checkGeographicDivision(api.GeographicDivision o) {
-  buildCounterGeographicDivision++;
-  if (buildCounterGeographicDivision < 3) {
-    checkUnnamed74(o.alsoKnownAs);
-    unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed75(o.officeIds);
-    unittest.expect(o.scope, unittest.equals('foo'));
-  }
-  buildCounterGeographicDivision--;
-}
-
-buildUnnamed76() {
-  var o = new core.List<core.String>();
-  o.add("foo");
-  o.add("foo");
-  return o;
-}
-
-checkUnnamed76(core.List<core.String> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  unittest.expect(o[0], unittest.equals('foo'));
-  unittest.expect(o[1], unittest.equals('foo'));
-}
-
-buildUnnamed77() {
-  var o = new core.List<api.Source>();
-  o.add(buildSource());
-  o.add(buildSource());
-  return o;
-}
-
-checkUnnamed77(core.List<api.Source> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkSource(o[0]);
-  checkSource(o[1]);
-}
-
-core.int buildCounterOffice = 0;
-buildOffice() {
-  var o = new api.Office();
-  buildCounterOffice++;
-  if (buildCounterOffice < 3) {
-    o.divisionId = "foo";
-    o.level = "foo";
-    o.name = "foo";
-    o.officialIds = buildUnnamed76();
-    o.sources = buildUnnamed77();
-  }
-  buildCounterOffice--;
-  return o;
-}
-
-checkOffice(api.Office o) {
-  buildCounterOffice++;
-  if (buildCounterOffice < 3) {
-    unittest.expect(o.divisionId, unittest.equals('foo'));
-    unittest.expect(o.level, unittest.equals('foo'));
-    unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed76(o.officialIds);
-    checkUnnamed77(o.sources);
-  }
-  buildCounterOffice--;
-}
-
-buildUnnamed78() {
-  var o = new core.List<api.SimpleAddressType>();
-  o.add(buildSimpleAddressType());
-  o.add(buildSimpleAddressType());
-  return o;
-}
-
-checkUnnamed78(core.List<api.SimpleAddressType> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkSimpleAddressType(o[0]);
-  checkSimpleAddressType(o[1]);
-}
-
-buildUnnamed79() {
-  var o = new core.List<api.Channel>();
-  o.add(buildChannel());
-  o.add(buildChannel());
-  return o;
-}
-
-checkUnnamed79(core.List<api.Channel> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkChannel(o[0]);
-  checkChannel(o[1]);
-}
-
-buildUnnamed80() {
-  var o = new core.List<core.String>();
-  o.add("foo");
-  o.add("foo");
-  return o;
-}
-
-checkUnnamed80(core.List<core.String> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  unittest.expect(o[0], unittest.equals('foo'));
-  unittest.expect(o[1], unittest.equals('foo'));
-}
-
-buildUnnamed81() {
-  var o = new core.List<core.String>();
-  o.add("foo");
-  o.add("foo");
-  return o;
-}
-
-checkUnnamed81(core.List<core.String> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  unittest.expect(o[0], unittest.equals('foo'));
-  unittest.expect(o[1], unittest.equals('foo'));
-}
-
-buildUnnamed82() {
-  var o = new core.List<core.String>();
-  o.add("foo");
-  o.add("foo");
-  return o;
-}
-
-checkUnnamed82(core.List<core.String> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  unittest.expect(o[0], unittest.equals('foo'));
-  unittest.expect(o[1], unittest.equals('foo'));
-}
-
-core.int buildCounterOfficial = 0;
-buildOfficial() {
-  var o = new api.Official();
-  buildCounterOfficial++;
-  if (buildCounterOfficial < 3) {
-    o.address = buildUnnamed78();
-    o.channels = buildUnnamed79();
-    o.emails = buildUnnamed80();
-    o.name = "foo";
-    o.party = "foo";
-    o.phones = buildUnnamed81();
-    o.photoUrl = "foo";
-    o.urls = buildUnnamed82();
-  }
-  buildCounterOfficial--;
-  return o;
-}
-
-checkOfficial(api.Official o) {
-  buildCounterOfficial++;
-  if (buildCounterOfficial < 3) {
-    checkUnnamed78(o.address);
-    checkUnnamed79(o.channels);
-    checkUnnamed80(o.emails);
-    unittest.expect(o.name, unittest.equals('foo'));
-    unittest.expect(o.party, unittest.equals('foo'));
-    checkUnnamed81(o.phones);
-    unittest.expect(o.photoUrl, unittest.equals('foo'));
-    checkUnnamed82(o.urls);
-  }
-  buildCounterOfficial--;
-}
-
-buildUnnamed83() {
-  var o = new core.List<api.Source>();
-  o.add(buildSource());
-  o.add(buildSource());
-  return o;
-}
-
-checkUnnamed83(core.List<api.Source> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkSource(o[0]);
-  checkSource(o[1]);
-}
-
-core.int buildCounterPollingLocation = 0;
-buildPollingLocation() {
-  var o = new api.PollingLocation();
-  buildCounterPollingLocation++;
-  if (buildCounterPollingLocation < 3) {
-    o.address = buildSimpleAddressType();
-    o.endDate = "foo";
-    o.id = "foo";
-    o.name = "foo";
-    o.notes = "foo";
-    o.pollingHours = "foo";
-    o.sources = buildUnnamed83();
-    o.startDate = "foo";
-    o.voterServices = "foo";
-  }
-  buildCounterPollingLocation--;
-  return o;
-}
-
-checkPollingLocation(api.PollingLocation o) {
-  buildCounterPollingLocation++;
-  if (buildCounterPollingLocation < 3) {
-    checkSimpleAddressType(o.address);
-    unittest.expect(o.endDate, unittest.equals('foo'));
-    unittest.expect(o.id, unittest.equals('foo'));
-    unittest.expect(o.name, unittest.equals('foo'));
-    unittest.expect(o.notes, unittest.equals('foo'));
-    unittest.expect(o.pollingHours, unittest.equals('foo'));
-    checkUnnamed83(o.sources);
-    unittest.expect(o.startDate, unittest.equals('foo'));
-    unittest.expect(o.voterServices, unittest.equals('foo'));
-  }
-  buildCounterPollingLocation--;
-}
-
-core.int buildCounterRepresentativeInfoRequest = 0;
-buildRepresentativeInfoRequest() {
-  var o = new api.RepresentativeInfoRequest();
-  buildCounterRepresentativeInfoRequest++;
-  if (buildCounterRepresentativeInfoRequest < 3) {
-    o.address = "foo";
-  }
-  buildCounterRepresentativeInfoRequest--;
-  return o;
-}
-
-checkRepresentativeInfoRequest(api.RepresentativeInfoRequest o) {
-  buildCounterRepresentativeInfoRequest++;
-  if (buildCounterRepresentativeInfoRequest < 3) {
-    unittest.expect(o.address, unittest.equals('foo'));
-  }
-  buildCounterRepresentativeInfoRequest--;
-}
-
-buildUnnamed84() {
-  var o = new core.Map<core.String, api.GeographicDivision>();
-  o["x"] = buildGeographicDivision();
-  o["y"] = buildGeographicDivision();
-  return o;
-}
-
-checkUnnamed84(core.Map<core.String, api.GeographicDivision> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkGeographicDivision(o["x"]);
-  checkGeographicDivision(o["y"]);
-}
-
-buildUnnamed85() {
-  var o = new core.Map<core.String, api.Office>();
-  o["x"] = buildOffice();
-  o["y"] = buildOffice();
-  return o;
-}
-
-checkUnnamed85(core.Map<core.String, api.Office> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkOffice(o["x"]);
-  checkOffice(o["y"]);
-}
-
-buildUnnamed86() {
-  var o = new core.Map<core.String, api.Official>();
-  o["x"] = buildOfficial();
-  o["y"] = buildOfficial();
-  return o;
-}
-
-checkUnnamed86(core.Map<core.String, api.Official> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkOfficial(o["x"]);
-  checkOfficial(o["y"]);
-}
-
-core.int buildCounterRepresentativeInfoResponse = 0;
-buildRepresentativeInfoResponse() {
-  var o = new api.RepresentativeInfoResponse();
-  buildCounterRepresentativeInfoResponse++;
-  if (buildCounterRepresentativeInfoResponse < 3) {
-    o.divisions = buildUnnamed84();
-    o.kind = "foo";
-    o.normalizedInput = buildSimpleAddressType();
-    o.offices = buildUnnamed85();
-    o.officials = buildUnnamed86();
-    o.status = "foo";
-  }
-  buildCounterRepresentativeInfoResponse--;
-  return o;
-}
-
-checkRepresentativeInfoResponse(api.RepresentativeInfoResponse o) {
-  buildCounterRepresentativeInfoResponse++;
-  if (buildCounterRepresentativeInfoResponse < 3) {
-    checkUnnamed84(o.divisions);
-    unittest.expect(o.kind, unittest.equals('foo'));
-    checkSimpleAddressType(o.normalizedInput);
-    checkUnnamed85(o.offices);
-    checkUnnamed86(o.officials);
-    unittest.expect(o.status, unittest.equals('foo'));
-  }
-  buildCounterRepresentativeInfoResponse--;
-}
-
-core.int buildCounterSimpleAddressType = 0;
-buildSimpleAddressType() {
-  var o = new api.SimpleAddressType();
-  buildCounterSimpleAddressType++;
-  if (buildCounterSimpleAddressType < 3) {
-    o.city = "foo";
-    o.line1 = "foo";
-    o.line2 = "foo";
-    o.line3 = "foo";
-    o.locationName = "foo";
-    o.state = "foo";
-    o.zip = "foo";
-  }
-  buildCounterSimpleAddressType--;
-  return o;
-}
-
-checkSimpleAddressType(api.SimpleAddressType o) {
-  buildCounterSimpleAddressType++;
-  if (buildCounterSimpleAddressType < 3) {
-    unittest.expect(o.city, unittest.equals('foo'));
-    unittest.expect(o.line1, unittest.equals('foo'));
-    unittest.expect(o.line2, unittest.equals('foo'));
-    unittest.expect(o.line3, unittest.equals('foo'));
-    unittest.expect(o.locationName, unittest.equals('foo'));
-    unittest.expect(o.state, unittest.equals('foo'));
-    unittest.expect(o.zip, unittest.equals('foo'));
-  }
-  buildCounterSimpleAddressType--;
-}
-
-core.int buildCounterSource = 0;
-buildSource() {
-  var o = new api.Source();
-  buildCounterSource++;
-  if (buildCounterSource < 3) {
-    o.name = "foo";
-    o.official = true;
-  }
-  buildCounterSource--;
-  return o;
-}
-
-checkSource(api.Source o) {
-  buildCounterSource++;
-  if (buildCounterSource < 3) {
-    unittest.expect(o.name, unittest.equals('foo'));
-    unittest.expect(o.official, unittest.isTrue);
-  }
-  buildCounterSource--;
-}
-
-core.int buildCounterVoterInfoRequest = 0;
-buildVoterInfoRequest() {
-  var o = new api.VoterInfoRequest();
-  buildCounterVoterInfoRequest++;
-  if (buildCounterVoterInfoRequest < 3) {
-    o.address = "foo";
-  }
-  buildCounterVoterInfoRequest--;
-  return o;
-}
-
-checkVoterInfoRequest(api.VoterInfoRequest o) {
-  buildCounterVoterInfoRequest++;
-  if (buildCounterVoterInfoRequest < 3) {
-    unittest.expect(o.address, unittest.equals('foo'));
-  }
-  buildCounterVoterInfoRequest--;
-}
-
-buildUnnamed87() {
-  var o = new core.List<api.Contest>();
-  o.add(buildContest());
-  o.add(buildContest());
-  return o;
-}
-
-checkUnnamed87(core.List<api.Contest> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkContest(o[0]);
-  checkContest(o[1]);
-}
-
-buildUnnamed88() {
-  var o = new core.List<api.PollingLocation>();
-  o.add(buildPollingLocation());
-  o.add(buildPollingLocation());
-  return o;
-}
-
-checkUnnamed88(core.List<api.PollingLocation> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkPollingLocation(o[0]);
-  checkPollingLocation(o[1]);
-}
-
-buildUnnamed89() {
-  var o = new core.List<api.PollingLocation>();
-  o.add(buildPollingLocation());
-  o.add(buildPollingLocation());
-  return o;
-}
-
-checkUnnamed89(core.List<api.PollingLocation> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkPollingLocation(o[0]);
-  checkPollingLocation(o[1]);
-}
-
-buildUnnamed90() {
-  var o = new core.List<api.PollingLocation>();
-  o.add(buildPollingLocation());
-  o.add(buildPollingLocation());
-  return o;
-}
-
-checkUnnamed90(core.List<api.PollingLocation> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkPollingLocation(o[0]);
-  checkPollingLocation(o[1]);
-}
-
-buildUnnamed91() {
-  var o = new core.List<api.AdministrationRegion>();
-  o.add(buildAdministrationRegion());
-  o.add(buildAdministrationRegion());
-  return o;
-}
-
-checkUnnamed91(core.List<api.AdministrationRegion> o) {
-  unittest.expect(o, unittest.hasLength(2));
-  checkAdministrationRegion(o[0]);
-  checkAdministrationRegion(o[1]);
-}
-
-core.int buildCounterVoterInfoResponse = 0;
-buildVoterInfoResponse() {
-  var o = new api.VoterInfoResponse();
-  buildCounterVoterInfoResponse++;
-  if (buildCounterVoterInfoResponse < 3) {
-    o.contests = buildUnnamed87();
-    o.dropOffLocations = buildUnnamed88();
-    o.earlyVoteSites = buildUnnamed89();
-    o.election = buildElection();
-    o.kind = "foo";
-    o.normalizedInput = buildSimpleAddressType();
-    o.pollingLocations = buildUnnamed90();
-    o.precinctId = "foo";
-    o.state = buildUnnamed91();
-    o.status = "foo";
-  }
-  buildCounterVoterInfoResponse--;
-  return o;
-}
-
-checkVoterInfoResponse(api.VoterInfoResponse o) {
-  buildCounterVoterInfoResponse++;
-  if (buildCounterVoterInfoResponse < 3) {
-    checkUnnamed87(o.contests);
-    checkUnnamed88(o.dropOffLocations);
-    checkUnnamed89(o.earlyVoteSites);
-    checkElection(o.election);
-    unittest.expect(o.kind, unittest.equals('foo'));
-    checkSimpleAddressType(o.normalizedInput);
-    checkUnnamed90(o.pollingLocations);
-    unittest.expect(o.precinctId, unittest.equals('foo'));
-    checkUnnamed91(o.state);
-    unittest.expect(o.status, unittest.equals('foo'));
-  }
-  buildCounterVoterInfoResponse--;
-}
-
-
-main() {
-  unittest.group("obj-schema-AdministrationRegion", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildAdministrationRegion();
-      var od = new api.AdministrationRegion.fromJson(o.toJson());
-      checkAdministrationRegion(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-AdministrativeBody", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildAdministrativeBody();
-      var od = new api.AdministrativeBody.fromJson(o.toJson());
-      checkAdministrativeBody(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-Candidate", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildCandidate();
-      var od = new api.Candidate.fromJson(o.toJson());
-      checkCandidate(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-Channel", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildChannel();
-      var od = new api.Channel.fromJson(o.toJson());
-      checkChannel(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-Contest", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildContest();
-      var od = new api.Contest.fromJson(o.toJson());
-      checkContest(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-DivisionSearchResponse", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildDivisionSearchResponse();
-      var od = new api.DivisionSearchResponse.fromJson(o.toJson());
-      checkDivisionSearchResponse(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-DivisionSearchResult", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildDivisionSearchResult();
-      var od = new api.DivisionSearchResult.fromJson(o.toJson());
-      checkDivisionSearchResult(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-Election", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildElection();
-      var od = new api.Election.fromJson(o.toJson());
-      checkElection(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-ElectionOfficial", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildElectionOfficial();
-      var od = new api.ElectionOfficial.fromJson(o.toJson());
-      checkElectionOfficial(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-ElectionsQueryResponse", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildElectionsQueryResponse();
-      var od = new api.ElectionsQueryResponse.fromJson(o.toJson());
-      checkElectionsQueryResponse(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-ElectoralDistrict", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildElectoralDistrict();
-      var od = new api.ElectoralDistrict.fromJson(o.toJson());
-      checkElectoralDistrict(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-GeographicDivision", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildGeographicDivision();
-      var od = new api.GeographicDivision.fromJson(o.toJson());
-      checkGeographicDivision(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-Office", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildOffice();
-      var od = new api.Office.fromJson(o.toJson());
-      checkOffice(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-Official", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildOfficial();
-      var od = new api.Official.fromJson(o.toJson());
-      checkOfficial(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-PollingLocation", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildPollingLocation();
-      var od = new api.PollingLocation.fromJson(o.toJson());
-      checkPollingLocation(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-RepresentativeInfoRequest", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildRepresentativeInfoRequest();
-      var od = new api.RepresentativeInfoRequest.fromJson(o.toJson());
-      checkRepresentativeInfoRequest(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-RepresentativeInfoResponse", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildRepresentativeInfoResponse();
-      var od = new api.RepresentativeInfoResponse.fromJson(o.toJson());
-      checkRepresentativeInfoResponse(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-SimpleAddressType", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildSimpleAddressType();
-      var od = new api.SimpleAddressType.fromJson(o.toJson());
-      checkSimpleAddressType(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-Source", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildSource();
-      var od = new api.Source.fromJson(o.toJson());
-      checkSource(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-VoterInfoRequest", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildVoterInfoRequest();
-      var od = new api.VoterInfoRequest.fromJson(o.toJson());
-      checkVoterInfoRequest(od);
-    });
-  });
-
-
-  unittest.group("obj-schema-VoterInfoResponse", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildVoterInfoResponse();
-      var od = new api.VoterInfoResponse.fromJson(o.toJson());
-      checkVoterInfoResponse(od);
-    });
-  });
-
-
-  unittest.group("resource-DivisionsResourceApi", () {
-    unittest.test("method--search", () {
-
-      var mock = new common_test.HttpServerMock();
-      api.DivisionsResourceApi res = new api.CivicinfoApi(mock).divisions;
-      var arg_query = "foo";
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
-        var path = (req.url).path;
-        var pathOffset = 0;
-        var index;
-        var subPart;
-        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
-        pathOffset += 1;
-        unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("civicinfo/v1/"));
-        pathOffset += 13;
-        unittest.expect(path.substring(pathOffset, pathOffset + 31), unittest.equals("representatives/division_search"));
-        pathOffset += 31;
-
-        var query = (req.url).query;
-        var queryOffset = 0;
-        var queryMap = {};
-        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
-        parseBool(n) {
-          if (n == "true") return true;
-          if (n == "false") return false;
-          if (n == null) return null;
-          throw new core.ArgumentError("Invalid boolean: $n");
-        }
-        if (query.length > 0) {
-          for (var part in query.split("&")) {
-            var keyvalue = part.split("=");
-            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
-          }
-        }
-        unittest.expect(queryMap["query"].first, unittest.equals(arg_query));
-
-
-        var h = {
-          "content-type" : "application/json; charset=utf-8",
-        };
-        var resp = convert.JSON.encode(buildDivisionSearchResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
-      }), true);
-      res.search(query: arg_query).then(unittest.expectAsync(((api.DivisionSearchResponse response) {
-        checkDivisionSearchResponse(response);
-      })));
-    });
-
-  });
-
-
-  unittest.group("resource-ElectionsResourceApi", () {
-    unittest.test("method--electionQuery", () {
-
-      var mock = new common_test.HttpServerMock();
-      api.ElectionsResourceApi res = new api.CivicinfoApi(mock).elections;
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
-        var path = (req.url).path;
-        var pathOffset = 0;
-        var index;
-        var subPart;
-        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
-        pathOffset += 1;
-        unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("civicinfo/v1/"));
-        pathOffset += 13;
-        unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("elections"));
-        pathOffset += 9;
-
-        var query = (req.url).query;
-        var queryOffset = 0;
-        var queryMap = {};
-        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
-        parseBool(n) {
-          if (n == "true") return true;
-          if (n == "false") return false;
-          if (n == null) return null;
-          throw new core.ArgumentError("Invalid boolean: $n");
-        }
-        if (query.length > 0) {
-          for (var part in query.split("&")) {
-            var keyvalue = part.split("=");
-            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
-          }
-        }
-
-
-        var h = {
-          "content-type" : "application/json; charset=utf-8",
-        };
-        var resp = convert.JSON.encode(buildElectionsQueryResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
-      }), true);
-      res.electionQuery().then(unittest.expectAsync(((api.ElectionsQueryResponse response) {
-        checkElectionsQueryResponse(response);
-      })));
-    });
-
-    unittest.test("method--voterInfoQuery", () {
-
-      var mock = new common_test.HttpServerMock();
-      api.ElectionsResourceApi res = new api.CivicinfoApi(mock).elections;
-      var arg_request = buildVoterInfoRequest();
-      var arg_electionId = "foo";
-      var arg_officialOnly = true;
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
-        var obj = new api.VoterInfoRequest.fromJson(json);
-        checkVoterInfoRequest(obj);
-
-        var path = (req.url).path;
-        var pathOffset = 0;
-        var index;
-        var subPart;
-        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
-        pathOffset += 1;
-        unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("civicinfo/v1/"));
-        pathOffset += 13;
-        unittest.expect(path.substring(pathOffset, pathOffset + 10), unittest.equals("voterinfo/"));
-        pathOffset += 10;
-        index = path.indexOf("/lookup", pathOffset);
-        unittest.expect(index >= 0, unittest.isTrue);
-        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
-        pathOffset = index;
-        unittest.expect(subPart, unittest.equals("$arg_electionId"));
-        unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("/lookup"));
-        pathOffset += 7;
-
-        var query = (req.url).query;
-        var queryOffset = 0;
-        var queryMap = {};
-        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
-        parseBool(n) {
-          if (n == "true") return true;
-          if (n == "false") return false;
-          if (n == null) return null;
-          throw new core.ArgumentError("Invalid boolean: $n");
-        }
-        if (query.length > 0) {
-          for (var part in query.split("&")) {
-            var keyvalue = part.split("=");
-            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
-          }
-        }
-        unittest.expect(queryMap["officialOnly"].first, unittest.equals("$arg_officialOnly"));
-
-
-        var h = {
-          "content-type" : "application/json; charset=utf-8",
-        };
-        var resp = convert.JSON.encode(buildVoterInfoResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
-      }), true);
-      res.voterInfoQuery(arg_request, arg_electionId, officialOnly: arg_officialOnly).then(unittest.expectAsync(((api.VoterInfoResponse response) {
-        checkVoterInfoResponse(response);
-      })));
-    });
-
-  });
-
-
-  unittest.group("resource-RepresentativesResourceApi", () {
-    unittest.test("method--representativeInfoQuery", () {
-
-      var mock = new common_test.HttpServerMock();
-      api.RepresentativesResourceApi res = new api.CivicinfoApi(mock).representatives;
-      var arg_request = buildRepresentativeInfoRequest();
-      var arg_includeOffices = true;
-      var arg_ocdId = "foo";
-      var arg_recursive = true;
-      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
-        var obj = new api.RepresentativeInfoRequest.fromJson(json);
-        checkRepresentativeInfoRequest(obj);
-
-        var path = (req.url).path;
-        var pathOffset = 0;
-        var index;
-        var subPart;
-        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
-        pathOffset += 1;
-        unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("civicinfo/v1/"));
-        pathOffset += 13;
-        unittest.expect(path.substring(pathOffset, pathOffset + 22), unittest.equals("representatives/lookup"));
-        pathOffset += 22;
-
-        var query = (req.url).query;
-        var queryOffset = 0;
-        var queryMap = {};
-        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
-        parseBool(n) {
-          if (n == "true") return true;
-          if (n == "false") return false;
-          if (n == null) return null;
-          throw new core.ArgumentError("Invalid boolean: $n");
-        }
-        if (query.length > 0) {
-          for (var part in query.split("&")) {
-            var keyvalue = part.split("=");
-            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
-          }
-        }
-        unittest.expect(queryMap["includeOffices"].first, unittest.equals("$arg_includeOffices"));
-        unittest.expect(queryMap["ocdId"].first, unittest.equals(arg_ocdId));
-        unittest.expect(queryMap["recursive"].first, unittest.equals("$arg_recursive"));
-
-
-        var h = {
-          "content-type" : "application/json; charset=utf-8",
-        };
-        var resp = convert.JSON.encode(buildRepresentativeInfoResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
-      }), true);
-      res.representativeInfoQuery(arg_request, includeOffices: arg_includeOffices, ocdId: arg_ocdId, recursive: arg_recursive).then(unittest.expectAsync(((api.RepresentativeInfoResponse response) {
-        checkRepresentativeInfoResponse(response);
-      })));
-    });
-
-  });
-
-
-}
-
diff --git a/generated/googleapis/test/civicinfo/v2_test.dart b/generated/googleapis/test/civicinfo/v2_test.dart
index 9c8c782..ae29aeb 100644
--- a/generated/googleapis/test/civicinfo/v2_test.dart
+++ b/generated/googleapis/test/civicinfo/v2_test.dart
@@ -8,22 +8,57 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/civicinfo/v2.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
 
-buildUnnamed1343() {
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+buildUnnamed397() {
   var o = new core.List<api.Source>();
   o.add(buildSource());
   o.add(buildSource());
   return o;
 }
 
-checkUnnamed1343(core.List<api.Source> o) {
+checkUnnamed397(core.List<api.Source> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSource(o[0]);
   checkSource(o[1]);
@@ -38,7 +73,7 @@
     o.id = "foo";
     o.localJurisdiction = buildAdministrationRegion();
     o.name = "foo";
-    o.sources = buildUnnamed1343();
+    o.sources = buildUnnamed397();
   }
   buildCounterAdministrationRegion--;
   return o;
@@ -51,32 +86,32 @@
     unittest.expect(o.id, unittest.equals('foo'));
     checkAdministrationRegion(o.localJurisdiction);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1343(o.sources);
+    checkUnnamed397(o.sources);
   }
   buildCounterAdministrationRegion--;
 }
 
-buildUnnamed1344() {
+buildUnnamed398() {
   var o = new core.List<api.ElectionOfficial>();
   o.add(buildElectionOfficial());
   o.add(buildElectionOfficial());
   return o;
 }
 
-checkUnnamed1344(core.List<api.ElectionOfficial> o) {
+checkUnnamed398(core.List<api.ElectionOfficial> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkElectionOfficial(o[0]);
   checkElectionOfficial(o[1]);
 }
 
-buildUnnamed1345() {
+buildUnnamed399() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1345(core.List<core.String> o) {
+checkUnnamed399(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -91,14 +126,14 @@
     o.ballotInfoUrl = "foo";
     o.correspondenceAddress = buildSimpleAddressType();
     o.electionInfoUrl = "foo";
-    o.electionOfficials = buildUnnamed1344();
+    o.electionOfficials = buildUnnamed398();
     o.electionRegistrationConfirmationUrl = "foo";
     o.electionRegistrationUrl = "foo";
     o.electionRulesUrl = "foo";
     o.hoursOfOperation = "foo";
     o.name = "foo";
     o.physicalAddress = buildSimpleAddressType();
-    o.voterServices = buildUnnamed1345();
+    o.voterServices = buildUnnamed399();
     o.votingLocationFinderUrl = "foo";
   }
   buildCounterAdministrativeBody--;
@@ -112,27 +147,27 @@
     unittest.expect(o.ballotInfoUrl, unittest.equals('foo'));
     checkSimpleAddressType(o.correspondenceAddress);
     unittest.expect(o.electionInfoUrl, unittest.equals('foo'));
-    checkUnnamed1344(o.electionOfficials);
+    checkUnnamed398(o.electionOfficials);
     unittest.expect(o.electionRegistrationConfirmationUrl, unittest.equals('foo'));
     unittest.expect(o.electionRegistrationUrl, unittest.equals('foo'));
     unittest.expect(o.electionRulesUrl, unittest.equals('foo'));
     unittest.expect(o.hoursOfOperation, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     checkSimpleAddressType(o.physicalAddress);
-    checkUnnamed1345(o.voterServices);
+    checkUnnamed399(o.voterServices);
     unittest.expect(o.votingLocationFinderUrl, unittest.equals('foo'));
   }
   buildCounterAdministrativeBody--;
 }
 
-buildUnnamed1346() {
+buildUnnamed400() {
   var o = new core.List<api.Channel>();
   o.add(buildChannel());
   o.add(buildChannel());
   return o;
 }
 
-checkUnnamed1346(core.List<api.Channel> o) {
+checkUnnamed400(core.List<api.Channel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChannel(o[0]);
   checkChannel(o[1]);
@@ -144,7 +179,7 @@
   buildCounterCandidate++;
   if (buildCounterCandidate < 3) {
     o.candidateUrl = "foo";
-    o.channels = buildUnnamed1346();
+    o.channels = buildUnnamed400();
     o.email = "foo";
     o.name = "foo";
     o.orderOnBallot = "foo";
@@ -160,7 +195,7 @@
   buildCounterCandidate++;
   if (buildCounterCandidate < 3) {
     unittest.expect(o.candidateUrl, unittest.equals('foo'));
-    checkUnnamed1346(o.channels);
+    checkUnnamed400(o.channels);
     unittest.expect(o.email, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.orderOnBallot, unittest.equals('foo'));
@@ -192,53 +227,53 @@
   buildCounterChannel--;
 }
 
-buildUnnamed1347() {
+buildUnnamed401() {
   var o = new core.List<api.Candidate>();
   o.add(buildCandidate());
   o.add(buildCandidate());
   return o;
 }
 
-checkUnnamed1347(core.List<api.Candidate> o) {
+checkUnnamed401(core.List<api.Candidate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCandidate(o[0]);
   checkCandidate(o[1]);
 }
 
-buildUnnamed1348() {
+buildUnnamed402() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1348(core.List<core.String> o) {
+checkUnnamed402(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1349() {
+buildUnnamed403() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1349(core.List<core.String> o) {
+checkUnnamed403(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1350() {
+buildUnnamed404() {
   var o = new core.List<api.Source>();
   o.add(buildSource());
   o.add(buildSource());
   return o;
 }
 
-checkUnnamed1350(core.List<api.Source> o) {
+checkUnnamed404(core.List<api.Source> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSource(o[0]);
   checkSource(o[1]);
@@ -250,11 +285,11 @@
   buildCounterContest++;
   if (buildCounterContest < 3) {
     o.ballotPlacement = "foo";
-    o.candidates = buildUnnamed1347();
+    o.candidates = buildUnnamed401();
     o.district = buildElectoralDistrict();
     o.electorateSpecifications = "foo";
     o.id = "foo";
-    o.level = buildUnnamed1348();
+    o.level = buildUnnamed402();
     o.numberElected = "foo";
     o.numberVotingFor = "foo";
     o.office = "foo";
@@ -262,8 +297,8 @@
     o.referendumSubtitle = "foo";
     o.referendumTitle = "foo";
     o.referendumUrl = "foo";
-    o.roles = buildUnnamed1349();
-    o.sources = buildUnnamed1350();
+    o.roles = buildUnnamed403();
+    o.sources = buildUnnamed404();
     o.special = "foo";
     o.type = "foo";
   }
@@ -275,11 +310,11 @@
   buildCounterContest++;
   if (buildCounterContest < 3) {
     unittest.expect(o.ballotPlacement, unittest.equals('foo'));
-    checkUnnamed1347(o.candidates);
+    checkUnnamed401(o.candidates);
     checkElectoralDistrict(o.district);
     unittest.expect(o.electorateSpecifications, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1348(o.level);
+    checkUnnamed402(o.level);
     unittest.expect(o.numberElected, unittest.equals('foo'));
     unittest.expect(o.numberVotingFor, unittest.equals('foo'));
     unittest.expect(o.office, unittest.equals('foo'));
@@ -287,22 +322,22 @@
     unittest.expect(o.referendumSubtitle, unittest.equals('foo'));
     unittest.expect(o.referendumTitle, unittest.equals('foo'));
     unittest.expect(o.referendumUrl, unittest.equals('foo'));
-    checkUnnamed1349(o.roles);
-    checkUnnamed1350(o.sources);
+    checkUnnamed403(o.roles);
+    checkUnnamed404(o.sources);
     unittest.expect(o.special, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterContest--;
 }
 
-buildUnnamed1351() {
+buildUnnamed405() {
   var o = new core.List<api.DivisionSearchResult>();
   o.add(buildDivisionSearchResult());
   o.add(buildDivisionSearchResult());
   return o;
 }
 
-checkUnnamed1351(core.List<api.DivisionSearchResult> o) {
+checkUnnamed405(core.List<api.DivisionSearchResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDivisionSearchResult(o[0]);
   checkDivisionSearchResult(o[1]);
@@ -314,7 +349,7 @@
   buildCounterDivisionSearchResponse++;
   if (buildCounterDivisionSearchResponse < 3) {
     o.kind = "foo";
-    o.results = buildUnnamed1351();
+    o.results = buildUnnamed405();
   }
   buildCounterDivisionSearchResponse--;
   return o;
@@ -324,19 +359,19 @@
   buildCounterDivisionSearchResponse++;
   if (buildCounterDivisionSearchResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1351(o.results);
+    checkUnnamed405(o.results);
   }
   buildCounterDivisionSearchResponse--;
 }
 
-buildUnnamed1352() {
+buildUnnamed406() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1352(core.List<core.String> o) {
+checkUnnamed406(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -347,7 +382,7 @@
   var o = new api.DivisionSearchResult();
   buildCounterDivisionSearchResult++;
   if (buildCounterDivisionSearchResult < 3) {
-    o.aliases = buildUnnamed1352();
+    o.aliases = buildUnnamed406();
     o.name = "foo";
     o.ocdId = "foo";
   }
@@ -358,7 +393,7 @@
 checkDivisionSearchResult(api.DivisionSearchResult o) {
   buildCounterDivisionSearchResult++;
   if (buildCounterDivisionSearchResult < 3) {
-    checkUnnamed1352(o.aliases);
+    checkUnnamed406(o.aliases);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.ocdId, unittest.equals('foo'));
   }
@@ -415,14 +450,14 @@
   buildCounterElectionOfficial--;
 }
 
-buildUnnamed1353() {
+buildUnnamed407() {
   var o = new core.List<api.Election>();
   o.add(buildElection());
   o.add(buildElection());
   return o;
 }
 
-checkUnnamed1353(core.List<api.Election> o) {
+checkUnnamed407(core.List<api.Election> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkElection(o[0]);
   checkElection(o[1]);
@@ -433,7 +468,7 @@
   var o = new api.ElectionsQueryResponse();
   buildCounterElectionsQueryResponse++;
   if (buildCounterElectionsQueryResponse < 3) {
-    o.elections = buildUnnamed1353();
+    o.elections = buildUnnamed407();
     o.kind = "foo";
   }
   buildCounterElectionsQueryResponse--;
@@ -443,7 +478,7 @@
 checkElectionsQueryResponse(api.ElectionsQueryResponse o) {
   buildCounterElectionsQueryResponse++;
   if (buildCounterElectionsQueryResponse < 3) {
-    checkUnnamed1353(o.elections);
+    checkUnnamed407(o.elections);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterElectionsQueryResponse--;
@@ -472,27 +507,27 @@
   buildCounterElectoralDistrict--;
 }
 
-buildUnnamed1354() {
+buildUnnamed408() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1354(core.List<core.String> o) {
+checkUnnamed408(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1355() {
+buildUnnamed409() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed1355(core.List<core.int> o) {
+checkUnnamed409(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
@@ -503,9 +538,9 @@
   var o = new api.GeographicDivision();
   buildCounterGeographicDivision++;
   if (buildCounterGeographicDivision < 3) {
-    o.alsoKnownAs = buildUnnamed1354();
+    o.alsoKnownAs = buildUnnamed408();
     o.name = "foo";
-    o.officeIndices = buildUnnamed1355();
+    o.officeIndices = buildUnnamed409();
   }
   buildCounterGeographicDivision--;
   return o;
@@ -514,60 +549,60 @@
 checkGeographicDivision(api.GeographicDivision o) {
   buildCounterGeographicDivision++;
   if (buildCounterGeographicDivision < 3) {
-    checkUnnamed1354(o.alsoKnownAs);
+    checkUnnamed408(o.alsoKnownAs);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1355(o.officeIndices);
+    checkUnnamed409(o.officeIndices);
   }
   buildCounterGeographicDivision--;
 }
 
-buildUnnamed1356() {
+buildUnnamed410() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1356(core.List<core.String> o) {
+checkUnnamed410(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1357() {
+buildUnnamed411() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed1357(core.List<core.int> o) {
+checkUnnamed411(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
-buildUnnamed1358() {
+buildUnnamed412() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1358(core.List<core.String> o) {
+checkUnnamed412(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1359() {
+buildUnnamed413() {
   var o = new core.List<api.Source>();
   o.add(buildSource());
   o.add(buildSource());
   return o;
 }
 
-checkUnnamed1359(core.List<api.Source> o) {
+checkUnnamed413(core.List<api.Source> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSource(o[0]);
   checkSource(o[1]);
@@ -579,11 +614,11 @@
   buildCounterOffice++;
   if (buildCounterOffice < 3) {
     o.divisionId = "foo";
-    o.levels = buildUnnamed1356();
+    o.levels = buildUnnamed410();
     o.name = "foo";
-    o.officialIndices = buildUnnamed1357();
-    o.roles = buildUnnamed1358();
-    o.sources = buildUnnamed1359();
+    o.officialIndices = buildUnnamed411();
+    o.roles = buildUnnamed412();
+    o.sources = buildUnnamed413();
   }
   buildCounterOffice--;
   return o;
@@ -593,75 +628,75 @@
   buildCounterOffice++;
   if (buildCounterOffice < 3) {
     unittest.expect(o.divisionId, unittest.equals('foo'));
-    checkUnnamed1356(o.levels);
+    checkUnnamed410(o.levels);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1357(o.officialIndices);
-    checkUnnamed1358(o.roles);
-    checkUnnamed1359(o.sources);
+    checkUnnamed411(o.officialIndices);
+    checkUnnamed412(o.roles);
+    checkUnnamed413(o.sources);
   }
   buildCounterOffice--;
 }
 
-buildUnnamed1360() {
+buildUnnamed414() {
   var o = new core.List<api.SimpleAddressType>();
   o.add(buildSimpleAddressType());
   o.add(buildSimpleAddressType());
   return o;
 }
 
-checkUnnamed1360(core.List<api.SimpleAddressType> o) {
+checkUnnamed414(core.List<api.SimpleAddressType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSimpleAddressType(o[0]);
   checkSimpleAddressType(o[1]);
 }
 
-buildUnnamed1361() {
+buildUnnamed415() {
   var o = new core.List<api.Channel>();
   o.add(buildChannel());
   o.add(buildChannel());
   return o;
 }
 
-checkUnnamed1361(core.List<api.Channel> o) {
+checkUnnamed415(core.List<api.Channel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChannel(o[0]);
   checkChannel(o[1]);
 }
 
-buildUnnamed1362() {
+buildUnnamed416() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1362(core.List<core.String> o) {
+checkUnnamed416(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1363() {
+buildUnnamed417() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1363(core.List<core.String> o) {
+checkUnnamed417(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1364() {
+buildUnnamed418() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1364(core.List<core.String> o) {
+checkUnnamed418(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -672,14 +707,14 @@
   var o = new api.Official();
   buildCounterOfficial++;
   if (buildCounterOfficial < 3) {
-    o.address = buildUnnamed1360();
-    o.channels = buildUnnamed1361();
-    o.emails = buildUnnamed1362();
+    o.address = buildUnnamed414();
+    o.channels = buildUnnamed415();
+    o.emails = buildUnnamed416();
     o.name = "foo";
     o.party = "foo";
-    o.phones = buildUnnamed1363();
+    o.phones = buildUnnamed417();
     o.photoUrl = "foo";
-    o.urls = buildUnnamed1364();
+    o.urls = buildUnnamed418();
   }
   buildCounterOfficial--;
   return o;
@@ -688,26 +723,26 @@
 checkOfficial(api.Official o) {
   buildCounterOfficial++;
   if (buildCounterOfficial < 3) {
-    checkUnnamed1360(o.address);
-    checkUnnamed1361(o.channels);
-    checkUnnamed1362(o.emails);
+    checkUnnamed414(o.address);
+    checkUnnamed415(o.channels);
+    checkUnnamed416(o.emails);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.party, unittest.equals('foo'));
-    checkUnnamed1363(o.phones);
+    checkUnnamed417(o.phones);
     unittest.expect(o.photoUrl, unittest.equals('foo'));
-    checkUnnamed1364(o.urls);
+    checkUnnamed418(o.urls);
   }
   buildCounterOfficial--;
 }
 
-buildUnnamed1365() {
+buildUnnamed419() {
   var o = new core.List<api.Source>();
   o.add(buildSource());
   o.add(buildSource());
   return o;
 }
 
-checkUnnamed1365(core.List<api.Source> o) {
+checkUnnamed419(core.List<api.Source> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSource(o[0]);
   checkSource(o[1]);
@@ -724,7 +759,7 @@
     o.name = "foo";
     o.notes = "foo";
     o.pollingHours = "foo";
-    o.sources = buildUnnamed1365();
+    o.sources = buildUnnamed419();
     o.startDate = "foo";
     o.voterServices = "foo";
   }
@@ -741,47 +776,47 @@
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.notes, unittest.equals('foo'));
     unittest.expect(o.pollingHours, unittest.equals('foo'));
-    checkUnnamed1365(o.sources);
+    checkUnnamed419(o.sources);
     unittest.expect(o.startDate, unittest.equals('foo'));
     unittest.expect(o.voterServices, unittest.equals('foo'));
   }
   buildCounterPollingLocation--;
 }
 
-buildUnnamed1366() {
+buildUnnamed420() {
   var o = new core.Map<core.String, api.GeographicDivision>();
   o["x"] = buildGeographicDivision();
   o["y"] = buildGeographicDivision();
   return o;
 }
 
-checkUnnamed1366(core.Map<core.String, api.GeographicDivision> o) {
+checkUnnamed420(core.Map<core.String, api.GeographicDivision> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGeographicDivision(o["x"]);
   checkGeographicDivision(o["y"]);
 }
 
-buildUnnamed1367() {
+buildUnnamed421() {
   var o = new core.List<api.Office>();
   o.add(buildOffice());
   o.add(buildOffice());
   return o;
 }
 
-checkUnnamed1367(core.List<api.Office> o) {
+checkUnnamed421(core.List<api.Office> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOffice(o[0]);
   checkOffice(o[1]);
 }
 
-buildUnnamed1368() {
+buildUnnamed422() {
   var o = new core.List<api.Official>();
   o.add(buildOfficial());
   o.add(buildOfficial());
   return o;
 }
 
-checkUnnamed1368(core.List<api.Official> o) {
+checkUnnamed422(core.List<api.Official> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOfficial(o[0]);
   checkOfficial(o[1]);
@@ -792,9 +827,9 @@
   var o = new api.RepresentativeInfoData();
   buildCounterRepresentativeInfoData++;
   if (buildCounterRepresentativeInfoData < 3) {
-    o.divisions = buildUnnamed1366();
-    o.offices = buildUnnamed1367();
-    o.officials = buildUnnamed1368();
+    o.divisions = buildUnnamed420();
+    o.offices = buildUnnamed421();
+    o.officials = buildUnnamed422();
   }
   buildCounterRepresentativeInfoData--;
   return o;
@@ -803,47 +838,47 @@
 checkRepresentativeInfoData(api.RepresentativeInfoData o) {
   buildCounterRepresentativeInfoData++;
   if (buildCounterRepresentativeInfoData < 3) {
-    checkUnnamed1366(o.divisions);
-    checkUnnamed1367(o.offices);
-    checkUnnamed1368(o.officials);
+    checkUnnamed420(o.divisions);
+    checkUnnamed421(o.offices);
+    checkUnnamed422(o.officials);
   }
   buildCounterRepresentativeInfoData--;
 }
 
-buildUnnamed1369() {
+buildUnnamed423() {
   var o = new core.Map<core.String, api.GeographicDivision>();
   o["x"] = buildGeographicDivision();
   o["y"] = buildGeographicDivision();
   return o;
 }
 
-checkUnnamed1369(core.Map<core.String, api.GeographicDivision> o) {
+checkUnnamed423(core.Map<core.String, api.GeographicDivision> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGeographicDivision(o["x"]);
   checkGeographicDivision(o["y"]);
 }
 
-buildUnnamed1370() {
+buildUnnamed424() {
   var o = new core.List<api.Office>();
   o.add(buildOffice());
   o.add(buildOffice());
   return o;
 }
 
-checkUnnamed1370(core.List<api.Office> o) {
+checkUnnamed424(core.List<api.Office> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOffice(o[0]);
   checkOffice(o[1]);
 }
 
-buildUnnamed1371() {
+buildUnnamed425() {
   var o = new core.List<api.Official>();
   o.add(buildOfficial());
   o.add(buildOfficial());
   return o;
 }
 
-checkUnnamed1371(core.List<api.Official> o) {
+checkUnnamed425(core.List<api.Official> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOfficial(o[0]);
   checkOfficial(o[1]);
@@ -854,11 +889,11 @@
   var o = new api.RepresentativeInfoResponse();
   buildCounterRepresentativeInfoResponse++;
   if (buildCounterRepresentativeInfoResponse < 3) {
-    o.divisions = buildUnnamed1369();
+    o.divisions = buildUnnamed423();
     o.kind = "foo";
     o.normalizedInput = buildSimpleAddressType();
-    o.offices = buildUnnamed1370();
-    o.officials = buildUnnamed1371();
+    o.offices = buildUnnamed424();
+    o.officials = buildUnnamed425();
   }
   buildCounterRepresentativeInfoResponse--;
   return o;
@@ -867,11 +902,11 @@
 checkRepresentativeInfoResponse(api.RepresentativeInfoResponse o) {
   buildCounterRepresentativeInfoResponse++;
   if (buildCounterRepresentativeInfoResponse < 3) {
-    checkUnnamed1369(o.divisions);
+    checkUnnamed423(o.divisions);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkSimpleAddressType(o.normalizedInput);
-    checkUnnamed1370(o.offices);
-    checkUnnamed1371(o.officials);
+    checkUnnamed424(o.offices);
+    checkUnnamed425(o.officials);
   }
   buildCounterRepresentativeInfoResponse--;
 }
@@ -928,79 +963,79 @@
   buildCounterSource--;
 }
 
-buildUnnamed1372() {
+buildUnnamed426() {
   var o = new core.List<api.Contest>();
   o.add(buildContest());
   o.add(buildContest());
   return o;
 }
 
-checkUnnamed1372(core.List<api.Contest> o) {
+checkUnnamed426(core.List<api.Contest> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContest(o[0]);
   checkContest(o[1]);
 }
 
-buildUnnamed1373() {
+buildUnnamed427() {
   var o = new core.List<api.PollingLocation>();
   o.add(buildPollingLocation());
   o.add(buildPollingLocation());
   return o;
 }
 
-checkUnnamed1373(core.List<api.PollingLocation> o) {
+checkUnnamed427(core.List<api.PollingLocation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPollingLocation(o[0]);
   checkPollingLocation(o[1]);
 }
 
-buildUnnamed1374() {
+buildUnnamed428() {
   var o = new core.List<api.PollingLocation>();
   o.add(buildPollingLocation());
   o.add(buildPollingLocation());
   return o;
 }
 
-checkUnnamed1374(core.List<api.PollingLocation> o) {
+checkUnnamed428(core.List<api.PollingLocation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPollingLocation(o[0]);
   checkPollingLocation(o[1]);
 }
 
-buildUnnamed1375() {
+buildUnnamed429() {
   var o = new core.List<api.Election>();
   o.add(buildElection());
   o.add(buildElection());
   return o;
 }
 
-checkUnnamed1375(core.List<api.Election> o) {
+checkUnnamed429(core.List<api.Election> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkElection(o[0]);
   checkElection(o[1]);
 }
 
-buildUnnamed1376() {
+buildUnnamed430() {
   var o = new core.List<api.PollingLocation>();
   o.add(buildPollingLocation());
   o.add(buildPollingLocation());
   return o;
 }
 
-checkUnnamed1376(core.List<api.PollingLocation> o) {
+checkUnnamed430(core.List<api.PollingLocation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPollingLocation(o[0]);
   checkPollingLocation(o[1]);
 }
 
-buildUnnamed1377() {
+buildUnnamed431() {
   var o = new core.List<api.AdministrationRegion>();
   o.add(buildAdministrationRegion());
   o.add(buildAdministrationRegion());
   return o;
 }
 
-checkUnnamed1377(core.List<api.AdministrationRegion> o) {
+checkUnnamed431(core.List<api.AdministrationRegion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdministrationRegion(o[0]);
   checkAdministrationRegion(o[1]);
@@ -1011,16 +1046,16 @@
   var o = new api.VoterInfoResponse();
   buildCounterVoterInfoResponse++;
   if (buildCounterVoterInfoResponse < 3) {
-    o.contests = buildUnnamed1372();
-    o.dropOffLocations = buildUnnamed1373();
-    o.earlyVoteSites = buildUnnamed1374();
+    o.contests = buildUnnamed426();
+    o.dropOffLocations = buildUnnamed427();
+    o.earlyVoteSites = buildUnnamed428();
     o.election = buildElection();
     o.kind = "foo";
     o.normalizedInput = buildSimpleAddressType();
-    o.otherElections = buildUnnamed1375();
-    o.pollingLocations = buildUnnamed1376();
+    o.otherElections = buildUnnamed429();
+    o.pollingLocations = buildUnnamed430();
     o.precinctId = "foo";
-    o.state = buildUnnamed1377();
+    o.state = buildUnnamed431();
   }
   buildCounterVoterInfoResponse--;
   return o;
@@ -1029,67 +1064,67 @@
 checkVoterInfoResponse(api.VoterInfoResponse o) {
   buildCounterVoterInfoResponse++;
   if (buildCounterVoterInfoResponse < 3) {
-    checkUnnamed1372(o.contests);
-    checkUnnamed1373(o.dropOffLocations);
-    checkUnnamed1374(o.earlyVoteSites);
+    checkUnnamed426(o.contests);
+    checkUnnamed427(o.dropOffLocations);
+    checkUnnamed428(o.earlyVoteSites);
     checkElection(o.election);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkSimpleAddressType(o.normalizedInput);
-    checkUnnamed1375(o.otherElections);
-    checkUnnamed1376(o.pollingLocations);
+    checkUnnamed429(o.otherElections);
+    checkUnnamed430(o.pollingLocations);
     unittest.expect(o.precinctId, unittest.equals('foo'));
-    checkUnnamed1377(o.state);
+    checkUnnamed431(o.state);
   }
   buildCounterVoterInfoResponse--;
 }
 
-buildUnnamed1378() {
+buildUnnamed432() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1378(core.List<core.String> o) {
+checkUnnamed432(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1379() {
+buildUnnamed433() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1379(core.List<core.String> o) {
+checkUnnamed433(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1380() {
+buildUnnamed434() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1380(core.List<core.String> o) {
+checkUnnamed434(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1381() {
+buildUnnamed435() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1381(core.List<core.String> o) {
+checkUnnamed435(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1280,7 +1315,7 @@
   unittest.group("resource-DivisionsResourceApi", () {
     unittest.test("method--search", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DivisionsResourceApi res = new api.CivicinfoApi(mock).divisions;
       var arg_query = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1318,7 +1353,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDivisionSearchResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.search(query: arg_query).then(unittest.expectAsync(((api.DivisionSearchResponse response) {
         checkDivisionSearchResponse(response);
@@ -1331,7 +1366,7 @@
   unittest.group("resource-ElectionsResourceApi", () {
     unittest.test("method--electionQuery", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ElectionsResourceApi res = new api.CivicinfoApi(mock).elections;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1367,7 +1402,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildElectionsQueryResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.electionQuery().then(unittest.expectAsync(((api.ElectionsQueryResponse response) {
         checkElectionsQueryResponse(response);
@@ -1376,7 +1411,7 @@
 
     unittest.test("method--voterInfoQuery", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ElectionsResourceApi res = new api.CivicinfoApi(mock).elections;
       var arg_address = "foo";
       var arg_electionId = "foo";
@@ -1418,7 +1453,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildVoterInfoResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.voterInfoQuery(arg_address, electionId: arg_electionId, officialOnly: arg_officialOnly).then(unittest.expectAsync(((api.VoterInfoResponse response) {
         checkVoterInfoResponse(response);
@@ -1431,12 +1466,12 @@
   unittest.group("resource-RepresentativesResourceApi", () {
     unittest.test("method--representativeInfoByAddress", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RepresentativesResourceApi res = new api.CivicinfoApi(mock).representatives;
       var arg_address = "foo";
       var arg_includeOffices = true;
-      var arg_levels = buildUnnamed1378();
-      var arg_roles = buildUnnamed1379();
+      var arg_levels = buildUnnamed432();
+      var arg_roles = buildUnnamed433();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -1475,7 +1510,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRepresentativeInfoResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.representativeInfoByAddress(address: arg_address, includeOffices: arg_includeOffices, levels: arg_levels, roles: arg_roles).then(unittest.expectAsync(((api.RepresentativeInfoResponse response) {
         checkRepresentativeInfoResponse(response);
@@ -1484,12 +1519,12 @@
 
     unittest.test("method--representativeInfoByDivision", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RepresentativesResourceApi res = new api.CivicinfoApi(mock).representatives;
       var arg_ocdId = "foo";
-      var arg_levels = buildUnnamed1380();
+      var arg_levels = buildUnnamed434();
       var arg_recursive = true;
-      var arg_roles = buildUnnamed1381();
+      var arg_roles = buildUnnamed435();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -1530,7 +1565,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRepresentativeInfoData());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.representativeInfoByDivision(arg_ocdId, levels: arg_levels, recursive: arg_recursive, roles: arg_roles).then(unittest.expectAsync(((api.RepresentativeInfoData response) {
         checkRepresentativeInfoData(response);
diff --git a/generated/googleapis/test/cloudsearch/v1_test.dart b/generated/googleapis/test/cloudsearch/v1_test.dart
new file mode 100644
index 0000000..d124ae5
--- /dev/null
+++ b/generated/googleapis/test/cloudsearch/v1_test.dart
@@ -0,0 +1,955 @@
+library googleapis.cloudsearch.v1.test;
+
+import "dart:core" as core;
+import "dart:collection" as collection;
+import "dart:async" as async;
+import "dart:convert" as convert;
+
+import 'package:http/http.dart' as http;
+import 'package:http/testing.dart' as http_testing;
+import 'package:unittest/unittest.dart' as unittest;
+
+import 'package:googleapis/cloudsearch/v1.dart' as api;
+
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
+
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+buildUnnamed436() {
+  var o = new core.Map<core.String, api.FieldValueList>();
+  o["x"] = buildFieldValueList();
+  o["y"] = buildFieldValueList();
+  return o;
+}
+
+checkUnnamed436(core.Map<core.String, api.FieldValueList> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkFieldValueList(o["x"]);
+  checkFieldValueList(o["y"]);
+}
+
+core.int buildCounterDocument = 0;
+buildDocument() {
+  var o = new api.Document();
+  buildCounterDocument++;
+  if (buildCounterDocument < 3) {
+    o.docId = "foo";
+    o.fields = buildUnnamed436();
+    o.rank = 42;
+  }
+  buildCounterDocument--;
+  return o;
+}
+
+checkDocument(api.Document o) {
+  buildCounterDocument++;
+  if (buildCounterDocument < 3) {
+    unittest.expect(o.docId, unittest.equals('foo'));
+    checkUnnamed436(o.fields);
+    unittest.expect(o.rank, unittest.equals(42));
+  }
+  buildCounterDocument--;
+}
+
+core.int buildCounterEmpty = 0;
+buildEmpty() {
+  var o = new api.Empty();
+  buildCounterEmpty++;
+  if (buildCounterEmpty < 3) {
+  }
+  buildCounterEmpty--;
+  return o;
+}
+
+checkEmpty(api.Empty o) {
+  buildCounterEmpty++;
+  if (buildCounterEmpty < 3) {
+  }
+  buildCounterEmpty--;
+}
+
+buildUnnamed437() {
+  var o = new core.List<core.String>();
+  o.add("foo");
+  o.add("foo");
+  return o;
+}
+
+checkUnnamed437(core.List<core.String> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  unittest.expect(o[0], unittest.equals('foo'));
+  unittest.expect(o[1], unittest.equals('foo'));
+}
+
+buildUnnamed438() {
+  var o = new core.List<core.String>();
+  o.add("foo");
+  o.add("foo");
+  return o;
+}
+
+checkUnnamed438(core.List<core.String> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  unittest.expect(o[0], unittest.equals('foo'));
+  unittest.expect(o[1], unittest.equals('foo'));
+}
+
+buildUnnamed439() {
+  var o = new core.List<core.String>();
+  o.add("foo");
+  o.add("foo");
+  return o;
+}
+
+checkUnnamed439(core.List<core.String> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  unittest.expect(o[0], unittest.equals('foo'));
+  unittest.expect(o[1], unittest.equals('foo'));
+}
+
+buildUnnamed440() {
+  var o = new core.List<core.String>();
+  o.add("foo");
+  o.add("foo");
+  return o;
+}
+
+checkUnnamed440(core.List<core.String> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  unittest.expect(o[0], unittest.equals('foo'));
+  unittest.expect(o[1], unittest.equals('foo'));
+}
+
+buildUnnamed441() {
+  var o = new core.List<core.String>();
+  o.add("foo");
+  o.add("foo");
+  return o;
+}
+
+checkUnnamed441(core.List<core.String> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  unittest.expect(o[0], unittest.equals('foo'));
+  unittest.expect(o[1], unittest.equals('foo'));
+}
+
+buildUnnamed442() {
+  var o = new core.List<core.String>();
+  o.add("foo");
+  o.add("foo");
+  return o;
+}
+
+checkUnnamed442(core.List<core.String> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  unittest.expect(o[0], unittest.equals('foo'));
+  unittest.expect(o[1], unittest.equals('foo'));
+}
+
+core.int buildCounterFieldNames = 0;
+buildFieldNames() {
+  var o = new api.FieldNames();
+  buildCounterFieldNames++;
+  if (buildCounterFieldNames < 3) {
+    o.atomFields = buildUnnamed437();
+    o.dateFields = buildUnnamed438();
+    o.geoFields = buildUnnamed439();
+    o.htmlFields = buildUnnamed440();
+    o.numberFields = buildUnnamed441();
+    o.textFields = buildUnnamed442();
+  }
+  buildCounterFieldNames--;
+  return o;
+}
+
+checkFieldNames(api.FieldNames o) {
+  buildCounterFieldNames++;
+  if (buildCounterFieldNames < 3) {
+    checkUnnamed437(o.atomFields);
+    checkUnnamed438(o.dateFields);
+    checkUnnamed439(o.geoFields);
+    checkUnnamed440(o.htmlFields);
+    checkUnnamed441(o.numberFields);
+    checkUnnamed442(o.textFields);
+  }
+  buildCounterFieldNames--;
+}
+
+core.int buildCounterFieldValue = 0;
+buildFieldValue() {
+  var o = new api.FieldValue();
+  buildCounterFieldValue++;
+  if (buildCounterFieldValue < 3) {
+    o.geoValue = "foo";
+    o.lang = "foo";
+    o.numberValue = 42.0;
+    o.stringFormat = "foo";
+    o.stringValue = "foo";
+    o.timestampValue = "foo";
+  }
+  buildCounterFieldValue--;
+  return o;
+}
+
+checkFieldValue(api.FieldValue o) {
+  buildCounterFieldValue++;
+  if (buildCounterFieldValue < 3) {
+    unittest.expect(o.geoValue, unittest.equals('foo'));
+    unittest.expect(o.lang, unittest.equals('foo'));
+    unittest.expect(o.numberValue, unittest.equals(42.0));
+    unittest.expect(o.stringFormat, unittest.equals('foo'));
+    unittest.expect(o.stringValue, unittest.equals('foo'));
+    unittest.expect(o.timestampValue, unittest.equals('foo'));
+  }
+  buildCounterFieldValue--;
+}
+
+buildUnnamed443() {
+  var o = new core.List<api.FieldValue>();
+  o.add(buildFieldValue());
+  o.add(buildFieldValue());
+  return o;
+}
+
+checkUnnamed443(core.List<api.FieldValue> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkFieldValue(o[0]);
+  checkFieldValue(o[1]);
+}
+
+core.int buildCounterFieldValueList = 0;
+buildFieldValueList() {
+  var o = new api.FieldValueList();
+  buildCounterFieldValueList++;
+  if (buildCounterFieldValueList < 3) {
+    o.values = buildUnnamed443();
+  }
+  buildCounterFieldValueList--;
+  return o;
+}
+
+checkFieldValueList(api.FieldValueList o) {
+  buildCounterFieldValueList++;
+  if (buildCounterFieldValueList < 3) {
+    checkUnnamed443(o.values);
+  }
+  buildCounterFieldValueList--;
+}
+
+core.int buildCounterIndexInfo = 0;
+buildIndexInfo() {
+  var o = new api.IndexInfo();
+  buildCounterIndexInfo++;
+  if (buildCounterIndexInfo < 3) {
+    o.indexId = "foo";
+    o.indexedField = buildFieldNames();
+    o.projectId = "foo";
+  }
+  buildCounterIndexInfo--;
+  return o;
+}
+
+checkIndexInfo(api.IndexInfo o) {
+  buildCounterIndexInfo++;
+  if (buildCounterIndexInfo < 3) {
+    unittest.expect(o.indexId, unittest.equals('foo'));
+    checkFieldNames(o.indexedField);
+    unittest.expect(o.projectId, unittest.equals('foo'));
+  }
+  buildCounterIndexInfo--;
+}
+
+buildUnnamed444() {
+  var o = new core.List<api.Document>();
+  o.add(buildDocument());
+  o.add(buildDocument());
+  return o;
+}
+
+checkUnnamed444(core.List<api.Document> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkDocument(o[0]);
+  checkDocument(o[1]);
+}
+
+core.int buildCounterListDocumentsResponse = 0;
+buildListDocumentsResponse() {
+  var o = new api.ListDocumentsResponse();
+  buildCounterListDocumentsResponse++;
+  if (buildCounterListDocumentsResponse < 3) {
+    o.documents = buildUnnamed444();
+    o.nextPageToken = "foo";
+  }
+  buildCounterListDocumentsResponse--;
+  return o;
+}
+
+checkListDocumentsResponse(api.ListDocumentsResponse o) {
+  buildCounterListDocumentsResponse++;
+  if (buildCounterListDocumentsResponse < 3) {
+    checkUnnamed444(o.documents);
+    unittest.expect(o.nextPageToken, unittest.equals('foo'));
+  }
+  buildCounterListDocumentsResponse--;
+}
+
+buildUnnamed445() {
+  var o = new core.List<api.IndexInfo>();
+  o.add(buildIndexInfo());
+  o.add(buildIndexInfo());
+  return o;
+}
+
+checkUnnamed445(core.List<api.IndexInfo> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkIndexInfo(o[0]);
+  checkIndexInfo(o[1]);
+}
+
+core.int buildCounterListIndexesResponse = 0;
+buildListIndexesResponse() {
+  var o = new api.ListIndexesResponse();
+  buildCounterListIndexesResponse++;
+  if (buildCounterListIndexesResponse < 3) {
+    o.indexes = buildUnnamed445();
+    o.nextPageToken = "foo";
+  }
+  buildCounterListIndexesResponse--;
+  return o;
+}
+
+checkListIndexesResponse(api.ListIndexesResponse o) {
+  buildCounterListIndexesResponse++;
+  if (buildCounterListIndexesResponse < 3) {
+    checkUnnamed445(o.indexes);
+    unittest.expect(o.nextPageToken, unittest.equals('foo'));
+  }
+  buildCounterListIndexesResponse--;
+}
+
+buildUnnamed446() {
+  var o = new core.List<api.SearchResult>();
+  o.add(buildSearchResult());
+  o.add(buildSearchResult());
+  return o;
+}
+
+checkUnnamed446(core.List<api.SearchResult> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkSearchResult(o[0]);
+  checkSearchResult(o[1]);
+}
+
+core.int buildCounterSearchResponse = 0;
+buildSearchResponse() {
+  var o = new api.SearchResponse();
+  buildCounterSearchResponse++;
+  if (buildCounterSearchResponse < 3) {
+    o.matchedCount = "foo";
+    o.results = buildUnnamed446();
+  }
+  buildCounterSearchResponse--;
+  return o;
+}
+
+checkSearchResponse(api.SearchResponse o) {
+  buildCounterSearchResponse++;
+  if (buildCounterSearchResponse < 3) {
+    unittest.expect(o.matchedCount, unittest.equals('foo'));
+    checkUnnamed446(o.results);
+  }
+  buildCounterSearchResponse--;
+}
+
+buildUnnamed447() {
+  var o = new core.Map<core.String, api.FieldValueList>();
+  o["x"] = buildFieldValueList();
+  o["y"] = buildFieldValueList();
+  return o;
+}
+
+checkUnnamed447(core.Map<core.String, api.FieldValueList> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkFieldValueList(o["x"]);
+  checkFieldValueList(o["y"]);
+}
+
+core.int buildCounterSearchResult = 0;
+buildSearchResult() {
+  var o = new api.SearchResult();
+  buildCounterSearchResult++;
+  if (buildCounterSearchResult < 3) {
+    o.docId = "foo";
+    o.fields = buildUnnamed447();
+    o.nextPageToken = "foo";
+  }
+  buildCounterSearchResult--;
+  return o;
+}
+
+checkSearchResult(api.SearchResult o) {
+  buildCounterSearchResult++;
+  if (buildCounterSearchResult < 3) {
+    unittest.expect(o.docId, unittest.equals('foo'));
+    checkUnnamed447(o.fields);
+    unittest.expect(o.nextPageToken, unittest.equals('foo'));
+  }
+  buildCounterSearchResult--;
+}
+
+buildUnnamed448() {
+  var o = new core.List<core.String>();
+  o.add("foo");
+  o.add("foo");
+  return o;
+}
+
+checkUnnamed448(core.List<core.String> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  unittest.expect(o[0], unittest.equals('foo'));
+  unittest.expect(o[1], unittest.equals('foo'));
+}
+
+buildUnnamed449() {
+  var o = new core.List<core.String>();
+  o.add("foo");
+  o.add("foo");
+  return o;
+}
+
+checkUnnamed449(core.List<core.String> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  unittest.expect(o[0], unittest.equals('foo'));
+  unittest.expect(o[1], unittest.equals('foo'));
+}
+
+
+main() {
+  unittest.group("obj-schema-Document", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildDocument();
+      var od = new api.Document.fromJson(o.toJson());
+      checkDocument(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-Empty", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildEmpty();
+      var od = new api.Empty.fromJson(o.toJson());
+      checkEmpty(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-FieldNames", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildFieldNames();
+      var od = new api.FieldNames.fromJson(o.toJson());
+      checkFieldNames(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-FieldValue", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildFieldValue();
+      var od = new api.FieldValue.fromJson(o.toJson());
+      checkFieldValue(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-FieldValueList", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildFieldValueList();
+      var od = new api.FieldValueList.fromJson(o.toJson());
+      checkFieldValueList(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-IndexInfo", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildIndexInfo();
+      var od = new api.IndexInfo.fromJson(o.toJson());
+      checkIndexInfo(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-ListDocumentsResponse", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildListDocumentsResponse();
+      var od = new api.ListDocumentsResponse.fromJson(o.toJson());
+      checkListDocumentsResponse(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-ListIndexesResponse", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildListIndexesResponse();
+      var od = new api.ListIndexesResponse.fromJson(o.toJson());
+      checkListIndexesResponse(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-SearchResponse", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildSearchResponse();
+      var od = new api.SearchResponse.fromJson(o.toJson());
+      checkSearchResponse(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-SearchResult", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildSearchResult();
+      var od = new api.SearchResult.fromJson(o.toJson());
+      checkSearchResult(od);
+    });
+  });
+
+
+  unittest.group("resource-ProjectsIndexesResourceApi", () {
+    unittest.test("method--list", () {
+
+      var mock = new HttpServerMock();
+      api.ProjectsIndexesResourceApi res = new api.CloudsearchApi(mock).projects.indexes;
+      var arg_projectId = "foo";
+      var arg_indexNamePrefix = "foo";
+      var arg_pageSize = 42;
+      var arg_pageToken = "foo";
+      var arg_view = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("v1/projects/"));
+        pathOffset += 12;
+        index = path.indexOf("/indexes", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_projectId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 8), unittest.equals("/indexes"));
+        pathOffset += 8;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+        unittest.expect(queryMap["indexNamePrefix"].first, unittest.equals(arg_indexNamePrefix));
+        unittest.expect(core.int.parse(queryMap["pageSize"].first), unittest.equals(arg_pageSize));
+        unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
+        unittest.expect(queryMap["view"].first, unittest.equals(arg_view));
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildListIndexesResponse());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.list(arg_projectId, indexNamePrefix: arg_indexNamePrefix, pageSize: arg_pageSize, pageToken: arg_pageToken, view: arg_view).then(unittest.expectAsync(((api.ListIndexesResponse response) {
+        checkListIndexesResponse(response);
+      })));
+    });
+
+    unittest.test("method--search", () {
+
+      var mock = new HttpServerMock();
+      api.ProjectsIndexesResourceApi res = new api.CloudsearchApi(mock).projects.indexes;
+      var arg_projectId = "foo";
+      var arg_indexId = "foo";
+      var arg_query = "foo";
+      var arg_fieldExpressions = buildUnnamed448();
+      var arg_pageSize = 42;
+      var arg_pageToken = "foo";
+      var arg_offset = 42;
+      var arg_matchedCountAccuracy = 42;
+      var arg_orderBy = "foo";
+      var arg_scorer = "foo";
+      var arg_scorerSize = 42;
+      var arg_returnFields = buildUnnamed449();
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("v1/projects/"));
+        pathOffset += 12;
+        index = path.indexOf("/indexes/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_projectId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("/indexes/"));
+        pathOffset += 9;
+        index = path.indexOf("/search", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_indexId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("/search"));
+        pathOffset += 7;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+        unittest.expect(queryMap["query"].first, unittest.equals(arg_query));
+        unittest.expect(queryMap["fieldExpressions"], unittest.equals(arg_fieldExpressions));
+        unittest.expect(core.int.parse(queryMap["pageSize"].first), unittest.equals(arg_pageSize));
+        unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
+        unittest.expect(core.int.parse(queryMap["offset"].first), unittest.equals(arg_offset));
+        unittest.expect(core.int.parse(queryMap["matchedCountAccuracy"].first), unittest.equals(arg_matchedCountAccuracy));
+        unittest.expect(queryMap["orderBy"].first, unittest.equals(arg_orderBy));
+        unittest.expect(queryMap["scorer"].first, unittest.equals(arg_scorer));
+        unittest.expect(core.int.parse(queryMap["scorerSize"].first), unittest.equals(arg_scorerSize));
+        unittest.expect(queryMap["returnFields"], unittest.equals(arg_returnFields));
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildSearchResponse());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.search(arg_projectId, arg_indexId, query: arg_query, fieldExpressions: arg_fieldExpressions, pageSize: arg_pageSize, pageToken: arg_pageToken, offset: arg_offset, matchedCountAccuracy: arg_matchedCountAccuracy, orderBy: arg_orderBy, scorer: arg_scorer, scorerSize: arg_scorerSize, returnFields: arg_returnFields).then(unittest.expectAsync(((api.SearchResponse response) {
+        checkSearchResponse(response);
+      })));
+    });
+
+  });
+
+
+  unittest.group("resource-ProjectsIndexesDocumentsResourceApi", () {
+    unittest.test("method--create", () {
+
+      var mock = new HttpServerMock();
+      api.ProjectsIndexesDocumentsResourceApi res = new api.CloudsearchApi(mock).projects.indexes.documents;
+      var arg_request = buildDocument();
+      var arg_projectId = "foo";
+      var arg_indexId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var obj = new api.Document.fromJson(json);
+        checkDocument(obj);
+
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("v1/projects/"));
+        pathOffset += 12;
+        index = path.indexOf("/indexes/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_projectId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("/indexes/"));
+        pathOffset += 9;
+        index = path.indexOf("/documents", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_indexId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 10), unittest.equals("/documents"));
+        pathOffset += 10;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildDocument());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.create(arg_request, arg_projectId, arg_indexId).then(unittest.expectAsync(((api.Document response) {
+        checkDocument(response);
+      })));
+    });
+
+    unittest.test("method--delete", () {
+
+      var mock = new HttpServerMock();
+      api.ProjectsIndexesDocumentsResourceApi res = new api.CloudsearchApi(mock).projects.indexes.documents;
+      var arg_projectId = "foo";
+      var arg_indexId = "foo";
+      var arg_docId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("v1/projects/"));
+        pathOffset += 12;
+        index = path.indexOf("/indexes/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_projectId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("/indexes/"));
+        pathOffset += 9;
+        index = path.indexOf("/documents/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_indexId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 11), unittest.equals("/documents/"));
+        pathOffset += 11;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_docId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildEmpty());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.delete(arg_projectId, arg_indexId, arg_docId).then(unittest.expectAsync(((api.Empty response) {
+        checkEmpty(response);
+      })));
+    });
+
+    unittest.test("method--get", () {
+
+      var mock = new HttpServerMock();
+      api.ProjectsIndexesDocumentsResourceApi res = new api.CloudsearchApi(mock).projects.indexes.documents;
+      var arg_projectId = "foo";
+      var arg_indexId = "foo";
+      var arg_docId = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("v1/projects/"));
+        pathOffset += 12;
+        index = path.indexOf("/indexes/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_projectId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("/indexes/"));
+        pathOffset += 9;
+        index = path.indexOf("/documents/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_indexId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 11), unittest.equals("/documents/"));
+        pathOffset += 11;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_docId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildDocument());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.get(arg_projectId, arg_indexId, arg_docId).then(unittest.expectAsync(((api.Document response) {
+        checkDocument(response);
+      })));
+    });
+
+    unittest.test("method--list", () {
+
+      var mock = new HttpServerMock();
+      api.ProjectsIndexesDocumentsResourceApi res = new api.CloudsearchApi(mock).projects.indexes.documents;
+      var arg_projectId = "foo";
+      var arg_indexId = "foo";
+      var arg_pageSize = 42;
+      var arg_pageToken = "foo";
+      var arg_view = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 12), unittest.equals("v1/projects/"));
+        pathOffset += 12;
+        index = path.indexOf("/indexes/", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_projectId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("/indexes/"));
+        pathOffset += 9;
+        index = path.indexOf("/documents", pathOffset);
+        unittest.expect(index >= 0, unittest.isTrue);
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
+        pathOffset = index;
+        unittest.expect(subPart, unittest.equals("$arg_indexId"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 10), unittest.equals("/documents"));
+        pathOffset += 10;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+        unittest.expect(core.int.parse(queryMap["pageSize"].first), unittest.equals(arg_pageSize));
+        unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
+        unittest.expect(queryMap["view"].first, unittest.equals(arg_view));
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildListDocumentsResponse());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.list(arg_projectId, arg_indexId, pageSize: arg_pageSize, pageToken: arg_pageToken, view: arg_view).then(unittest.expectAsync(((api.ListDocumentsResponse response) {
+        checkListDocumentsResponse(response);
+      })));
+    });
+
+  });
+
+
+}
+
diff --git a/generated/googleapis/test/common/common_internal_test.dart b/generated/googleapis/test/common/common_internal_test.dart
deleted file mode 100644
index 54fd309..0000000
--- a/generated/googleapis/test/common/common_internal_test.dart
+++ /dev/null
@@ -1,923 +0,0 @@
-library googleapis.common_internal_test;
-import 'dart:async';
-import 'dart:convert';
-
-import 'package:crypto/crypto.dart' as crypto;
-import 'package:googleapis/common/common.dart';
-import 'package:googleapis/src/common_internal.dart';
-import 'package:http/http.dart' as http;
-import 'package:unittest/unittest.dart';
-
-class HttpServerMock extends http.BaseClient {
-  Function _callback;
-  bool _expectJson;
-
-  void register(Function callback, bool expectJson) {
-    _callback = callback;
-    _expectJson = expectJson;
-  }
-
-  Future<http.StreamedResponse> send(http.BaseRequest request) {
-    if (_expectJson) {
-      return request.finalize()
-          .transform(UTF8.decoder)
-          .join('')
-          .then((String jsonString) {
-        if (jsonString.isEmpty) {
-          return _callback(request, null);
-        } else {
-          return _callback(request, JSON.decode(jsonString));
-        }
-      });
-    } else {
-      var stream = request.finalize();
-      if (stream == null) {
-        return _callback(request, []);
-      } else {
-        return stream.toBytes().then((data) {
-          return _callback(request, data);
-        });
-      }
-    }
-  }
-}
-
-http.StreamedResponse stringResponse(int status, Map headers, String body) {
-  var stream = new Stream.fromIterable([UTF8.encode(body)]);
-  return new http.StreamedResponse(stream, status, headers: headers);
-}
-
-http.StreamedResponse binaryResponse(int status,
-                                     Map<String,String> headers,
-                                     List<int> bytes) {
-  var stream = new Stream.fromIterable([bytes]);
-  return new http.StreamedResponse(stream, status, headers: headers);
-}
-
-Stream<List<int>> byteStream(String s) {
-  var bodyController = new StreamController();
-  bodyController.add(UTF8.encode(s));
-  bodyController.close();
-  return bodyController.stream;
-}
-
-class _ApiRequestError extends TypeMatcher {
-  const _ApiRequestError() : super("ApiRequestError");
-  bool matches(item, Map matchState) => item is ApiRequestError;
-}
-
-class _DetailedApiRequestError extends TypeMatcher {
-  const _DetailedApiRequestError() : super("DetailedApiRequestError");
-  bool matches(item, Map matchState) => item is DetailedApiRequestError;
-}
-
-class TestError {}
-
-class _TestError extends TypeMatcher {
-  const _TestError() : super("TestError");
-  bool matches(item, Map matchState) => item is TestError;
-}
-
-const isApiRequestError = const _ApiRequestError();
-const isDetailedApiRequestError = const _DetailedApiRequestError();
-const isTestError = const _TestError();
-
-
-main() {
-  group('common-external', () {
-    test('escaper', () {
-      expect(Escaper.ecapePathComponent('a/b%c '), equals('a%2Fb%25c%20'));
-      expect(Escaper.ecapeVariable('a/b%c '), equals('a%2Fb%25c%20'));
-      expect(Escaper.ecapeVariableReserved('a/b%c+ '), equals('a/b%25c+%20'));
-      expect(Escaper.escapeQueryComponent('a/b%c '), equals('a%2Fb%25c%20'));
-    });
-
-    test('mapMap', () {
-      newTestMap() => {
-        's' : 'string',
-        'i' : 42,
-      };
-
-      var copy = mapMap(newTestMap());
-      expect(copy, hasLength(2));
-      expect(copy['s'], equals('string'));
-      expect(copy['i'], equals(42));
-
-
-      var mod = mapMap(newTestMap(), (x) => '$x foobar');
-      expect(mod, hasLength(2));
-      expect(mod['s'], equals('string foobar'));
-      expect(mod['i'], equals('42 foobar'));
-    });
-
-    test('base64-encoder', () {
-      var base64encoder = new Base64Encoder();
-
-      testString(String msg, String expectedBase64) {
-        var msgBytes = UTF8.encode(msg);
-
-        Stream singleByteStream(List<int> msgBytes) {
-          var controller = new StreamController();
-          for (var byte in msgBytes) {
-            controller.add([byte]);
-          }
-          controller.close();
-          return controller.stream;
-        }
-
-        Stream allByteStream(List<int> msgBytes) {
-          var controller = new StreamController();
-          controller.add(msgBytes);
-          controller.close();
-          return controller.stream;
-        }
-
-        singleByteStream(msgBytes)
-            .transform(base64encoder)
-            .join('')
-            .then(expectAsync((String result) {
-          expect(result, equals(expectedBase64));
-        }));
-
-        allByteStream(msgBytes)
-            .transform(base64encoder)
-            .join('')
-            .then(expectAsync((String result) {
-          expect(result, equals(expectedBase64));
-        }));
-
-        expect(Base64Encoder.lengthOfBase64Stream(msg.length),
-               equals(expectedBase64.length));
-      }
-
-      testString('pleasure.', 'cGxlYXN1cmUu');
-      testString('leasure.', 'bGVhc3VyZS4=');
-      testString('easure.', 'ZWFzdXJlLg==');
-      testString('asure.', 'YXN1cmUu');
-      testString('sure.', 'c3VyZS4=');
-      testString('', '');
-    });
-
-    group('chunk-stack', () {
-      var chunkSize = 9;
-
-      folded(List<List<int>> byteArrays) {
-        return byteArrays.fold([], (buf, e) => buf..addAll(e));
-      }
-
-      test('finalize', () {
-        var chunkStack = new ChunkStack(9);
-        chunkStack.finalize();
-        expect(() => chunkStack.addBytes([1]), throwsA(isStateError));
-        expect(() => chunkStack.finalize(), throwsA(isStateError));
-      });
-
-      test('empty', () {
-        var chunkStack = new ChunkStack(9);
-        expect(chunkStack.length, equals(0));
-        chunkStack.finalize();
-        expect(chunkStack.length, equals(0));
-      });
-
-      test('sub-chunk-size', () {
-        var bytes = [1, 2, 3];
-
-        var chunkStack = new ChunkStack(9);
-        chunkStack.addBytes(bytes);
-        expect(chunkStack.length, equals(0));
-        chunkStack.finalize();
-        expect(chunkStack.length, equals(1));
-        expect(chunkStack.totalByteLength, equals(bytes.length));
-
-        var chunks = chunkStack.removeSublist(0, chunkStack.length);
-        expect(chunkStack.length, equals(0));
-        expect(chunks, hasLength(1));
-
-        expect(folded(chunks.first.byteArrays), equals(bytes));
-        expect(chunks.first.offset, equals(0));
-        expect(chunks.first.length, equals(3));
-        expect(chunks.first.endOfChunk, equals(bytes.length));
-      });
-
-      test('exact-chunk-size', () {
-        var bytes = [1, 2, 3, 4, 5, 6, 7, 8, 9];
-
-        var chunkStack = new ChunkStack(9);
-        chunkStack.addBytes(bytes);
-        expect(chunkStack.length, equals(1));
-        chunkStack.finalize();
-        expect(chunkStack.length, equals(1));
-        expect(chunkStack.totalByteLength, equals(bytes.length));
-
-        var chunks = chunkStack.removeSublist(0, chunkStack.length);
-        expect(chunkStack.length, equals(0));
-        expect(chunks, hasLength(1));
-
-        expect(folded(chunks.first.byteArrays), equals(bytes));
-        expect(chunks.first.offset, equals(0));
-        expect(chunks.first.length, equals(bytes.length));
-        expect(chunks.first.endOfChunk, equals(bytes.length));
-      });
-
-      test('super-chunk-size', () {
-        var bytes0 = [1, 2, 3, 4];
-        var bytes1 = [1, 2, 3, 4];
-        var bytes2 = [5, 6, 7, 8, 9, 10, 11];
-        var bytes = folded([bytes0, bytes1, bytes2]);
-
-        var chunkStack = new ChunkStack(9);
-        chunkStack.addBytes(bytes0);
-        chunkStack.addBytes(bytes1);
-        chunkStack.addBytes(bytes2);
-        expect(chunkStack.length, equals(1));
-        chunkStack.finalize();
-        expect(chunkStack.length, equals(2));
-        expect(chunkStack.totalByteLength, equals(bytes.length));
-
-        var chunks = chunkStack.removeSublist(0, chunkStack.length);
-        expect(chunkStack.length, equals(0));
-        expect(chunks, hasLength(2));
-
-        expect(folded(chunks.first.byteArrays),
-               equals(bytes.sublist(0, chunkSize)));
-        expect(chunks.first.offset, equals(0));
-        expect(chunks.first.length, equals(chunkSize));
-        expect(chunks.first.endOfChunk, equals(chunkSize));
-
-        expect(folded(chunks.last.byteArrays),
-               equals(bytes.sublist(chunkSize)));
-        expect(chunks.last.offset, equals(chunkSize));
-        expect(chunks.last.length, equals(bytes.length - chunkSize));
-        expect(chunks.last.endOfChunk, equals(bytes.length));
-      });
-    });
-
-    test('media', () {
-      // Tests for [MediaRange]
-      var partialRange = new ByteRange(1, 100);
-      expect(partialRange.start, equals(1));
-      expect(partialRange.end, equals(100));
-
-      var fullRange = new ByteRange(0, -1);
-      expect(fullRange.start, equals(0));
-      expect(fullRange.end, equals(-1));
-
-      expect(() => new ByteRange(0, 0), throws);
-      expect(() => new ByteRange(-1, 0), throws);
-      expect(() => new ByteRange(-1, 1), throws);
-
-      // Tests for [DownloadOptions]
-      expect(DownloadOptions.Metadata.isMetadataDownload, isTrue);
-
-      expect(DownloadOptions.FullMedia.isFullDownload, isTrue);
-      expect(DownloadOptions.FullMedia.isMetadataDownload, isFalse);
-
-      // Tests for [Media]
-      var stream = new StreamController().stream;
-      expect(() => new Media(null, 0, contentType: 'foobar'),
-             throwsA(isArgumentError));
-      expect(() => new Media(stream, 0, contentType: null),
-             throwsA(isArgumentError));
-      expect(() => new Media(stream, -1, contentType: 'foobar'),
-             throwsA(isArgumentError));
-
-      var lengthUnknownMedia = new Media(stream, null);
-      expect(lengthUnknownMedia.stream, equals(stream));
-      expect(lengthUnknownMedia.length, equals(null));
-
-      var media = new Media(stream, 10, contentType: 'foobar');
-      expect(media.stream, equals(stream));
-      expect(media.length, equals(10));
-      expect(media.contentType, equals('foobar'));
-
-      // Tests for [ResumableUploadOptions]
-      expect(() => new ResumableUploadOptions(numberOfAttempts: 0),
-             throwsA(isArgumentError));
-      expect(() => new ResumableUploadOptions(chunkSize: 1),
-             throwsA(isArgumentError));
-    });
-
-    group('api-requester', () {
-      var httpMock, rootUrl, basePath;
-      ApiRequester requester;
-
-      var responseHeaders = {
-          'content-type' : 'application/json; charset=utf-8',
-      };
-
-      setUp(() {
-        httpMock = new HttpServerMock();
-        rootUrl = 'http://example.com/';
-        basePath = 'base/';
-        requester = new ApiRequester(httpMock, rootUrl, basePath);
-      });
-
-
-      // Tests for Request, Response
-
-      group('metadata-request-response', () {
-        test('empty-request-empty-response', () {
-          httpMock.register(expectAsync((http.BaseRequest request, json) {
-            expect(request.method, equals('GET'));
-            expect('${request.url}',
-                   equals('http://example.com/base/abc?alt=json'));
-            return stringResponse(200, responseHeaders, '');
-          }), true);
-          requester.request('abc', 'GET').then(expectAsync((response) {
-            expect(response, isNull);
-          }));
-        });
-
-        test('json-map-request-json-map-response', () {
-          httpMock.register(expectAsync((http.BaseRequest request, json) {
-            expect(request.method, equals('GET'));
-            expect('${request.url}',
-                   equals('http://example.com/base/abc?alt=json'));
-            expect(json is Map, isTrue);
-            expect(json, hasLength(1));
-            expect(json['foo'], equals('bar'));
-            return stringResponse(200, responseHeaders, '{"foo2" : "bar2"}');
-          }), true);
-          requester.request('abc',
-                            'GET',
-                            body: JSON.encode({'foo' : 'bar'})).then(
-              expectAsync((response) {
-            expect(response is Map, isTrue);
-            expect(response, hasLength(1));
-            expect(response['foo2'], equals('bar2'));
-          }));
-        });
-
-        test('json-list-request-json-list-response', () {
-          httpMock.register(expectAsync((http.BaseRequest request, json) {
-            expect(request.method, equals('GET'));
-            expect('${request.url}',
-                   equals('http://example.com/base/abc?alt=json'));
-            expect(json is List, isTrue);
-            expect(json, hasLength(2));
-            expect(json[0], equals('a'));
-            expect(json[1], equals(1));
-            return stringResponse(200, responseHeaders, '["b", 2]');
-          }), true);
-          requester.request('abc',
-                            'GET',
-                            body: JSON.encode(['a', 1])).then(
-              expectAsync((response) {
-            expect(response is List, isTrue);
-            expect(response[0], equals('b'));
-            expect(response[1], equals(2));
-          }));
-        });
-      });
-
-      group('media-download', () {
-        test('media-download', () {
-          var data256 = new List.generate(256, (i) => i);
-          httpMock.register(expectAsync((http.BaseRequest request, data) {
-            expect(request.method, equals('GET'));
-            expect('${request.url}',
-                   equals('http://example.com/base/abc?alt=media'));
-            expect(data, isEmpty);
-            var headers = {
-                'content-length' : '${data256.length}',
-                'content-type' : 'foobar',
-            };
-            return binaryResponse(200, headers, data256);
-          }), false);
-          requester.request('abc',
-                            'GET',
-                            body: '',
-                            downloadOptions: DownloadOptions.FullMedia).then(
-              expectAsync((Media media) {
-            expect(media.contentType, equals('foobar'));
-            expect(media.length, equals(data256.length));
-            media.stream.fold([], (b, d) => b..addAll(d)).then(expectAsync((d) {
-              expect(d, equals(data256));
-            }));
-          }));
-        });
-
-        test('media-download-partial', () {
-          var data256 = new List.generate(256, (i) => i);
-          var data64 = data256.sublist(128, 128 + 64);
-
-          httpMock.register(expectAsync((http.BaseRequest request, data) {
-            expect(request.method, equals('GET'));
-            expect('${request.url}',
-                   equals('http://example.com/base/abc?alt=media'));
-            expect(data, isEmpty);
-            expect(request.headers['range'],
-                   equals('bytes=128-191'));
-            var headers = {
-                'content-length' : '${data64.length}',
-                'content-type' : 'foobar',
-                'content-range' : 'bytes 128-191/256',
-            };
-            return binaryResponse(200, headers, data64);
-          }), false);
-          var range = new ByteRange(128, 128 + 64 - 1);
-          var options = new PartialDownloadOptions(range);
-          requester.request('abc',
-                            'GET',
-                            body: '',
-                            downloadOptions: options).then(
-              expectAsync((Media media) {
-            expect(media.contentType, equals('foobar'));
-            expect(media.length, equals(data64.length));
-            media.stream.fold([], (b, d) => b..addAll(d)).then(expectAsync((d) {
-              expect(d, equals(data64));
-            }));
-          }));
-        });
-
-        test('json-upload-media-download', () {
-          var data256 = new List.generate(256, (i) => i);
-          httpMock.register(expectAsync((http.BaseRequest request, json) {
-            expect(request.method, equals('GET'));
-            expect('${request.url}',
-                    equals('http://example.com/base/abc?alt=media'));
-            expect(json is List, isTrue);
-            expect(json, hasLength(2));
-            expect(json[0], equals('a'));
-            expect(json[1], equals(1));
-
-            var headers = {
-                'content-length' : '${data256.length}',
-                'content-type' : 'foobar',
-            };
-            return binaryResponse(200, headers, data256);
-          }), true);
-          requester.request('abc',
-                            'GET',
-                            body: JSON.encode(['a', 1]),
-                            downloadOptions: DownloadOptions.FullMedia).then(
-              expectAsync((Media media) {
-            expect(media.contentType, equals('foobar'));
-            expect(media.length, equals(data256.length));
-            media.stream.fold([], (b, d) => b..addAll(d)).then(expectAsync((d) {
-              expect(d, equals(data256));
-            }));
-          }));
-        });
-      });
-
-      // Tests for media uploads
-
-      group('media-upload', () {
-        Stream streamFromByteArrays(byteArrays) {
-          var controller = new StreamController();
-          for (var array in byteArrays) {
-            controller.add(array);
-          }
-          controller.close();
-          return controller.stream;
-        }
-        Media mediaFromByteArrays(byteArrays, {bool withLen: true}) {
-          int len = 0;
-          byteArrays.forEach((array) { len += array.length; });
-          if (!withLen) len = null;
-          return new Media(streamFromByteArrays(byteArrays),
-                           len,
-                           contentType: 'foobar');
-        }
-        validateServerRequest(e, http.BaseRequest request, List<int> data) {
-          return new Future.sync(() {
-            var h = e['headers'];
-            var r = e['response'];
-
-            expect(request.url.toString(), equals(e['url']));
-            expect(request.method, equals(e['method']));
-            h.forEach((k, v) {
-              expect(request.headers[k], equals(v));
-            });
-
-            expect(data, equals(e['data']));
-            return r;
-          });
-        }
-        serverRequestValidator(List expectations) {
-          int i = 0;
-          return (http.BaseRequest request, List<int> data) {
-            return validateServerRequest(expectations[i++], request, data);
-          };
-        }
-
-        test('simple', () {
-          var bytes = new List.generate(10 * 256 * 1024 + 1, (i) => i % 256);
-          var expectations = [
-              {
-                'url' : 'http://example.com/xyz?uploadType=media&alt=json',
-                'method' : 'POST',
-                'data' : bytes,
-                'headers' : {
-                  'content-length' : '${bytes.length}',
-                  'content-type' : 'foobar',
-                },
-                'response' : stringResponse(200, responseHeaders, '')
-              },
-          ];
-
-          httpMock.register(
-              expectAsync(serverRequestValidator(expectations)), false);
-          var media = mediaFromByteArrays([bytes]);
-          requester.request('/xyz',
-                            'POST',
-                            uploadMedia: media).then(
-              expectAsync((response) {}));
-        });
-
-        test('multipart-upload', () {
-          var bytes = new List.generate(10 * 256 * 1024 + 1, (i) => i % 256);
-          var contentBytes =
-              '--314159265358979323846\r\n'
-              'Content-Type: $CONTENT_TYPE_JSON_UTF8\r\n\r\n'
-              'BODY'
-              '\r\n--314159265358979323846\r\n'
-              'Content-Type: foobar\r\n'
-              'Content-Transfer-Encoding: base64\r\n\r\n'
-              '${crypto.CryptoUtils.bytesToBase64(bytes)}'
-              '\r\n--314159265358979323846--';
-
-          var expectations = [
-              {
-                'url' : 'http://example.com/xyz?uploadType=multipart&alt=json',
-                'method' : 'POST',
-                'data' : UTF8.encode('$contentBytes'),
-                'headers' : {
-                  'content-length' : '${contentBytes.length}',
-                  'content-type' :
-                      'multipart/related; boundary="314159265358979323846"',
-                },
-                'response' : stringResponse(200, responseHeaders, '')
-              },
-          ];
-
-          httpMock.register(
-              expectAsync(serverRequestValidator(expectations)), false);
-          var media = mediaFromByteArrays([bytes]);
-          requester.request('/xyz',
-                            'POST',
-                            body: 'BODY',
-                            uploadMedia: media).then(
-              expectAsync((response) {}));
-        });
-
-        group('resumable-upload', () {
-          // TODO: respect [stream]
-          buildExpectations(List<int> bytes, int chunkSize, bool stream,
-              {int numberOfServerErrors: 0}) {
-            int totalLength = bytes.length;
-            int numberOfChunks = totalLength ~/ chunkSize;
-            int numberOfBytesInLastChunk = totalLength % chunkSize;
-
-            if (numberOfBytesInLastChunk > 0) {
-              numberOfChunks++;
-            } else {
-              numberOfBytesInLastChunk = chunkSize;
-            }
-
-            var expectations = [];
-
-            // First request is making a POST and gets the upload URL.
-            expectations.add({
-              'url' : 'http://example.com/xyz?uploadType=resumable&alt=json',
-              'method' : 'POST',
-              'data' : [],
-              'headers' : {
-                'content-length' : '0',
-                'content-type' : 'application/json; charset=utf-8',
-                'x-upload-content-type' : 'foobar',
-              }..addAll(stream ? {} : {
-                'x-upload-content-length' : '$totalLength',
-              }),
-              'response' : stringResponse(
-                  200, {'location' : 'http://upload.com/'}, '')
-            });
-
-            var lastEnd = 0;
-            for (int i = 0; i < numberOfChunks; i++) {
-              bool isLast = i == (numberOfChunks - 1);
-              var lengthMarker = stream && !isLast ? '*' : '$totalLength';
-
-              int bytesToExpect = chunkSize;
-              if (isLast) {
-                bytesToExpect = numberOfBytesInLastChunk;
-              }
-
-              var start = i * chunkSize;
-              var end = start + bytesToExpect;
-              var sublist = bytes.sublist(start, end);
-
-              var firstContentRange =
-                  'bytes $start-${end-1}/$lengthMarker';
-              var firstRange =
-                  'bytes=0-${end-1}';
-
-              // We issue [numberOfServerErrors] 503 errors first, and then a
-              // successfull response.
-              for (var j = 0; j < (numberOfServerErrors + 1); j++) {
-                bool successfullResponse = j == numberOfServerErrors;
-
-                var response;
-                if (successfullResponse) {
-                  var headers = isLast
-                      ? { 'content-type' : 'application/json; charset=utf-8' }
-                      : {'range' : firstRange };
-                  response = stringResponse(isLast ? 200 : 308, headers, '');
-                } else {
-                  var headers = {};
-                  response = stringResponse(503, headers, '');
-                }
-
-                expectations.add({
-                  'url' : 'http://upload.com/',
-                  'method' : 'PUT',
-                  'data' : sublist,
-                  'headers' : {
-                    'content-length' : '${sublist.length}',
-                    'content-range' : firstContentRange,
-                    'content-type' : 'foobar',
-                  },
-                  'response' : response,
-                });
-              }
-            }
-            return expectations;
-          }
-
-          List<List<int>> makeParts(List<int> bytes, List<int> splits) {
-            var parts = [];
-            int lastEnd = 0;
-            for (int i = 0; i < splits.length; i++) {
-              parts.add(bytes.sublist(lastEnd, splits[i]));
-              lastEnd = splits[i];
-            }
-            return parts;
-          }
-
-          runTest(int chunkSizeInBlocks, int length, List splits, bool stream,
-                  {int numberOfServerErrors: 0, resumableOptions,
-                   int expectedErrorStatus, int messagesNrOfFailure}) {
-            int chunkSize = chunkSizeInBlocks * 256 * 1024;
-
-            int i = 0;
-            var bytes = new List.generate(length, (i) => i % 256);
-            var parts = makeParts(bytes, splits);
-
-            // Simulation of our server
-            var expectations = buildExpectations(
-                bytes, chunkSize, false,
-                numberOfServerErrors: numberOfServerErrors);
-            // If the server simulates 50X errors and the client resumes only
-            // a limited amount of time, we'll trunkate the number of requests
-            // the server expects.
-            // [The client will give up and if the server expects more, the test
-            //  would timeout.]
-            if (expectedErrorStatus != null) {
-              expectations = expectations.sublist(0, messagesNrOfFailure);
-            }
-            httpMock.register(
-                expectAsync(serverRequestValidator(expectations),
-                            count: expectations.length),
-                false);
-
-            // Our client
-            var media = mediaFromByteArrays(parts);
-            if (resumableOptions == null) {
-              resumableOptions =
-                  new ResumableUploadOptions(chunkSize: chunkSize);
-            }
-            var result = requester.request('/xyz',
-                                           'POST',
-                                           uploadMedia: media,
-                                           uploadOptions: resumableOptions);
-            if (expectedErrorStatus != null) {
-              result.catchError(expectAsync((error) {
-                expect(error is DetailedApiRequestError, isTrue);
-                expect(error.status, equals(expectedErrorStatus));
-              }));
-            } else {
-              result.then(expectAsync((_) {}));
-            }
-          }
-
-          Function backoffWrapper(int callCount) {
-            return expectAsync((int failedAttempts) {
-              var exp = ResumableUploadOptions.ExponentialBackoff;
-              Duration duration = exp(failedAttempts);
-              expect(duration.inSeconds, equals(1 << (failedAttempts - 1)));
-              return const Duration(milliseconds: 1);
-            }, count: callCount);
-          }
-
-          test('length-small-block', () {
-            runTest(1, 10, [10], false);
-          });
-
-          test('length-small-block-parts', () {
-            runTest(1, 20, [1, 2, 3, 4, 5, 6, 7, 19, 20], false);
-          });
-
-          test('length-big-block', () {
-            runTest(1, 1024 * 1024, [1024*1024], false);
-          });
-
-          test('length-big-block-parts', () {
-            runTest(1, 1024 * 1024,
-                    [1,
-                     256*1024-1,
-                     256*1024,
-                     256*1024+1,
-                     1024*1024-1,
-                     1024*1024], false);
-          });
-
-          test('length-big-block-parts-non-divisible', () {
-            runTest(1, 1024 * 1024 + 1,
-                    [1,
-                     256*1024-1,
-                     256*1024,
-                     256*1024+1,
-                     1024*1024-1,
-                     1024*1024,
-                     1024*1024+1], false);
-          });
-
-          test('stream-small-block', () {
-            runTest(1, 10, [10], true);
-          });
-
-          test('stream-small-block-parts', () {
-            runTest(1, 20, [1, 2, 3, 4, 5, 6, 7, 19, 20], true);
-          });
-
-          test('stream-big-block', () {
-            runTest(1, 1024 * 1024, [1024*1024], true);
-          });
-
-          test('stream-big-block-parts', () {
-            runTest(1, 1024 * 1024,
-                    [1,
-                     256*1024-1,
-                     256*1024,
-                     256*1024+1,
-                     1024*1024-1,
-                     1024*1024], true);
-          });
-
-          test('stream-big-block-parts--with-server-error-recovery', () {
-            var numFailedAttempts = 4 * 3;
-            var options = new ResumableUploadOptions(
-                chunkSize: 256 * 1024, numberOfAttempts: 4,
-                backoffFunction: backoffWrapper(numFailedAttempts));
-            runTest(1, 1024 * 1024,
-                    [1,
-                     256*1024-1,
-                     256*1024,
-                     256*1024+1,
-                     1024*1024-1,
-                     1024*1024],
-                     true,
-                     numberOfServerErrors: 3,
-                     resumableOptions: options);
-          });
-
-          test('stream-big-block-parts--server-error', () {
-            var numFailedAttempts = 2;
-            var options = new ResumableUploadOptions(
-                chunkSize: 256 * 1024, numberOfAttempts: 3,
-                backoffFunction: backoffWrapper(numFailedAttempts));
-            runTest(1, 1024 * 1024,
-                    [1,
-                     256*1024-1,
-                     256*1024,
-                     256*1024+1,
-                     1024*1024-1,
-                     1024*1024],
-                     true,
-                     numberOfServerErrors: 3,
-                     resumableOptions: options,
-                     expectedErrorStatus: 503,
-                     messagesNrOfFailure: 4);
-          });
-        });
-      });
-
-      // Tests for error responses
-      group('request-errors', () {
-        makeTestError() {
-          // All errors from the [http.Client] propagate through.
-          // We use [TestError] to simulate it.
-          httpMock.register(expectAsync((http.BaseRequest request, string) {
-            return new Future.error(new TestError());
-          }), false);
-        }
-
-        makeDetailed400Error() {
-          httpMock.register(expectAsync((http.BaseRequest request, string) {
-            return stringResponse(400,
-                                 responseHeaders,
-                                 '{"error" : {"code" : 42, "message": "foo"}}');
-          }), false);
-        }
-
-        makeNormal199Error() {
-          httpMock.register(expectAsync((http.BaseRequest request, string) {
-            return stringResponse(199, {}, '');
-          }), false);
-        }
-
-        makeInvalidContentTypeError() {
-          httpMock.register(expectAsync((http.BaseRequest request, string) {
-            var responseHeaders = { 'content-type' : 'image/png'};
-            return stringResponse(200, responseHeaders, '');
-          }), false);
-        }
-
-
-        test('normal-http-client', () {
-          makeTestError();
-          expect(requester.request('abc', 'GET'), throwsA(isTestError));
-        });
-
-        test('normal-detailed-400', () {
-          makeDetailed400Error();
-          requester.request('abc', 'GET')
-              .catchError(expectAsync((error, stack) {
-            expect(error, isDetailedApiRequestError);
-            DetailedApiRequestError e = error;
-            expect(e.status, equals(42));
-            expect(e.message, equals('foo'));
-          }));
-        });
-
-        test('normal-199', () {
-          makeNormal199Error();
-          expect(requester.request('abc', 'GET'), throwsA(isApiRequestError));
-        });
-
-        test('normal-invalid-content-type', () {
-          makeInvalidContentTypeError();
-          expect(requester.request('abc', 'GET'), throwsA(isApiRequestError));
-        });
-
-        var options = DownloadOptions.FullMedia;
-        test('media-http-client', () {
-          makeTestError();
-          expect(requester.request('abc', 'GET', downloadOptions: options),
-                 throwsA(isTestError));
-        });
-
-        test('media-detailed-400', () {
-          makeDetailed400Error();
-          requester.request('abc', 'GET')
-              .catchError(expectAsync((error, stack) {
-            expect(error, isDetailedApiRequestError);
-            DetailedApiRequestError e = error;
-            expect(e.status, equals(42));
-            expect(e.message, equals('foo'));
-          }));
-        });
-
-        test('media-199', () {
-          makeNormal199Error();
-          expect(requester.request('abc', 'GET', downloadOptions: options),
-                 throwsA(isApiRequestError));
-        });
-      });
-
-
-      // Tests for path/query parameters
-
-      test('request-parameters-query', () {
-        var queryParams = {
-            'a' : ['a1', 'a2'],
-            's' : ['s1']
-        };
-        httpMock.register(expectAsync((http.BaseRequest request, json) {
-          expect(request.method, equals('GET'));
-          expect('${request.url}',
-                 equals('http://example.com/base/abc?a=a1&a=a2&s=s1&alt=json'));
-          return stringResponse(200, responseHeaders, '');
-        }), true);
-        requester.request('abc', 'GET', queryParams: queryParams)
-            .then(expectAsync((response) {
-          expect(response, isNull);
-        }));
-      });
-
-      test('request-parameters-path', () {
-        httpMock.register(expectAsync((http.BaseRequest request, json) {
-          expect(request.method, equals('GET'));
-          expect('${request.url}', equals(
-              'http://example.com/base/s/foo/a1/a2/bar/s1/e?alt=json'));
-          return stringResponse(200, responseHeaders, '');
-        }), true);
-        requester.request('s/foo/a1/a2/bar/s1/e', 'GET')
-            .then(expectAsync((response) {
-          expect(response, isNull);
-        }));
-      });
-    });
-  });
-}
diff --git a/generated/googleapis/test/compute/v1_test.dart b/generated/googleapis/test/compute/v1_test.dart
index 5eca7b4..891582c 100644
--- a/generated/googleapis/test/compute/v1_test.dart
+++ b/generated/googleapis/test/compute/v1_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/compute/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterAccessConfig = 0;
 buildAccessConfig() {
@@ -41,14 +76,14 @@
   buildCounterAccessConfig--;
 }
 
-buildUnnamed1235() {
+buildUnnamed450() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1235(core.List<core.String> o) {
+checkUnnamed450(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -68,7 +103,7 @@
     o.region = "foo";
     o.selfLink = "foo";
     o.status = "foo";
-    o.users = buildUnnamed1235();
+    o.users = buildUnnamed450();
   }
   buildCounterAddress--;
   return o;
@@ -86,19 +121,19 @@
     unittest.expect(o.region, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
-    checkUnnamed1235(o.users);
+    checkUnnamed450(o.users);
   }
   buildCounterAddress--;
 }
 
-buildUnnamed1236() {
+buildUnnamed451() {
   var o = new core.Map<core.String, api.AddressesScopedList>();
   o["x"] = buildAddressesScopedList();
   o["y"] = buildAddressesScopedList();
   return o;
 }
 
-checkUnnamed1236(core.Map<core.String, api.AddressesScopedList> o) {
+checkUnnamed451(core.Map<core.String, api.AddressesScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAddressesScopedList(o["x"]);
   checkAddressesScopedList(o["y"]);
@@ -110,7 +145,7 @@
   buildCounterAddressAggregatedList++;
   if (buildCounterAddressAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1236();
+    o.items = buildUnnamed451();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -123,7 +158,7 @@
   buildCounterAddressAggregatedList++;
   if (buildCounterAddressAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1236(o.items);
+    checkUnnamed451(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -131,14 +166,14 @@
   buildCounterAddressAggregatedList--;
 }
 
-buildUnnamed1237() {
+buildUnnamed452() {
   var o = new core.List<api.Address>();
   o.add(buildAddress());
   o.add(buildAddress());
   return o;
 }
 
-checkUnnamed1237(core.List<api.Address> o) {
+checkUnnamed452(core.List<api.Address> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAddress(o[0]);
   checkAddress(o[1]);
@@ -150,7 +185,7 @@
   buildCounterAddressList++;
   if (buildCounterAddressList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1237();
+    o.items = buildUnnamed452();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -163,7 +198,7 @@
   buildCounterAddressList++;
   if (buildCounterAddressList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1237(o.items);
+    checkUnnamed452(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -171,14 +206,14 @@
   buildCounterAddressList--;
 }
 
-buildUnnamed1238() {
+buildUnnamed453() {
   var o = new core.List<api.Address>();
   o.add(buildAddress());
   o.add(buildAddress());
   return o;
 }
 
-checkUnnamed1238(core.List<api.Address> o) {
+checkUnnamed453(core.List<api.Address> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAddress(o[0]);
   checkAddress(o[1]);
@@ -205,14 +240,14 @@
   buildCounterAddressesScopedListWarningData--;
 }
 
-buildUnnamed1239() {
+buildUnnamed454() {
   var o = new core.List<api.AddressesScopedListWarningData>();
   o.add(buildAddressesScopedListWarningData());
   o.add(buildAddressesScopedListWarningData());
   return o;
 }
 
-checkUnnamed1239(core.List<api.AddressesScopedListWarningData> o) {
+checkUnnamed454(core.List<api.AddressesScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAddressesScopedListWarningData(o[0]);
   checkAddressesScopedListWarningData(o[1]);
@@ -224,7 +259,7 @@
   buildCounterAddressesScopedListWarning++;
   if (buildCounterAddressesScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed1239();
+    o.data = buildUnnamed454();
     o.message = "foo";
   }
   buildCounterAddressesScopedListWarning--;
@@ -235,7 +270,7 @@
   buildCounterAddressesScopedListWarning++;
   if (buildCounterAddressesScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed1239(o.data);
+    checkUnnamed454(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterAddressesScopedListWarning--;
@@ -246,7 +281,7 @@
   var o = new api.AddressesScopedList();
   buildCounterAddressesScopedList++;
   if (buildCounterAddressesScopedList < 3) {
-    o.addresses = buildUnnamed1238();
+    o.addresses = buildUnnamed453();
     o.warning = buildAddressesScopedListWarning();
   }
   buildCounterAddressesScopedList--;
@@ -256,20 +291,20 @@
 checkAddressesScopedList(api.AddressesScopedList o) {
   buildCounterAddressesScopedList++;
   if (buildCounterAddressesScopedList < 3) {
-    checkUnnamed1238(o.addresses);
+    checkUnnamed453(o.addresses);
     checkAddressesScopedListWarning(o.warning);
   }
   buildCounterAddressesScopedList--;
 }
 
-buildUnnamed1240() {
+buildUnnamed455() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1240(core.List<core.String> o) {
+checkUnnamed455(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -287,7 +322,7 @@
     o.initializeParams = buildAttachedDiskInitializeParams();
     o.interface = "foo";
     o.kind = "foo";
-    o.licenses = buildUnnamed1240();
+    o.licenses = buildUnnamed455();
     o.mode = "foo";
     o.source = "foo";
     o.type = "foo";
@@ -306,7 +341,7 @@
     checkAttachedDiskInitializeParams(o.initializeParams);
     unittest.expect(o.interface, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1240(o.licenses);
+    checkUnnamed455(o.licenses);
     unittest.expect(o.mode, unittest.equals('foo'));
     unittest.expect(o.source, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
@@ -370,27 +405,27 @@
   buildCounterBackend--;
 }
 
-buildUnnamed1241() {
+buildUnnamed456() {
   var o = new core.List<api.Backend>();
   o.add(buildBackend());
   o.add(buildBackend());
   return o;
 }
 
-checkUnnamed1241(core.List<api.Backend> o) {
+checkUnnamed456(core.List<api.Backend> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBackend(o[0]);
   checkBackend(o[1]);
 }
 
-buildUnnamed1242() {
+buildUnnamed457() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1242(core.List<core.String> o) {
+checkUnnamed457(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -401,11 +436,11 @@
   var o = new api.BackendService();
   buildCounterBackendService++;
   if (buildCounterBackendService < 3) {
-    o.backends = buildUnnamed1241();
+    o.backends = buildUnnamed456();
     o.creationTimestamp = "foo";
     o.description = "foo";
     o.fingerprint = "foo";
-    o.healthChecks = buildUnnamed1242();
+    o.healthChecks = buildUnnamed457();
     o.id = "foo";
     o.kind = "foo";
     o.name = "foo";
@@ -422,11 +457,11 @@
 checkBackendService(api.BackendService o) {
   buildCounterBackendService++;
   if (buildCounterBackendService < 3) {
-    checkUnnamed1241(o.backends);
+    checkUnnamed456(o.backends);
     unittest.expect(o.creationTimestamp, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.fingerprint, unittest.equals('foo'));
-    checkUnnamed1242(o.healthChecks);
+    checkUnnamed457(o.healthChecks);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
@@ -439,14 +474,14 @@
   buildCounterBackendService--;
 }
 
-buildUnnamed1243() {
+buildUnnamed458() {
   var o = new core.List<api.HealthStatus>();
   o.add(buildHealthStatus());
   o.add(buildHealthStatus());
   return o;
 }
 
-checkUnnamed1243(core.List<api.HealthStatus> o) {
+checkUnnamed458(core.List<api.HealthStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHealthStatus(o[0]);
   checkHealthStatus(o[1]);
@@ -457,7 +492,7 @@
   var o = new api.BackendServiceGroupHealth();
   buildCounterBackendServiceGroupHealth++;
   if (buildCounterBackendServiceGroupHealth < 3) {
-    o.healthStatus = buildUnnamed1243();
+    o.healthStatus = buildUnnamed458();
     o.kind = "foo";
   }
   buildCounterBackendServiceGroupHealth--;
@@ -467,20 +502,20 @@
 checkBackendServiceGroupHealth(api.BackendServiceGroupHealth o) {
   buildCounterBackendServiceGroupHealth++;
   if (buildCounterBackendServiceGroupHealth < 3) {
-    checkUnnamed1243(o.healthStatus);
+    checkUnnamed458(o.healthStatus);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterBackendServiceGroupHealth--;
 }
 
-buildUnnamed1244() {
+buildUnnamed459() {
   var o = new core.List<api.BackendService>();
   o.add(buildBackendService());
   o.add(buildBackendService());
   return o;
 }
 
-checkUnnamed1244(core.List<api.BackendService> o) {
+checkUnnamed459(core.List<api.BackendService> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBackendService(o[0]);
   checkBackendService(o[1]);
@@ -492,7 +527,7 @@
   buildCounterBackendServiceList++;
   if (buildCounterBackendServiceList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1244();
+    o.items = buildUnnamed459();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -505,7 +540,7 @@
   buildCounterBackendServiceList++;
   if (buildCounterBackendServiceList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1244(o.items);
+    checkUnnamed459(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -540,14 +575,14 @@
   buildCounterDeprecationStatus--;
 }
 
-buildUnnamed1245() {
+buildUnnamed460() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1245(core.List<core.String> o) {
+checkUnnamed460(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -562,7 +597,7 @@
     o.description = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.licenses = buildUnnamed1245();
+    o.licenses = buildUnnamed460();
     o.name = "foo";
     o.options = "foo";
     o.selfLink = "foo";
@@ -586,7 +621,7 @@
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1245(o.licenses);
+    checkUnnamed460(o.licenses);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.options, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -602,14 +637,14 @@
   buildCounterDisk--;
 }
 
-buildUnnamed1246() {
+buildUnnamed461() {
   var o = new core.Map<core.String, api.DisksScopedList>();
   o["x"] = buildDisksScopedList();
   o["y"] = buildDisksScopedList();
   return o;
 }
 
-checkUnnamed1246(core.Map<core.String, api.DisksScopedList> o) {
+checkUnnamed461(core.Map<core.String, api.DisksScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDisksScopedList(o["x"]);
   checkDisksScopedList(o["y"]);
@@ -621,7 +656,7 @@
   buildCounterDiskAggregatedList++;
   if (buildCounterDiskAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1246();
+    o.items = buildUnnamed461();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -634,7 +669,7 @@
   buildCounterDiskAggregatedList++;
   if (buildCounterDiskAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1246(o.items);
+    checkUnnamed461(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -642,14 +677,14 @@
   buildCounterDiskAggregatedList--;
 }
 
-buildUnnamed1247() {
+buildUnnamed462() {
   var o = new core.List<api.Disk>();
   o.add(buildDisk());
   o.add(buildDisk());
   return o;
 }
 
-checkUnnamed1247(core.List<api.Disk> o) {
+checkUnnamed462(core.List<api.Disk> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDisk(o[0]);
   checkDisk(o[1]);
@@ -661,7 +696,7 @@
   buildCounterDiskList++;
   if (buildCounterDiskList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1247();
+    o.items = buildUnnamed462();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -674,7 +709,7 @@
   buildCounterDiskList++;
   if (buildCounterDiskList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1247(o.items);
+    checkUnnamed462(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -682,6 +717,27 @@
   buildCounterDiskList--;
 }
 
+core.int buildCounterDiskMoveRequest = 0;
+buildDiskMoveRequest() {
+  var o = new api.DiskMoveRequest();
+  buildCounterDiskMoveRequest++;
+  if (buildCounterDiskMoveRequest < 3) {
+    o.destinationZone = "foo";
+    o.targetDisk = "foo";
+  }
+  buildCounterDiskMoveRequest--;
+  return o;
+}
+
+checkDiskMoveRequest(api.DiskMoveRequest o) {
+  buildCounterDiskMoveRequest++;
+  if (buildCounterDiskMoveRequest < 3) {
+    unittest.expect(o.destinationZone, unittest.equals('foo'));
+    unittest.expect(o.targetDisk, unittest.equals('foo'));
+  }
+  buildCounterDiskMoveRequest--;
+}
+
 core.int buildCounterDiskType = 0;
 buildDiskType() {
   var o = new api.DiskType();
@@ -719,14 +775,14 @@
   buildCounterDiskType--;
 }
 
-buildUnnamed1248() {
+buildUnnamed463() {
   var o = new core.Map<core.String, api.DiskTypesScopedList>();
   o["x"] = buildDiskTypesScopedList();
   o["y"] = buildDiskTypesScopedList();
   return o;
 }
 
-checkUnnamed1248(core.Map<core.String, api.DiskTypesScopedList> o) {
+checkUnnamed463(core.Map<core.String, api.DiskTypesScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDiskTypesScopedList(o["x"]);
   checkDiskTypesScopedList(o["y"]);
@@ -738,7 +794,7 @@
   buildCounterDiskTypeAggregatedList++;
   if (buildCounterDiskTypeAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1248();
+    o.items = buildUnnamed463();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -751,7 +807,7 @@
   buildCounterDiskTypeAggregatedList++;
   if (buildCounterDiskTypeAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1248(o.items);
+    checkUnnamed463(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -759,14 +815,14 @@
   buildCounterDiskTypeAggregatedList--;
 }
 
-buildUnnamed1249() {
+buildUnnamed464() {
   var o = new core.List<api.DiskType>();
   o.add(buildDiskType());
   o.add(buildDiskType());
   return o;
 }
 
-checkUnnamed1249(core.List<api.DiskType> o) {
+checkUnnamed464(core.List<api.DiskType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDiskType(o[0]);
   checkDiskType(o[1]);
@@ -778,7 +834,7 @@
   buildCounterDiskTypeList++;
   if (buildCounterDiskTypeList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1249();
+    o.items = buildUnnamed464();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -791,7 +847,7 @@
   buildCounterDiskTypeList++;
   if (buildCounterDiskTypeList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1249(o.items);
+    checkUnnamed464(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -799,14 +855,14 @@
   buildCounterDiskTypeList--;
 }
 
-buildUnnamed1250() {
+buildUnnamed465() {
   var o = new core.List<api.DiskType>();
   o.add(buildDiskType());
   o.add(buildDiskType());
   return o;
 }
 
-checkUnnamed1250(core.List<api.DiskType> o) {
+checkUnnamed465(core.List<api.DiskType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDiskType(o[0]);
   checkDiskType(o[1]);
@@ -833,14 +889,14 @@
   buildCounterDiskTypesScopedListWarningData--;
 }
 
-buildUnnamed1251() {
+buildUnnamed466() {
   var o = new core.List<api.DiskTypesScopedListWarningData>();
   o.add(buildDiskTypesScopedListWarningData());
   o.add(buildDiskTypesScopedListWarningData());
   return o;
 }
 
-checkUnnamed1251(core.List<api.DiskTypesScopedListWarningData> o) {
+checkUnnamed466(core.List<api.DiskTypesScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDiskTypesScopedListWarningData(o[0]);
   checkDiskTypesScopedListWarningData(o[1]);
@@ -852,7 +908,7 @@
   buildCounterDiskTypesScopedListWarning++;
   if (buildCounterDiskTypesScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed1251();
+    o.data = buildUnnamed466();
     o.message = "foo";
   }
   buildCounterDiskTypesScopedListWarning--;
@@ -863,7 +919,7 @@
   buildCounterDiskTypesScopedListWarning++;
   if (buildCounterDiskTypesScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed1251(o.data);
+    checkUnnamed466(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterDiskTypesScopedListWarning--;
@@ -874,7 +930,7 @@
   var o = new api.DiskTypesScopedList();
   buildCounterDiskTypesScopedList++;
   if (buildCounterDiskTypesScopedList < 3) {
-    o.diskTypes = buildUnnamed1250();
+    o.diskTypes = buildUnnamed465();
     o.warning = buildDiskTypesScopedListWarning();
   }
   buildCounterDiskTypesScopedList--;
@@ -884,20 +940,20 @@
 checkDiskTypesScopedList(api.DiskTypesScopedList o) {
   buildCounterDiskTypesScopedList++;
   if (buildCounterDiskTypesScopedList < 3) {
-    checkUnnamed1250(o.diskTypes);
+    checkUnnamed465(o.diskTypes);
     checkDiskTypesScopedListWarning(o.warning);
   }
   buildCounterDiskTypesScopedList--;
 }
 
-buildUnnamed1252() {
+buildUnnamed467() {
   var o = new core.List<api.Disk>();
   o.add(buildDisk());
   o.add(buildDisk());
   return o;
 }
 
-checkUnnamed1252(core.List<api.Disk> o) {
+checkUnnamed467(core.List<api.Disk> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDisk(o[0]);
   checkDisk(o[1]);
@@ -924,14 +980,14 @@
   buildCounterDisksScopedListWarningData--;
 }
 
-buildUnnamed1253() {
+buildUnnamed468() {
   var o = new core.List<api.DisksScopedListWarningData>();
   o.add(buildDisksScopedListWarningData());
   o.add(buildDisksScopedListWarningData());
   return o;
 }
 
-checkUnnamed1253(core.List<api.DisksScopedListWarningData> o) {
+checkUnnamed468(core.List<api.DisksScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDisksScopedListWarningData(o[0]);
   checkDisksScopedListWarningData(o[1]);
@@ -943,7 +999,7 @@
   buildCounterDisksScopedListWarning++;
   if (buildCounterDisksScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed1253();
+    o.data = buildUnnamed468();
     o.message = "foo";
   }
   buildCounterDisksScopedListWarning--;
@@ -954,7 +1010,7 @@
   buildCounterDisksScopedListWarning++;
   if (buildCounterDisksScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed1253(o.data);
+    checkUnnamed468(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterDisksScopedListWarning--;
@@ -965,7 +1021,7 @@
   var o = new api.DisksScopedList();
   buildCounterDisksScopedList++;
   if (buildCounterDisksScopedList < 3) {
-    o.disks = buildUnnamed1252();
+    o.disks = buildUnnamed467();
     o.warning = buildDisksScopedListWarning();
   }
   buildCounterDisksScopedList--;
@@ -975,20 +1031,20 @@
 checkDisksScopedList(api.DisksScopedList o) {
   buildCounterDisksScopedList++;
   if (buildCounterDisksScopedList < 3) {
-    checkUnnamed1252(o.disks);
+    checkUnnamed467(o.disks);
     checkDisksScopedListWarning(o.warning);
   }
   buildCounterDisksScopedList--;
 }
 
-buildUnnamed1254() {
+buildUnnamed469() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1254(core.List<core.String> o) {
+checkUnnamed469(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1000,7 +1056,7 @@
   buildCounterFirewallAllowed++;
   if (buildCounterFirewallAllowed < 3) {
     o.IPProtocol = "foo";
-    o.ports = buildUnnamed1254();
+    o.ports = buildUnnamed469();
   }
   buildCounterFirewallAllowed--;
   return o;
@@ -1010,58 +1066,58 @@
   buildCounterFirewallAllowed++;
   if (buildCounterFirewallAllowed < 3) {
     unittest.expect(o.IPProtocol, unittest.equals('foo'));
-    checkUnnamed1254(o.ports);
+    checkUnnamed469(o.ports);
   }
   buildCounterFirewallAllowed--;
 }
 
-buildUnnamed1255() {
+buildUnnamed470() {
   var o = new core.List<api.FirewallAllowed>();
   o.add(buildFirewallAllowed());
   o.add(buildFirewallAllowed());
   return o;
 }
 
-checkUnnamed1255(core.List<api.FirewallAllowed> o) {
+checkUnnamed470(core.List<api.FirewallAllowed> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFirewallAllowed(o[0]);
   checkFirewallAllowed(o[1]);
 }
 
-buildUnnamed1256() {
+buildUnnamed471() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1256(core.List<core.String> o) {
+checkUnnamed471(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1257() {
+buildUnnamed472() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1257(core.List<core.String> o) {
+checkUnnamed472(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1258() {
+buildUnnamed473() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1258(core.List<core.String> o) {
+checkUnnamed473(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1072,7 +1128,7 @@
   var o = new api.Firewall();
   buildCounterFirewall++;
   if (buildCounterFirewall < 3) {
-    o.allowed = buildUnnamed1255();
+    o.allowed = buildUnnamed470();
     o.creationTimestamp = "foo";
     o.description = "foo";
     o.id = "foo";
@@ -1080,9 +1136,9 @@
     o.name = "foo";
     o.network = "foo";
     o.selfLink = "foo";
-    o.sourceRanges = buildUnnamed1256();
-    o.sourceTags = buildUnnamed1257();
-    o.targetTags = buildUnnamed1258();
+    o.sourceRanges = buildUnnamed471();
+    o.sourceTags = buildUnnamed472();
+    o.targetTags = buildUnnamed473();
   }
   buildCounterFirewall--;
   return o;
@@ -1091,7 +1147,7 @@
 checkFirewall(api.Firewall o) {
   buildCounterFirewall++;
   if (buildCounterFirewall < 3) {
-    checkUnnamed1255(o.allowed);
+    checkUnnamed470(o.allowed);
     unittest.expect(o.creationTimestamp, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
@@ -1099,21 +1155,21 @@
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.network, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
-    checkUnnamed1256(o.sourceRanges);
-    checkUnnamed1257(o.sourceTags);
-    checkUnnamed1258(o.targetTags);
+    checkUnnamed471(o.sourceRanges);
+    checkUnnamed472(o.sourceTags);
+    checkUnnamed473(o.targetTags);
   }
   buildCounterFirewall--;
 }
 
-buildUnnamed1259() {
+buildUnnamed474() {
   var o = new core.List<api.Firewall>();
   o.add(buildFirewall());
   o.add(buildFirewall());
   return o;
 }
 
-checkUnnamed1259(core.List<api.Firewall> o) {
+checkUnnamed474(core.List<api.Firewall> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFirewall(o[0]);
   checkFirewall(o[1]);
@@ -1125,7 +1181,7 @@
   buildCounterFirewallList++;
   if (buildCounterFirewallList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1259();
+    o.items = buildUnnamed474();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -1138,7 +1194,7 @@
   buildCounterFirewallList++;
   if (buildCounterFirewallList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1259(o.items);
+    checkUnnamed474(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -1185,14 +1241,14 @@
   buildCounterForwardingRule--;
 }
 
-buildUnnamed1260() {
+buildUnnamed475() {
   var o = new core.Map<core.String, api.ForwardingRulesScopedList>();
   o["x"] = buildForwardingRulesScopedList();
   o["y"] = buildForwardingRulesScopedList();
   return o;
 }
 
-checkUnnamed1260(core.Map<core.String, api.ForwardingRulesScopedList> o) {
+checkUnnamed475(core.Map<core.String, api.ForwardingRulesScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkForwardingRulesScopedList(o["x"]);
   checkForwardingRulesScopedList(o["y"]);
@@ -1204,7 +1260,7 @@
   buildCounterForwardingRuleAggregatedList++;
   if (buildCounterForwardingRuleAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1260();
+    o.items = buildUnnamed475();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -1217,7 +1273,7 @@
   buildCounterForwardingRuleAggregatedList++;
   if (buildCounterForwardingRuleAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1260(o.items);
+    checkUnnamed475(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -1225,14 +1281,14 @@
   buildCounterForwardingRuleAggregatedList--;
 }
 
-buildUnnamed1261() {
+buildUnnamed476() {
   var o = new core.List<api.ForwardingRule>();
   o.add(buildForwardingRule());
   o.add(buildForwardingRule());
   return o;
 }
 
-checkUnnamed1261(core.List<api.ForwardingRule> o) {
+checkUnnamed476(core.List<api.ForwardingRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkForwardingRule(o[0]);
   checkForwardingRule(o[1]);
@@ -1244,7 +1300,7 @@
   buildCounterForwardingRuleList++;
   if (buildCounterForwardingRuleList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1261();
+    o.items = buildUnnamed476();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -1257,7 +1313,7 @@
   buildCounterForwardingRuleList++;
   if (buildCounterForwardingRuleList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1261(o.items);
+    checkUnnamed476(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -1265,14 +1321,14 @@
   buildCounterForwardingRuleList--;
 }
 
-buildUnnamed1262() {
+buildUnnamed477() {
   var o = new core.List<api.ForwardingRule>();
   o.add(buildForwardingRule());
   o.add(buildForwardingRule());
   return o;
 }
 
-checkUnnamed1262(core.List<api.ForwardingRule> o) {
+checkUnnamed477(core.List<api.ForwardingRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkForwardingRule(o[0]);
   checkForwardingRule(o[1]);
@@ -1299,14 +1355,14 @@
   buildCounterForwardingRulesScopedListWarningData--;
 }
 
-buildUnnamed1263() {
+buildUnnamed478() {
   var o = new core.List<api.ForwardingRulesScopedListWarningData>();
   o.add(buildForwardingRulesScopedListWarningData());
   o.add(buildForwardingRulesScopedListWarningData());
   return o;
 }
 
-checkUnnamed1263(core.List<api.ForwardingRulesScopedListWarningData> o) {
+checkUnnamed478(core.List<api.ForwardingRulesScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkForwardingRulesScopedListWarningData(o[0]);
   checkForwardingRulesScopedListWarningData(o[1]);
@@ -1318,7 +1374,7 @@
   buildCounterForwardingRulesScopedListWarning++;
   if (buildCounterForwardingRulesScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed1263();
+    o.data = buildUnnamed478();
     o.message = "foo";
   }
   buildCounterForwardingRulesScopedListWarning--;
@@ -1329,7 +1385,7 @@
   buildCounterForwardingRulesScopedListWarning++;
   if (buildCounterForwardingRulesScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed1263(o.data);
+    checkUnnamed478(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterForwardingRulesScopedListWarning--;
@@ -1340,7 +1396,7 @@
   var o = new api.ForwardingRulesScopedList();
   buildCounterForwardingRulesScopedList++;
   if (buildCounterForwardingRulesScopedList < 3) {
-    o.forwardingRules = buildUnnamed1262();
+    o.forwardingRules = buildUnnamed477();
     o.warning = buildForwardingRulesScopedListWarning();
   }
   buildCounterForwardingRulesScopedList--;
@@ -1350,7 +1406,7 @@
 checkForwardingRulesScopedList(api.ForwardingRulesScopedList o) {
   buildCounterForwardingRulesScopedList++;
   if (buildCounterForwardingRulesScopedList < 3) {
-    checkUnnamed1262(o.forwardingRules);
+    checkUnnamed477(o.forwardingRules);
     checkForwardingRulesScopedListWarning(o.warning);
   }
   buildCounterForwardingRulesScopedList--;
@@ -1400,14 +1456,14 @@
   buildCounterHealthStatus--;
 }
 
-buildUnnamed1264() {
+buildUnnamed479() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1264(core.List<core.String> o) {
+checkUnnamed479(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1419,7 +1475,7 @@
   buildCounterHostRule++;
   if (buildCounterHostRule < 3) {
     o.description = "foo";
-    o.hosts = buildUnnamed1264();
+    o.hosts = buildUnnamed479();
     o.pathMatcher = "foo";
   }
   buildCounterHostRule--;
@@ -1430,7 +1486,7 @@
   buildCounterHostRule++;
   if (buildCounterHostRule < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed1264(o.hosts);
+    checkUnnamed479(o.hosts);
     unittest.expect(o.pathMatcher, unittest.equals('foo'));
   }
   buildCounterHostRule--;
@@ -1479,14 +1535,14 @@
   buildCounterHttpHealthCheck--;
 }
 
-buildUnnamed1265() {
+buildUnnamed480() {
   var o = new core.List<api.HttpHealthCheck>();
   o.add(buildHttpHealthCheck());
   o.add(buildHttpHealthCheck());
   return o;
 }
 
-checkUnnamed1265(core.List<api.HttpHealthCheck> o) {
+checkUnnamed480(core.List<api.HttpHealthCheck> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHttpHealthCheck(o[0]);
   checkHttpHealthCheck(o[1]);
@@ -1498,7 +1554,7 @@
   buildCounterHttpHealthCheckList++;
   if (buildCounterHttpHealthCheckList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1265();
+    o.items = buildUnnamed480();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -1511,7 +1567,7 @@
   buildCounterHttpHealthCheckList++;
   if (buildCounterHttpHealthCheckList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1265(o.items);
+    checkUnnamed480(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -1519,14 +1575,14 @@
   buildCounterHttpHealthCheckList--;
 }
 
-buildUnnamed1266() {
+buildUnnamed481() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1266(core.List<core.String> o) {
+checkUnnamed481(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1567,7 +1623,7 @@
     o.diskSizeGb = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.licenses = buildUnnamed1266();
+    o.licenses = buildUnnamed481();
     o.name = "foo";
     o.rawDisk = buildImageRawDisk();
     o.selfLink = "foo";
@@ -1590,7 +1646,7 @@
     unittest.expect(o.diskSizeGb, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1266(o.licenses);
+    checkUnnamed481(o.licenses);
     unittest.expect(o.name, unittest.equals('foo'));
     checkImageRawDisk(o.rawDisk);
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -1602,14 +1658,14 @@
   buildCounterImage--;
 }
 
-buildUnnamed1267() {
+buildUnnamed482() {
   var o = new core.List<api.Image>();
   o.add(buildImage());
   o.add(buildImage());
   return o;
 }
 
-checkUnnamed1267(core.List<api.Image> o) {
+checkUnnamed482(core.List<api.Image> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkImage(o[0]);
   checkImage(o[1]);
@@ -1621,7 +1677,7 @@
   buildCounterImageList++;
   if (buildCounterImageList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1267();
+    o.items = buildUnnamed482();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -1634,7 +1690,7 @@
   buildCounterImageList++;
   if (buildCounterImageList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1267(o.items);
+    checkUnnamed482(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -1642,40 +1698,40 @@
   buildCounterImageList--;
 }
 
-buildUnnamed1268() {
+buildUnnamed483() {
   var o = new core.List<api.AttachedDisk>();
   o.add(buildAttachedDisk());
   o.add(buildAttachedDisk());
   return o;
 }
 
-checkUnnamed1268(core.List<api.AttachedDisk> o) {
+checkUnnamed483(core.List<api.AttachedDisk> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAttachedDisk(o[0]);
   checkAttachedDisk(o[1]);
 }
 
-buildUnnamed1269() {
+buildUnnamed484() {
   var o = new core.List<api.NetworkInterface>();
   o.add(buildNetworkInterface());
   o.add(buildNetworkInterface());
   return o;
 }
 
-checkUnnamed1269(core.List<api.NetworkInterface> o) {
+checkUnnamed484(core.List<api.NetworkInterface> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNetworkInterface(o[0]);
   checkNetworkInterface(o[1]);
 }
 
-buildUnnamed1270() {
+buildUnnamed485() {
   var o = new core.List<api.ServiceAccount>();
   o.add(buildServiceAccount());
   o.add(buildServiceAccount());
   return o;
 }
 
-checkUnnamed1270(core.List<api.ServiceAccount> o) {
+checkUnnamed485(core.List<api.ServiceAccount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkServiceAccount(o[0]);
   checkServiceAccount(o[1]);
@@ -1687,18 +1743,19 @@
   buildCounterInstance++;
   if (buildCounterInstance < 3) {
     o.canIpForward = true;
+    o.cpuPlatform = "foo";
     o.creationTimestamp = "foo";
     o.description = "foo";
-    o.disks = buildUnnamed1268();
+    o.disks = buildUnnamed483();
     o.id = "foo";
     o.kind = "foo";
     o.machineType = "foo";
     o.metadata = buildMetadata();
     o.name = "foo";
-    o.networkInterfaces = buildUnnamed1269();
+    o.networkInterfaces = buildUnnamed484();
     o.scheduling = buildScheduling();
     o.selfLink = "foo";
-    o.serviceAccounts = buildUnnamed1270();
+    o.serviceAccounts = buildUnnamed485();
     o.status = "foo";
     o.statusMessage = "foo";
     o.tags = buildTags();
@@ -1712,18 +1769,19 @@
   buildCounterInstance++;
   if (buildCounterInstance < 3) {
     unittest.expect(o.canIpForward, unittest.isTrue);
+    unittest.expect(o.cpuPlatform, unittest.equals('foo'));
     unittest.expect(o.creationTimestamp, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed1268(o.disks);
+    checkUnnamed483(o.disks);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.machineType, unittest.equals('foo'));
     checkMetadata(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1269(o.networkInterfaces);
+    checkUnnamed484(o.networkInterfaces);
     checkScheduling(o.scheduling);
     unittest.expect(o.selfLink, unittest.equals('foo'));
-    checkUnnamed1270(o.serviceAccounts);
+    checkUnnamed485(o.serviceAccounts);
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.statusMessage, unittest.equals('foo'));
     checkTags(o.tags);
@@ -1732,14 +1790,14 @@
   buildCounterInstance--;
 }
 
-buildUnnamed1271() {
+buildUnnamed486() {
   var o = new core.Map<core.String, api.InstancesScopedList>();
   o["x"] = buildInstancesScopedList();
   o["y"] = buildInstancesScopedList();
   return o;
 }
 
-checkUnnamed1271(core.Map<core.String, api.InstancesScopedList> o) {
+checkUnnamed486(core.Map<core.String, api.InstancesScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstancesScopedList(o["x"]);
   checkInstancesScopedList(o["y"]);
@@ -1751,7 +1809,7 @@
   buildCounterInstanceAggregatedList++;
   if (buildCounterInstanceAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1271();
+    o.items = buildUnnamed486();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -1764,7 +1822,7 @@
   buildCounterInstanceAggregatedList++;
   if (buildCounterInstanceAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1271(o.items);
+    checkUnnamed486(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -1772,14 +1830,14 @@
   buildCounterInstanceAggregatedList--;
 }
 
-buildUnnamed1272() {
+buildUnnamed487() {
   var o = new core.List<api.Instance>();
   o.add(buildInstance());
   o.add(buildInstance());
   return o;
 }
 
-checkUnnamed1272(core.List<api.Instance> o) {
+checkUnnamed487(core.List<api.Instance> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstance(o[0]);
   checkInstance(o[1]);
@@ -1791,7 +1849,7 @@
   buildCounterInstanceList++;
   if (buildCounterInstanceList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1272();
+    o.items = buildUnnamed487();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -1804,7 +1862,7 @@
   buildCounterInstanceList++;
   if (buildCounterInstanceList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1272(o.items);
+    checkUnnamed487(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -1812,40 +1870,61 @@
   buildCounterInstanceList--;
 }
 
-buildUnnamed1273() {
+core.int buildCounterInstanceMoveRequest = 0;
+buildInstanceMoveRequest() {
+  var o = new api.InstanceMoveRequest();
+  buildCounterInstanceMoveRequest++;
+  if (buildCounterInstanceMoveRequest < 3) {
+    o.destinationZone = "foo";
+    o.targetInstance = "foo";
+  }
+  buildCounterInstanceMoveRequest--;
+  return o;
+}
+
+checkInstanceMoveRequest(api.InstanceMoveRequest o) {
+  buildCounterInstanceMoveRequest++;
+  if (buildCounterInstanceMoveRequest < 3) {
+    unittest.expect(o.destinationZone, unittest.equals('foo'));
+    unittest.expect(o.targetInstance, unittest.equals('foo'));
+  }
+  buildCounterInstanceMoveRequest--;
+}
+
+buildUnnamed488() {
   var o = new core.List<api.AttachedDisk>();
   o.add(buildAttachedDisk());
   o.add(buildAttachedDisk());
   return o;
 }
 
-checkUnnamed1273(core.List<api.AttachedDisk> o) {
+checkUnnamed488(core.List<api.AttachedDisk> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAttachedDisk(o[0]);
   checkAttachedDisk(o[1]);
 }
 
-buildUnnamed1274() {
+buildUnnamed489() {
   var o = new core.List<api.NetworkInterface>();
   o.add(buildNetworkInterface());
   o.add(buildNetworkInterface());
   return o;
 }
 
-checkUnnamed1274(core.List<api.NetworkInterface> o) {
+checkUnnamed489(core.List<api.NetworkInterface> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNetworkInterface(o[0]);
   checkNetworkInterface(o[1]);
 }
 
-buildUnnamed1275() {
+buildUnnamed490() {
   var o = new core.List<api.ServiceAccount>();
   o.add(buildServiceAccount());
   o.add(buildServiceAccount());
   return o;
 }
 
-checkUnnamed1275(core.List<api.ServiceAccount> o) {
+checkUnnamed490(core.List<api.ServiceAccount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkServiceAccount(o[0]);
   checkServiceAccount(o[1]);
@@ -1858,12 +1937,12 @@
   if (buildCounterInstanceProperties < 3) {
     o.canIpForward = true;
     o.description = "foo";
-    o.disks = buildUnnamed1273();
+    o.disks = buildUnnamed488();
     o.machineType = "foo";
     o.metadata = buildMetadata();
-    o.networkInterfaces = buildUnnamed1274();
+    o.networkInterfaces = buildUnnamed489();
     o.scheduling = buildScheduling();
-    o.serviceAccounts = buildUnnamed1275();
+    o.serviceAccounts = buildUnnamed490();
     o.tags = buildTags();
   }
   buildCounterInstanceProperties--;
@@ -1875,12 +1954,12 @@
   if (buildCounterInstanceProperties < 3) {
     unittest.expect(o.canIpForward, unittest.isTrue);
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed1273(o.disks);
+    checkUnnamed488(o.disks);
     unittest.expect(o.machineType, unittest.equals('foo'));
     checkMetadata(o.metadata);
-    checkUnnamed1274(o.networkInterfaces);
+    checkUnnamed489(o.networkInterfaces);
     checkScheduling(o.scheduling);
-    checkUnnamed1275(o.serviceAccounts);
+    checkUnnamed490(o.serviceAccounts);
     checkTags(o.tags);
   }
   buildCounterInstanceProperties--;
@@ -1936,14 +2015,14 @@
   buildCounterInstanceTemplate--;
 }
 
-buildUnnamed1276() {
+buildUnnamed491() {
   var o = new core.List<api.InstanceTemplate>();
   o.add(buildInstanceTemplate());
   o.add(buildInstanceTemplate());
   return o;
 }
 
-checkUnnamed1276(core.List<api.InstanceTemplate> o) {
+checkUnnamed491(core.List<api.InstanceTemplate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceTemplate(o[0]);
   checkInstanceTemplate(o[1]);
@@ -1955,7 +2034,7 @@
   buildCounterInstanceTemplateList++;
   if (buildCounterInstanceTemplateList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1276();
+    o.items = buildUnnamed491();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -1968,7 +2047,7 @@
   buildCounterInstanceTemplateList++;
   if (buildCounterInstanceTemplateList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1276(o.items);
+    checkUnnamed491(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -1976,14 +2055,14 @@
   buildCounterInstanceTemplateList--;
 }
 
-buildUnnamed1277() {
+buildUnnamed492() {
   var o = new core.List<api.Instance>();
   o.add(buildInstance());
   o.add(buildInstance());
   return o;
 }
 
-checkUnnamed1277(core.List<api.Instance> o) {
+checkUnnamed492(core.List<api.Instance> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstance(o[0]);
   checkInstance(o[1]);
@@ -2010,14 +2089,14 @@
   buildCounterInstancesScopedListWarningData--;
 }
 
-buildUnnamed1278() {
+buildUnnamed493() {
   var o = new core.List<api.InstancesScopedListWarningData>();
   o.add(buildInstancesScopedListWarningData());
   o.add(buildInstancesScopedListWarningData());
   return o;
 }
 
-checkUnnamed1278(core.List<api.InstancesScopedListWarningData> o) {
+checkUnnamed493(core.List<api.InstancesScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstancesScopedListWarningData(o[0]);
   checkInstancesScopedListWarningData(o[1]);
@@ -2029,7 +2108,7 @@
   buildCounterInstancesScopedListWarning++;
   if (buildCounterInstancesScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed1278();
+    o.data = buildUnnamed493();
     o.message = "foo";
   }
   buildCounterInstancesScopedListWarning--;
@@ -2040,7 +2119,7 @@
   buildCounterInstancesScopedListWarning++;
   if (buildCounterInstancesScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed1278(o.data);
+    checkUnnamed493(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterInstancesScopedListWarning--;
@@ -2051,7 +2130,7 @@
   var o = new api.InstancesScopedList();
   buildCounterInstancesScopedList++;
   if (buildCounterInstancesScopedList < 3) {
-    o.instances = buildUnnamed1277();
+    o.instances = buildUnnamed492();
     o.warning = buildInstancesScopedListWarning();
   }
   buildCounterInstancesScopedList--;
@@ -2061,7 +2140,7 @@
 checkInstancesScopedList(api.InstancesScopedList o) {
   buildCounterInstancesScopedList++;
   if (buildCounterInstancesScopedList < 3) {
-    checkUnnamed1277(o.instances);
+    checkUnnamed492(o.instances);
     checkInstancesScopedListWarning(o.warning);
   }
   buildCounterInstancesScopedList--;
@@ -2111,14 +2190,14 @@
   buildCounterMachineTypeScratchDisks--;
 }
 
-buildUnnamed1279() {
+buildUnnamed494() {
   var o = new core.List<api.MachineTypeScratchDisks>();
   o.add(buildMachineTypeScratchDisks());
   o.add(buildMachineTypeScratchDisks());
   return o;
 }
 
-checkUnnamed1279(core.List<api.MachineTypeScratchDisks> o) {
+checkUnnamed494(core.List<api.MachineTypeScratchDisks> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMachineTypeScratchDisks(o[0]);
   checkMachineTypeScratchDisks(o[1]);
@@ -2140,7 +2219,7 @@
     o.maximumPersistentDisksSizeGb = "foo";
     o.memoryMb = 42;
     o.name = "foo";
-    o.scratchDisks = buildUnnamed1279();
+    o.scratchDisks = buildUnnamed494();
     o.selfLink = "foo";
     o.zone = "foo";
   }
@@ -2162,21 +2241,21 @@
     unittest.expect(o.maximumPersistentDisksSizeGb, unittest.equals('foo'));
     unittest.expect(o.memoryMb, unittest.equals(42));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1279(o.scratchDisks);
+    checkUnnamed494(o.scratchDisks);
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.zone, unittest.equals('foo'));
   }
   buildCounterMachineType--;
 }
 
-buildUnnamed1280() {
+buildUnnamed495() {
   var o = new core.Map<core.String, api.MachineTypesScopedList>();
   o["x"] = buildMachineTypesScopedList();
   o["y"] = buildMachineTypesScopedList();
   return o;
 }
 
-checkUnnamed1280(core.Map<core.String, api.MachineTypesScopedList> o) {
+checkUnnamed495(core.Map<core.String, api.MachineTypesScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMachineTypesScopedList(o["x"]);
   checkMachineTypesScopedList(o["y"]);
@@ -2188,7 +2267,7 @@
   buildCounterMachineTypeAggregatedList++;
   if (buildCounterMachineTypeAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1280();
+    o.items = buildUnnamed495();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -2201,7 +2280,7 @@
   buildCounterMachineTypeAggregatedList++;
   if (buildCounterMachineTypeAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1280(o.items);
+    checkUnnamed495(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -2209,14 +2288,14 @@
   buildCounterMachineTypeAggregatedList--;
 }
 
-buildUnnamed1281() {
+buildUnnamed496() {
   var o = new core.List<api.MachineType>();
   o.add(buildMachineType());
   o.add(buildMachineType());
   return o;
 }
 
-checkUnnamed1281(core.List<api.MachineType> o) {
+checkUnnamed496(core.List<api.MachineType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMachineType(o[0]);
   checkMachineType(o[1]);
@@ -2228,7 +2307,7 @@
   buildCounterMachineTypeList++;
   if (buildCounterMachineTypeList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1281();
+    o.items = buildUnnamed496();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -2241,7 +2320,7 @@
   buildCounterMachineTypeList++;
   if (buildCounterMachineTypeList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1281(o.items);
+    checkUnnamed496(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -2249,14 +2328,14 @@
   buildCounterMachineTypeList--;
 }
 
-buildUnnamed1282() {
+buildUnnamed497() {
   var o = new core.List<api.MachineType>();
   o.add(buildMachineType());
   o.add(buildMachineType());
   return o;
 }
 
-checkUnnamed1282(core.List<api.MachineType> o) {
+checkUnnamed497(core.List<api.MachineType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMachineType(o[0]);
   checkMachineType(o[1]);
@@ -2283,14 +2362,14 @@
   buildCounterMachineTypesScopedListWarningData--;
 }
 
-buildUnnamed1283() {
+buildUnnamed498() {
   var o = new core.List<api.MachineTypesScopedListWarningData>();
   o.add(buildMachineTypesScopedListWarningData());
   o.add(buildMachineTypesScopedListWarningData());
   return o;
 }
 
-checkUnnamed1283(core.List<api.MachineTypesScopedListWarningData> o) {
+checkUnnamed498(core.List<api.MachineTypesScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMachineTypesScopedListWarningData(o[0]);
   checkMachineTypesScopedListWarningData(o[1]);
@@ -2302,7 +2381,7 @@
   buildCounterMachineTypesScopedListWarning++;
   if (buildCounterMachineTypesScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed1283();
+    o.data = buildUnnamed498();
     o.message = "foo";
   }
   buildCounterMachineTypesScopedListWarning--;
@@ -2313,7 +2392,7 @@
   buildCounterMachineTypesScopedListWarning++;
   if (buildCounterMachineTypesScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed1283(o.data);
+    checkUnnamed498(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterMachineTypesScopedListWarning--;
@@ -2324,7 +2403,7 @@
   var o = new api.MachineTypesScopedList();
   buildCounterMachineTypesScopedList++;
   if (buildCounterMachineTypesScopedList < 3) {
-    o.machineTypes = buildUnnamed1282();
+    o.machineTypes = buildUnnamed497();
     o.warning = buildMachineTypesScopedListWarning();
   }
   buildCounterMachineTypesScopedList--;
@@ -2334,7 +2413,7 @@
 checkMachineTypesScopedList(api.MachineTypesScopedList o) {
   buildCounterMachineTypesScopedList++;
   if (buildCounterMachineTypesScopedList < 3) {
-    checkUnnamed1282(o.machineTypes);
+    checkUnnamed497(o.machineTypes);
     checkMachineTypesScopedListWarning(o.warning);
   }
   buildCounterMachineTypesScopedList--;
@@ -2361,14 +2440,14 @@
   buildCounterMetadataItems--;
 }
 
-buildUnnamed1284() {
+buildUnnamed499() {
   var o = new core.List<api.MetadataItems>();
   o.add(buildMetadataItems());
   o.add(buildMetadataItems());
   return o;
 }
 
-checkUnnamed1284(core.List<api.MetadataItems> o) {
+checkUnnamed499(core.List<api.MetadataItems> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetadataItems(o[0]);
   checkMetadataItems(o[1]);
@@ -2380,7 +2459,7 @@
   buildCounterMetadata++;
   if (buildCounterMetadata < 3) {
     o.fingerprint = "foo";
-    o.items = buildUnnamed1284();
+    o.items = buildUnnamed499();
     o.kind = "foo";
   }
   buildCounterMetadata--;
@@ -2391,7 +2470,7 @@
   buildCounterMetadata++;
   if (buildCounterMetadata < 3) {
     unittest.expect(o.fingerprint, unittest.equals('foo'));
-    checkUnnamed1284(o.items);
+    checkUnnamed499(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterMetadata--;
@@ -2430,14 +2509,14 @@
   buildCounterNetwork--;
 }
 
-buildUnnamed1285() {
+buildUnnamed500() {
   var o = new core.List<api.AccessConfig>();
   o.add(buildAccessConfig());
   o.add(buildAccessConfig());
   return o;
 }
 
-checkUnnamed1285(core.List<api.AccessConfig> o) {
+checkUnnamed500(core.List<api.AccessConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccessConfig(o[0]);
   checkAccessConfig(o[1]);
@@ -2448,7 +2527,7 @@
   var o = new api.NetworkInterface();
   buildCounterNetworkInterface++;
   if (buildCounterNetworkInterface < 3) {
-    o.accessConfigs = buildUnnamed1285();
+    o.accessConfigs = buildUnnamed500();
     o.name = "foo";
     o.network = "foo";
     o.networkIP = "foo";
@@ -2460,7 +2539,7 @@
 checkNetworkInterface(api.NetworkInterface o) {
   buildCounterNetworkInterface++;
   if (buildCounterNetworkInterface < 3) {
-    checkUnnamed1285(o.accessConfigs);
+    checkUnnamed500(o.accessConfigs);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.network, unittest.equals('foo'));
     unittest.expect(o.networkIP, unittest.equals('foo'));
@@ -2468,14 +2547,14 @@
   buildCounterNetworkInterface--;
 }
 
-buildUnnamed1286() {
+buildUnnamed501() {
   var o = new core.List<api.Network>();
   o.add(buildNetwork());
   o.add(buildNetwork());
   return o;
 }
 
-checkUnnamed1286(core.List<api.Network> o) {
+checkUnnamed501(core.List<api.Network> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNetwork(o[0]);
   checkNetwork(o[1]);
@@ -2487,7 +2566,7 @@
   buildCounterNetworkList++;
   if (buildCounterNetworkList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1286();
+    o.items = buildUnnamed501();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -2500,7 +2579,7 @@
   buildCounterNetworkList++;
   if (buildCounterNetworkList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1286(o.items);
+    checkUnnamed501(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -2531,14 +2610,14 @@
   buildCounterOperationErrorErrors--;
 }
 
-buildUnnamed1287() {
+buildUnnamed502() {
   var o = new core.List<api.OperationErrorErrors>();
   o.add(buildOperationErrorErrors());
   o.add(buildOperationErrorErrors());
   return o;
 }
 
-checkUnnamed1287(core.List<api.OperationErrorErrors> o) {
+checkUnnamed502(core.List<api.OperationErrorErrors> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationErrorErrors(o[0]);
   checkOperationErrorErrors(o[1]);
@@ -2549,7 +2628,7 @@
   var o = new api.OperationError();
   buildCounterOperationError++;
   if (buildCounterOperationError < 3) {
-    o.errors = buildUnnamed1287();
+    o.errors = buildUnnamed502();
   }
   buildCounterOperationError--;
   return o;
@@ -2558,7 +2637,7 @@
 checkOperationError(api.OperationError o) {
   buildCounterOperationError++;
   if (buildCounterOperationError < 3) {
-    checkUnnamed1287(o.errors);
+    checkUnnamed502(o.errors);
   }
   buildCounterOperationError--;
 }
@@ -2584,14 +2663,14 @@
   buildCounterOperationWarningsData--;
 }
 
-buildUnnamed1288() {
+buildUnnamed503() {
   var o = new core.List<api.OperationWarningsData>();
   o.add(buildOperationWarningsData());
   o.add(buildOperationWarningsData());
   return o;
 }
 
-checkUnnamed1288(core.List<api.OperationWarningsData> o) {
+checkUnnamed503(core.List<api.OperationWarningsData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationWarningsData(o[0]);
   checkOperationWarningsData(o[1]);
@@ -2603,7 +2682,7 @@
   buildCounterOperationWarnings++;
   if (buildCounterOperationWarnings < 3) {
     o.code = "foo";
-    o.data = buildUnnamed1288();
+    o.data = buildUnnamed503();
     o.message = "foo";
   }
   buildCounterOperationWarnings--;
@@ -2614,20 +2693,20 @@
   buildCounterOperationWarnings++;
   if (buildCounterOperationWarnings < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed1288(o.data);
+    checkUnnamed503(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterOperationWarnings--;
 }
 
-buildUnnamed1289() {
+buildUnnamed504() {
   var o = new core.List<api.OperationWarnings>();
   o.add(buildOperationWarnings());
   o.add(buildOperationWarnings());
   return o;
 }
 
-checkUnnamed1289(core.List<api.OperationWarnings> o) {
+checkUnnamed504(core.List<api.OperationWarnings> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationWarnings(o[0]);
   checkOperationWarnings(o[1]);
@@ -2658,7 +2737,7 @@
     o.targetId = "foo";
     o.targetLink = "foo";
     o.user = "foo";
-    o.warnings = buildUnnamed1289();
+    o.warnings = buildUnnamed504();
     o.zone = "foo";
   }
   buildCounterOperation--;
@@ -2688,20 +2767,20 @@
     unittest.expect(o.targetId, unittest.equals('foo'));
     unittest.expect(o.targetLink, unittest.equals('foo'));
     unittest.expect(o.user, unittest.equals('foo'));
-    checkUnnamed1289(o.warnings);
+    checkUnnamed504(o.warnings);
     unittest.expect(o.zone, unittest.equals('foo'));
   }
   buildCounterOperation--;
 }
 
-buildUnnamed1290() {
+buildUnnamed505() {
   var o = new core.Map<core.String, api.OperationsScopedList>();
   o["x"] = buildOperationsScopedList();
   o["y"] = buildOperationsScopedList();
   return o;
 }
 
-checkUnnamed1290(core.Map<core.String, api.OperationsScopedList> o) {
+checkUnnamed505(core.Map<core.String, api.OperationsScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationsScopedList(o["x"]);
   checkOperationsScopedList(o["y"]);
@@ -2713,7 +2792,7 @@
   buildCounterOperationAggregatedList++;
   if (buildCounterOperationAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1290();
+    o.items = buildUnnamed505();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -2726,7 +2805,7 @@
   buildCounterOperationAggregatedList++;
   if (buildCounterOperationAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1290(o.items);
+    checkUnnamed505(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -2734,14 +2813,14 @@
   buildCounterOperationAggregatedList--;
 }
 
-buildUnnamed1291() {
+buildUnnamed506() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed1291(core.List<api.Operation> o) {
+checkUnnamed506(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -2753,7 +2832,7 @@
   buildCounterOperationList++;
   if (buildCounterOperationList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1291();
+    o.items = buildUnnamed506();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -2766,7 +2845,7 @@
   buildCounterOperationList++;
   if (buildCounterOperationList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1291(o.items);
+    checkUnnamed506(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -2774,14 +2853,14 @@
   buildCounterOperationList--;
 }
 
-buildUnnamed1292() {
+buildUnnamed507() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed1292(core.List<api.Operation> o) {
+checkUnnamed507(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -2808,14 +2887,14 @@
   buildCounterOperationsScopedListWarningData--;
 }
 
-buildUnnamed1293() {
+buildUnnamed508() {
   var o = new core.List<api.OperationsScopedListWarningData>();
   o.add(buildOperationsScopedListWarningData());
   o.add(buildOperationsScopedListWarningData());
   return o;
 }
 
-checkUnnamed1293(core.List<api.OperationsScopedListWarningData> o) {
+checkUnnamed508(core.List<api.OperationsScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationsScopedListWarningData(o[0]);
   checkOperationsScopedListWarningData(o[1]);
@@ -2827,7 +2906,7 @@
   buildCounterOperationsScopedListWarning++;
   if (buildCounterOperationsScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed1293();
+    o.data = buildUnnamed508();
     o.message = "foo";
   }
   buildCounterOperationsScopedListWarning--;
@@ -2838,7 +2917,7 @@
   buildCounterOperationsScopedListWarning++;
   if (buildCounterOperationsScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed1293(o.data);
+    checkUnnamed508(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterOperationsScopedListWarning--;
@@ -2849,7 +2928,7 @@
   var o = new api.OperationsScopedList();
   buildCounterOperationsScopedList++;
   if (buildCounterOperationsScopedList < 3) {
-    o.operations = buildUnnamed1292();
+    o.operations = buildUnnamed507();
     o.warning = buildOperationsScopedListWarning();
   }
   buildCounterOperationsScopedList--;
@@ -2859,20 +2938,20 @@
 checkOperationsScopedList(api.OperationsScopedList o) {
   buildCounterOperationsScopedList++;
   if (buildCounterOperationsScopedList < 3) {
-    checkUnnamed1292(o.operations);
+    checkUnnamed507(o.operations);
     checkOperationsScopedListWarning(o.warning);
   }
   buildCounterOperationsScopedList--;
 }
 
-buildUnnamed1294() {
+buildUnnamed509() {
   var o = new core.List<api.PathRule>();
   o.add(buildPathRule());
   o.add(buildPathRule());
   return o;
 }
 
-checkUnnamed1294(core.List<api.PathRule> o) {
+checkUnnamed509(core.List<api.PathRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPathRule(o[0]);
   checkPathRule(o[1]);
@@ -2886,7 +2965,7 @@
     o.defaultService = "foo";
     o.description = "foo";
     o.name = "foo";
-    o.pathRules = buildUnnamed1294();
+    o.pathRules = buildUnnamed509();
   }
   buildCounterPathMatcher--;
   return o;
@@ -2898,19 +2977,19 @@
     unittest.expect(o.defaultService, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1294(o.pathRules);
+    checkUnnamed509(o.pathRules);
   }
   buildCounterPathMatcher--;
 }
 
-buildUnnamed1295() {
+buildUnnamed510() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1295(core.List<core.String> o) {
+checkUnnamed510(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2921,7 +3000,7 @@
   var o = new api.PathRule();
   buildCounterPathRule++;
   if (buildCounterPathRule < 3) {
-    o.paths = buildUnnamed1295();
+    o.paths = buildUnnamed510();
     o.service = "foo";
   }
   buildCounterPathRule--;
@@ -2931,20 +3010,20 @@
 checkPathRule(api.PathRule o) {
   buildCounterPathRule++;
   if (buildCounterPathRule < 3) {
-    checkUnnamed1295(o.paths);
+    checkUnnamed510(o.paths);
     unittest.expect(o.service, unittest.equals('foo'));
   }
   buildCounterPathRule--;
 }
 
-buildUnnamed1296() {
+buildUnnamed511() {
   var o = new core.List<api.Quota>();
   o.add(buildQuota());
   o.add(buildQuota());
   return o;
 }
 
-checkUnnamed1296(core.List<api.Quota> o) {
+checkUnnamed511(core.List<api.Quota> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuota(o[0]);
   checkQuota(o[1]);
@@ -2961,7 +3040,7 @@
     o.id = "foo";
     o.kind = "foo";
     o.name = "foo";
-    o.quotas = buildUnnamed1296();
+    o.quotas = buildUnnamed511();
     o.selfLink = "foo";
     o.usageExportLocation = buildUsageExportLocation();
   }
@@ -2978,7 +3057,7 @@
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1296(o.quotas);
+    checkUnnamed511(o.quotas);
     unittest.expect(o.selfLink, unittest.equals('foo'));
     checkUsageExportLocation(o.usageExportLocation);
   }
@@ -3008,27 +3087,27 @@
   buildCounterQuota--;
 }
 
-buildUnnamed1297() {
+buildUnnamed512() {
   var o = new core.List<api.Quota>();
   o.add(buildQuota());
   o.add(buildQuota());
   return o;
 }
 
-checkUnnamed1297(core.List<api.Quota> o) {
+checkUnnamed512(core.List<api.Quota> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuota(o[0]);
   checkQuota(o[1]);
 }
 
-buildUnnamed1298() {
+buildUnnamed513() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1298(core.List<core.String> o) {
+checkUnnamed513(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3045,10 +3124,10 @@
     o.id = "foo";
     o.kind = "foo";
     o.name = "foo";
-    o.quotas = buildUnnamed1297();
+    o.quotas = buildUnnamed512();
     o.selfLink = "foo";
     o.status = "foo";
-    o.zones = buildUnnamed1298();
+    o.zones = buildUnnamed513();
   }
   buildCounterRegion--;
   return o;
@@ -3063,22 +3142,22 @@
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1297(o.quotas);
+    checkUnnamed512(o.quotas);
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
-    checkUnnamed1298(o.zones);
+    checkUnnamed513(o.zones);
   }
   buildCounterRegion--;
 }
 
-buildUnnamed1299() {
+buildUnnamed514() {
   var o = new core.List<api.Region>();
   o.add(buildRegion());
   o.add(buildRegion());
   return o;
 }
 
-checkUnnamed1299(core.List<api.Region> o) {
+checkUnnamed514(core.List<api.Region> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRegion(o[0]);
   checkRegion(o[1]);
@@ -3090,7 +3169,7 @@
   buildCounterRegionList++;
   if (buildCounterRegionList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1299();
+    o.items = buildUnnamed514();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -3103,7 +3182,7 @@
   buildCounterRegionList++;
   if (buildCounterRegionList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1299(o.items);
+    checkUnnamed514(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -3130,14 +3209,14 @@
   buildCounterResourceGroupReference--;
 }
 
-buildUnnamed1300() {
+buildUnnamed515() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1300(core.List<core.String> o) {
+checkUnnamed515(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3164,14 +3243,14 @@
   buildCounterRouteWarningsData--;
 }
 
-buildUnnamed1301() {
+buildUnnamed516() {
   var o = new core.List<api.RouteWarningsData>();
   o.add(buildRouteWarningsData());
   o.add(buildRouteWarningsData());
   return o;
 }
 
-checkUnnamed1301(core.List<api.RouteWarningsData> o) {
+checkUnnamed516(core.List<api.RouteWarningsData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRouteWarningsData(o[0]);
   checkRouteWarningsData(o[1]);
@@ -3183,7 +3262,7 @@
   buildCounterRouteWarnings++;
   if (buildCounterRouteWarnings < 3) {
     o.code = "foo";
-    o.data = buildUnnamed1301();
+    o.data = buildUnnamed516();
     o.message = "foo";
   }
   buildCounterRouteWarnings--;
@@ -3194,20 +3273,20 @@
   buildCounterRouteWarnings++;
   if (buildCounterRouteWarnings < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed1301(o.data);
+    checkUnnamed516(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterRouteWarnings--;
 }
 
-buildUnnamed1302() {
+buildUnnamed517() {
   var o = new core.List<api.RouteWarnings>();
   o.add(buildRouteWarnings());
   o.add(buildRouteWarnings());
   return o;
 }
 
-checkUnnamed1302(core.List<api.RouteWarnings> o) {
+checkUnnamed517(core.List<api.RouteWarnings> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRouteWarnings(o[0]);
   checkRouteWarnings(o[1]);
@@ -3229,10 +3308,11 @@
     o.nextHopInstance = "foo";
     o.nextHopIp = "foo";
     o.nextHopNetwork = "foo";
+    o.nextHopVpnTunnel = "foo";
     o.priority = 42;
     o.selfLink = "foo";
-    o.tags = buildUnnamed1300();
-    o.warnings = buildUnnamed1302();
+    o.tags = buildUnnamed515();
+    o.warnings = buildUnnamed517();
   }
   buildCounterRoute--;
   return o;
@@ -3252,22 +3332,23 @@
     unittest.expect(o.nextHopInstance, unittest.equals('foo'));
     unittest.expect(o.nextHopIp, unittest.equals('foo'));
     unittest.expect(o.nextHopNetwork, unittest.equals('foo'));
+    unittest.expect(o.nextHopVpnTunnel, unittest.equals('foo'));
     unittest.expect(o.priority, unittest.equals(42));
     unittest.expect(o.selfLink, unittest.equals('foo'));
-    checkUnnamed1300(o.tags);
-    checkUnnamed1302(o.warnings);
+    checkUnnamed515(o.tags);
+    checkUnnamed517(o.warnings);
   }
   buildCounterRoute--;
 }
 
-buildUnnamed1303() {
+buildUnnamed518() {
   var o = new core.List<api.Route>();
   o.add(buildRoute());
   o.add(buildRoute());
   return o;
 }
 
-checkUnnamed1303(core.List<api.Route> o) {
+checkUnnamed518(core.List<api.Route> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRoute(o[0]);
   checkRoute(o[1]);
@@ -3279,7 +3360,7 @@
   buildCounterRouteList++;
   if (buildCounterRouteList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1303();
+    o.items = buildUnnamed518();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -3292,7 +3373,7 @@
   buildCounterRouteList++;
   if (buildCounterRouteList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1303(o.items);
+    checkUnnamed518(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -3344,14 +3425,14 @@
   buildCounterSerialPortOutput--;
 }
 
-buildUnnamed1304() {
+buildUnnamed519() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1304(core.List<core.String> o) {
+checkUnnamed519(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3363,7 +3444,7 @@
   buildCounterServiceAccount++;
   if (buildCounterServiceAccount < 3) {
     o.email = "foo";
-    o.scopes = buildUnnamed1304();
+    o.scopes = buildUnnamed519();
   }
   buildCounterServiceAccount--;
   return o;
@@ -3373,19 +3454,19 @@
   buildCounterServiceAccount++;
   if (buildCounterServiceAccount < 3) {
     unittest.expect(o.email, unittest.equals('foo'));
-    checkUnnamed1304(o.scopes);
+    checkUnnamed519(o.scopes);
   }
   buildCounterServiceAccount--;
 }
 
-buildUnnamed1305() {
+buildUnnamed520() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1305(core.List<core.String> o) {
+checkUnnamed520(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3401,7 +3482,7 @@
     o.diskSizeGb = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.licenses = buildUnnamed1305();
+    o.licenses = buildUnnamed520();
     o.name = "foo";
     o.selfLink = "foo";
     o.sourceDisk = "foo";
@@ -3422,7 +3503,7 @@
     unittest.expect(o.diskSizeGb, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1305(o.licenses);
+    checkUnnamed520(o.licenses);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.sourceDisk, unittest.equals('foo'));
@@ -3434,14 +3515,14 @@
   buildCounterSnapshot--;
 }
 
-buildUnnamed1306() {
+buildUnnamed521() {
   var o = new core.List<api.Snapshot>();
   o.add(buildSnapshot());
   o.add(buildSnapshot());
   return o;
 }
 
-checkUnnamed1306(core.List<api.Snapshot> o) {
+checkUnnamed521(core.List<api.Snapshot> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSnapshot(o[0]);
   checkSnapshot(o[1]);
@@ -3453,7 +3534,7 @@
   buildCounterSnapshotList++;
   if (buildCounterSnapshotList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1306();
+    o.items = buildUnnamed521();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -3466,7 +3547,7 @@
   buildCounterSnapshotList++;
   if (buildCounterSnapshotList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1306(o.items);
+    checkUnnamed521(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -3474,14 +3555,14 @@
   buildCounterSnapshotList--;
 }
 
-buildUnnamed1307() {
+buildUnnamed522() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1307(core.List<core.String> o) {
+checkUnnamed522(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3493,7 +3574,7 @@
   buildCounterTags++;
   if (buildCounterTags < 3) {
     o.fingerprint = "foo";
-    o.items = buildUnnamed1307();
+    o.items = buildUnnamed522();
   }
   buildCounterTags--;
   return o;
@@ -3503,7 +3584,7 @@
   buildCounterTags++;
   if (buildCounterTags < 3) {
     unittest.expect(o.fingerprint, unittest.equals('foo'));
-    checkUnnamed1307(o.items);
+    checkUnnamed522(o.items);
   }
   buildCounterTags--;
 }
@@ -3539,14 +3620,14 @@
   buildCounterTargetHttpProxy--;
 }
 
-buildUnnamed1308() {
+buildUnnamed523() {
   var o = new core.List<api.TargetHttpProxy>();
   o.add(buildTargetHttpProxy());
   o.add(buildTargetHttpProxy());
   return o;
 }
 
-checkUnnamed1308(core.List<api.TargetHttpProxy> o) {
+checkUnnamed523(core.List<api.TargetHttpProxy> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetHttpProxy(o[0]);
   checkTargetHttpProxy(o[1]);
@@ -3558,7 +3639,7 @@
   buildCounterTargetHttpProxyList++;
   if (buildCounterTargetHttpProxyList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1308();
+    o.items = buildUnnamed523();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -3571,7 +3652,7 @@
   buildCounterTargetHttpProxyList++;
   if (buildCounterTargetHttpProxyList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1308(o.items);
+    checkUnnamed523(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -3614,14 +3695,14 @@
   buildCounterTargetInstance--;
 }
 
-buildUnnamed1309() {
+buildUnnamed524() {
   var o = new core.Map<core.String, api.TargetInstancesScopedList>();
   o["x"] = buildTargetInstancesScopedList();
   o["y"] = buildTargetInstancesScopedList();
   return o;
 }
 
-checkUnnamed1309(core.Map<core.String, api.TargetInstancesScopedList> o) {
+checkUnnamed524(core.Map<core.String, api.TargetInstancesScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetInstancesScopedList(o["x"]);
   checkTargetInstancesScopedList(o["y"]);
@@ -3633,7 +3714,7 @@
   buildCounterTargetInstanceAggregatedList++;
   if (buildCounterTargetInstanceAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1309();
+    o.items = buildUnnamed524();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -3646,7 +3727,7 @@
   buildCounterTargetInstanceAggregatedList++;
   if (buildCounterTargetInstanceAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1309(o.items);
+    checkUnnamed524(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -3654,14 +3735,14 @@
   buildCounterTargetInstanceAggregatedList--;
 }
 
-buildUnnamed1310() {
+buildUnnamed525() {
   var o = new core.List<api.TargetInstance>();
   o.add(buildTargetInstance());
   o.add(buildTargetInstance());
   return o;
 }
 
-checkUnnamed1310(core.List<api.TargetInstance> o) {
+checkUnnamed525(core.List<api.TargetInstance> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetInstance(o[0]);
   checkTargetInstance(o[1]);
@@ -3673,7 +3754,7 @@
   buildCounterTargetInstanceList++;
   if (buildCounterTargetInstanceList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1310();
+    o.items = buildUnnamed525();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -3686,7 +3767,7 @@
   buildCounterTargetInstanceList++;
   if (buildCounterTargetInstanceList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1310(o.items);
+    checkUnnamed525(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -3694,14 +3775,14 @@
   buildCounterTargetInstanceList--;
 }
 
-buildUnnamed1311() {
+buildUnnamed526() {
   var o = new core.List<api.TargetInstance>();
   o.add(buildTargetInstance());
   o.add(buildTargetInstance());
   return o;
 }
 
-checkUnnamed1311(core.List<api.TargetInstance> o) {
+checkUnnamed526(core.List<api.TargetInstance> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetInstance(o[0]);
   checkTargetInstance(o[1]);
@@ -3728,14 +3809,14 @@
   buildCounterTargetInstancesScopedListWarningData--;
 }
 
-buildUnnamed1312() {
+buildUnnamed527() {
   var o = new core.List<api.TargetInstancesScopedListWarningData>();
   o.add(buildTargetInstancesScopedListWarningData());
   o.add(buildTargetInstancesScopedListWarningData());
   return o;
 }
 
-checkUnnamed1312(core.List<api.TargetInstancesScopedListWarningData> o) {
+checkUnnamed527(core.List<api.TargetInstancesScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetInstancesScopedListWarningData(o[0]);
   checkTargetInstancesScopedListWarningData(o[1]);
@@ -3747,7 +3828,7 @@
   buildCounterTargetInstancesScopedListWarning++;
   if (buildCounterTargetInstancesScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed1312();
+    o.data = buildUnnamed527();
     o.message = "foo";
   }
   buildCounterTargetInstancesScopedListWarning--;
@@ -3758,7 +3839,7 @@
   buildCounterTargetInstancesScopedListWarning++;
   if (buildCounterTargetInstancesScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed1312(o.data);
+    checkUnnamed527(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterTargetInstancesScopedListWarning--;
@@ -3769,7 +3850,7 @@
   var o = new api.TargetInstancesScopedList();
   buildCounterTargetInstancesScopedList++;
   if (buildCounterTargetInstancesScopedList < 3) {
-    o.targetInstances = buildUnnamed1311();
+    o.targetInstances = buildUnnamed526();
     o.warning = buildTargetInstancesScopedListWarning();
   }
   buildCounterTargetInstancesScopedList--;
@@ -3779,33 +3860,33 @@
 checkTargetInstancesScopedList(api.TargetInstancesScopedList o) {
   buildCounterTargetInstancesScopedList++;
   if (buildCounterTargetInstancesScopedList < 3) {
-    checkUnnamed1311(o.targetInstances);
+    checkUnnamed526(o.targetInstances);
     checkTargetInstancesScopedListWarning(o.warning);
   }
   buildCounterTargetInstancesScopedList--;
 }
 
-buildUnnamed1313() {
+buildUnnamed528() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1313(core.List<core.String> o) {
+checkUnnamed528(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1314() {
+buildUnnamed529() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1314(core.List<core.String> o) {
+checkUnnamed529(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3820,9 +3901,9 @@
     o.creationTimestamp = "foo";
     o.description = "foo";
     o.failoverRatio = 42.0;
-    o.healthChecks = buildUnnamed1313();
+    o.healthChecks = buildUnnamed528();
     o.id = "foo";
-    o.instances = buildUnnamed1314();
+    o.instances = buildUnnamed529();
     o.kind = "foo";
     o.name = "foo";
     o.region = "foo";
@@ -3840,9 +3921,9 @@
     unittest.expect(o.creationTimestamp, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.failoverRatio, unittest.equals(42.0));
-    checkUnnamed1313(o.healthChecks);
+    checkUnnamed528(o.healthChecks);
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1314(o.instances);
+    checkUnnamed529(o.instances);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.region, unittest.equals('foo'));
@@ -3852,14 +3933,14 @@
   buildCounterTargetPool--;
 }
 
-buildUnnamed1315() {
+buildUnnamed530() {
   var o = new core.Map<core.String, api.TargetPoolsScopedList>();
   o["x"] = buildTargetPoolsScopedList();
   o["y"] = buildTargetPoolsScopedList();
   return o;
 }
 
-checkUnnamed1315(core.Map<core.String, api.TargetPoolsScopedList> o) {
+checkUnnamed530(core.Map<core.String, api.TargetPoolsScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetPoolsScopedList(o["x"]);
   checkTargetPoolsScopedList(o["y"]);
@@ -3871,7 +3952,7 @@
   buildCounterTargetPoolAggregatedList++;
   if (buildCounterTargetPoolAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1315();
+    o.items = buildUnnamed530();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -3884,7 +3965,7 @@
   buildCounterTargetPoolAggregatedList++;
   if (buildCounterTargetPoolAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1315(o.items);
+    checkUnnamed530(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -3892,14 +3973,14 @@
   buildCounterTargetPoolAggregatedList--;
 }
 
-buildUnnamed1316() {
+buildUnnamed531() {
   var o = new core.List<api.HealthStatus>();
   o.add(buildHealthStatus());
   o.add(buildHealthStatus());
   return o;
 }
 
-checkUnnamed1316(core.List<api.HealthStatus> o) {
+checkUnnamed531(core.List<api.HealthStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHealthStatus(o[0]);
   checkHealthStatus(o[1]);
@@ -3910,7 +3991,7 @@
   var o = new api.TargetPoolInstanceHealth();
   buildCounterTargetPoolInstanceHealth++;
   if (buildCounterTargetPoolInstanceHealth < 3) {
-    o.healthStatus = buildUnnamed1316();
+    o.healthStatus = buildUnnamed531();
     o.kind = "foo";
   }
   buildCounterTargetPoolInstanceHealth--;
@@ -3920,20 +4001,20 @@
 checkTargetPoolInstanceHealth(api.TargetPoolInstanceHealth o) {
   buildCounterTargetPoolInstanceHealth++;
   if (buildCounterTargetPoolInstanceHealth < 3) {
-    checkUnnamed1316(o.healthStatus);
+    checkUnnamed531(o.healthStatus);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterTargetPoolInstanceHealth--;
 }
 
-buildUnnamed1317() {
+buildUnnamed532() {
   var o = new core.List<api.TargetPool>();
   o.add(buildTargetPool());
   o.add(buildTargetPool());
   return o;
 }
 
-checkUnnamed1317(core.List<api.TargetPool> o) {
+checkUnnamed532(core.List<api.TargetPool> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetPool(o[0]);
   checkTargetPool(o[1]);
@@ -3945,7 +4026,7 @@
   buildCounterTargetPoolList++;
   if (buildCounterTargetPoolList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1317();
+    o.items = buildUnnamed532();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -3958,7 +4039,7 @@
   buildCounterTargetPoolList++;
   if (buildCounterTargetPoolList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1317(o.items);
+    checkUnnamed532(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -3966,14 +4047,14 @@
   buildCounterTargetPoolList--;
 }
 
-buildUnnamed1318() {
+buildUnnamed533() {
   var o = new core.List<api.HealthCheckReference>();
   o.add(buildHealthCheckReference());
   o.add(buildHealthCheckReference());
   return o;
 }
 
-checkUnnamed1318(core.List<api.HealthCheckReference> o) {
+checkUnnamed533(core.List<api.HealthCheckReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHealthCheckReference(o[0]);
   checkHealthCheckReference(o[1]);
@@ -3984,7 +4065,7 @@
   var o = new api.TargetPoolsAddHealthCheckRequest();
   buildCounterTargetPoolsAddHealthCheckRequest++;
   if (buildCounterTargetPoolsAddHealthCheckRequest < 3) {
-    o.healthChecks = buildUnnamed1318();
+    o.healthChecks = buildUnnamed533();
   }
   buildCounterTargetPoolsAddHealthCheckRequest--;
   return o;
@@ -3993,19 +4074,19 @@
 checkTargetPoolsAddHealthCheckRequest(api.TargetPoolsAddHealthCheckRequest o) {
   buildCounterTargetPoolsAddHealthCheckRequest++;
   if (buildCounterTargetPoolsAddHealthCheckRequest < 3) {
-    checkUnnamed1318(o.healthChecks);
+    checkUnnamed533(o.healthChecks);
   }
   buildCounterTargetPoolsAddHealthCheckRequest--;
 }
 
-buildUnnamed1319() {
+buildUnnamed534() {
   var o = new core.List<api.InstanceReference>();
   o.add(buildInstanceReference());
   o.add(buildInstanceReference());
   return o;
 }
 
-checkUnnamed1319(core.List<api.InstanceReference> o) {
+checkUnnamed534(core.List<api.InstanceReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceReference(o[0]);
   checkInstanceReference(o[1]);
@@ -4016,7 +4097,7 @@
   var o = new api.TargetPoolsAddInstanceRequest();
   buildCounterTargetPoolsAddInstanceRequest++;
   if (buildCounterTargetPoolsAddInstanceRequest < 3) {
-    o.instances = buildUnnamed1319();
+    o.instances = buildUnnamed534();
   }
   buildCounterTargetPoolsAddInstanceRequest--;
   return o;
@@ -4025,19 +4106,19 @@
 checkTargetPoolsAddInstanceRequest(api.TargetPoolsAddInstanceRequest o) {
   buildCounterTargetPoolsAddInstanceRequest++;
   if (buildCounterTargetPoolsAddInstanceRequest < 3) {
-    checkUnnamed1319(o.instances);
+    checkUnnamed534(o.instances);
   }
   buildCounterTargetPoolsAddInstanceRequest--;
 }
 
-buildUnnamed1320() {
+buildUnnamed535() {
   var o = new core.List<api.HealthCheckReference>();
   o.add(buildHealthCheckReference());
   o.add(buildHealthCheckReference());
   return o;
 }
 
-checkUnnamed1320(core.List<api.HealthCheckReference> o) {
+checkUnnamed535(core.List<api.HealthCheckReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHealthCheckReference(o[0]);
   checkHealthCheckReference(o[1]);
@@ -4048,7 +4129,7 @@
   var o = new api.TargetPoolsRemoveHealthCheckRequest();
   buildCounterTargetPoolsRemoveHealthCheckRequest++;
   if (buildCounterTargetPoolsRemoveHealthCheckRequest < 3) {
-    o.healthChecks = buildUnnamed1320();
+    o.healthChecks = buildUnnamed535();
   }
   buildCounterTargetPoolsRemoveHealthCheckRequest--;
   return o;
@@ -4057,19 +4138,19 @@
 checkTargetPoolsRemoveHealthCheckRequest(api.TargetPoolsRemoveHealthCheckRequest o) {
   buildCounterTargetPoolsRemoveHealthCheckRequest++;
   if (buildCounterTargetPoolsRemoveHealthCheckRequest < 3) {
-    checkUnnamed1320(o.healthChecks);
+    checkUnnamed535(o.healthChecks);
   }
   buildCounterTargetPoolsRemoveHealthCheckRequest--;
 }
 
-buildUnnamed1321() {
+buildUnnamed536() {
   var o = new core.List<api.InstanceReference>();
   o.add(buildInstanceReference());
   o.add(buildInstanceReference());
   return o;
 }
 
-checkUnnamed1321(core.List<api.InstanceReference> o) {
+checkUnnamed536(core.List<api.InstanceReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceReference(o[0]);
   checkInstanceReference(o[1]);
@@ -4080,7 +4161,7 @@
   var o = new api.TargetPoolsRemoveInstanceRequest();
   buildCounterTargetPoolsRemoveInstanceRequest++;
   if (buildCounterTargetPoolsRemoveInstanceRequest < 3) {
-    o.instances = buildUnnamed1321();
+    o.instances = buildUnnamed536();
   }
   buildCounterTargetPoolsRemoveInstanceRequest--;
   return o;
@@ -4089,19 +4170,19 @@
 checkTargetPoolsRemoveInstanceRequest(api.TargetPoolsRemoveInstanceRequest o) {
   buildCounterTargetPoolsRemoveInstanceRequest++;
   if (buildCounterTargetPoolsRemoveInstanceRequest < 3) {
-    checkUnnamed1321(o.instances);
+    checkUnnamed536(o.instances);
   }
   buildCounterTargetPoolsRemoveInstanceRequest--;
 }
 
-buildUnnamed1322() {
+buildUnnamed537() {
   var o = new core.List<api.TargetPool>();
   o.add(buildTargetPool());
   o.add(buildTargetPool());
   return o;
 }
 
-checkUnnamed1322(core.List<api.TargetPool> o) {
+checkUnnamed537(core.List<api.TargetPool> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetPool(o[0]);
   checkTargetPool(o[1]);
@@ -4128,14 +4209,14 @@
   buildCounterTargetPoolsScopedListWarningData--;
 }
 
-buildUnnamed1323() {
+buildUnnamed538() {
   var o = new core.List<api.TargetPoolsScopedListWarningData>();
   o.add(buildTargetPoolsScopedListWarningData());
   o.add(buildTargetPoolsScopedListWarningData());
   return o;
 }
 
-checkUnnamed1323(core.List<api.TargetPoolsScopedListWarningData> o) {
+checkUnnamed538(core.List<api.TargetPoolsScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetPoolsScopedListWarningData(o[0]);
   checkTargetPoolsScopedListWarningData(o[1]);
@@ -4147,7 +4228,7 @@
   buildCounterTargetPoolsScopedListWarning++;
   if (buildCounterTargetPoolsScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed1323();
+    o.data = buildUnnamed538();
     o.message = "foo";
   }
   buildCounterTargetPoolsScopedListWarning--;
@@ -4158,7 +4239,7 @@
   buildCounterTargetPoolsScopedListWarning++;
   if (buildCounterTargetPoolsScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed1323(o.data);
+    checkUnnamed538(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterTargetPoolsScopedListWarning--;
@@ -4169,7 +4250,7 @@
   var o = new api.TargetPoolsScopedList();
   buildCounterTargetPoolsScopedList++;
   if (buildCounterTargetPoolsScopedList < 3) {
-    o.targetPools = buildUnnamed1322();
+    o.targetPools = buildUnnamed537();
     o.warning = buildTargetPoolsScopedListWarning();
   }
   buildCounterTargetPoolsScopedList--;
@@ -4179,7 +4260,7 @@
 checkTargetPoolsScopedList(api.TargetPoolsScopedList o) {
   buildCounterTargetPoolsScopedList++;
   if (buildCounterTargetPoolsScopedList < 3) {
-    checkUnnamed1322(o.targetPools);
+    checkUnnamed537(o.targetPools);
     checkTargetPoolsScopedListWarning(o.warning);
   }
   buildCounterTargetPoolsScopedList--;
@@ -4204,6 +4285,242 @@
   buildCounterTargetReference--;
 }
 
+buildUnnamed539() {
+  var o = new core.List<core.String>();
+  o.add("foo");
+  o.add("foo");
+  return o;
+}
+
+checkUnnamed539(core.List<core.String> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  unittest.expect(o[0], unittest.equals('foo'));
+  unittest.expect(o[1], unittest.equals('foo'));
+}
+
+buildUnnamed540() {
+  var o = new core.List<core.String>();
+  o.add("foo");
+  o.add("foo");
+  return o;
+}
+
+checkUnnamed540(core.List<core.String> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  unittest.expect(o[0], unittest.equals('foo'));
+  unittest.expect(o[1], unittest.equals('foo'));
+}
+
+core.int buildCounterTargetVpnGateway = 0;
+buildTargetVpnGateway() {
+  var o = new api.TargetVpnGateway();
+  buildCounterTargetVpnGateway++;
+  if (buildCounterTargetVpnGateway < 3) {
+    o.creationTimestamp = "foo";
+    o.description = "foo";
+    o.forwardingRules = buildUnnamed539();
+    o.id = "foo";
+    o.kind = "foo";
+    o.name = "foo";
+    o.network = "foo";
+    o.region = "foo";
+    o.selfLink = "foo";
+    o.status = "foo";
+    o.tunnels = buildUnnamed540();
+  }
+  buildCounterTargetVpnGateway--;
+  return o;
+}
+
+checkTargetVpnGateway(api.TargetVpnGateway o) {
+  buildCounterTargetVpnGateway++;
+  if (buildCounterTargetVpnGateway < 3) {
+    unittest.expect(o.creationTimestamp, unittest.equals('foo'));
+    unittest.expect(o.description, unittest.equals('foo'));
+    checkUnnamed539(o.forwardingRules);
+    unittest.expect(o.id, unittest.equals('foo'));
+    unittest.expect(o.kind, unittest.equals('foo'));
+    unittest.expect(o.name, unittest.equals('foo'));
+    unittest.expect(o.network, unittest.equals('foo'));
+    unittest.expect(o.region, unittest.equals('foo'));
+    unittest.expect(o.selfLink, unittest.equals('foo'));
+    unittest.expect(o.status, unittest.equals('foo'));
+    checkUnnamed540(o.tunnels);
+  }
+  buildCounterTargetVpnGateway--;
+}
+
+buildUnnamed541() {
+  var o = new core.Map<core.String, api.TargetVpnGatewaysScopedList>();
+  o["x"] = buildTargetVpnGatewaysScopedList();
+  o["y"] = buildTargetVpnGatewaysScopedList();
+  return o;
+}
+
+checkUnnamed541(core.Map<core.String, api.TargetVpnGatewaysScopedList> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkTargetVpnGatewaysScopedList(o["x"]);
+  checkTargetVpnGatewaysScopedList(o["y"]);
+}
+
+core.int buildCounterTargetVpnGatewayAggregatedList = 0;
+buildTargetVpnGatewayAggregatedList() {
+  var o = new api.TargetVpnGatewayAggregatedList();
+  buildCounterTargetVpnGatewayAggregatedList++;
+  if (buildCounterTargetVpnGatewayAggregatedList < 3) {
+    o.id = "foo";
+    o.items = buildUnnamed541();
+    o.kind = "foo";
+    o.nextPageToken = "foo";
+    o.selfLink = "foo";
+  }
+  buildCounterTargetVpnGatewayAggregatedList--;
+  return o;
+}
+
+checkTargetVpnGatewayAggregatedList(api.TargetVpnGatewayAggregatedList o) {
+  buildCounterTargetVpnGatewayAggregatedList++;
+  if (buildCounterTargetVpnGatewayAggregatedList < 3) {
+    unittest.expect(o.id, unittest.equals('foo'));
+    checkUnnamed541(o.items);
+    unittest.expect(o.kind, unittest.equals('foo'));
+    unittest.expect(o.nextPageToken, unittest.equals('foo'));
+    unittest.expect(o.selfLink, unittest.equals('foo'));
+  }
+  buildCounterTargetVpnGatewayAggregatedList--;
+}
+
+buildUnnamed542() {
+  var o = new core.List<api.TargetVpnGateway>();
+  o.add(buildTargetVpnGateway());
+  o.add(buildTargetVpnGateway());
+  return o;
+}
+
+checkUnnamed542(core.List<api.TargetVpnGateway> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkTargetVpnGateway(o[0]);
+  checkTargetVpnGateway(o[1]);
+}
+
+core.int buildCounterTargetVpnGatewayList = 0;
+buildTargetVpnGatewayList() {
+  var o = new api.TargetVpnGatewayList();
+  buildCounterTargetVpnGatewayList++;
+  if (buildCounterTargetVpnGatewayList < 3) {
+    o.id = "foo";
+    o.items = buildUnnamed542();
+    o.kind = "foo";
+    o.nextPageToken = "foo";
+    o.selfLink = "foo";
+  }
+  buildCounterTargetVpnGatewayList--;
+  return o;
+}
+
+checkTargetVpnGatewayList(api.TargetVpnGatewayList o) {
+  buildCounterTargetVpnGatewayList++;
+  if (buildCounterTargetVpnGatewayList < 3) {
+    unittest.expect(o.id, unittest.equals('foo'));
+    checkUnnamed542(o.items);
+    unittest.expect(o.kind, unittest.equals('foo'));
+    unittest.expect(o.nextPageToken, unittest.equals('foo'));
+    unittest.expect(o.selfLink, unittest.equals('foo'));
+  }
+  buildCounterTargetVpnGatewayList--;
+}
+
+buildUnnamed543() {
+  var o = new core.List<api.TargetVpnGateway>();
+  o.add(buildTargetVpnGateway());
+  o.add(buildTargetVpnGateway());
+  return o;
+}
+
+checkUnnamed543(core.List<api.TargetVpnGateway> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkTargetVpnGateway(o[0]);
+  checkTargetVpnGateway(o[1]);
+}
+
+core.int buildCounterTargetVpnGatewaysScopedListWarningData = 0;
+buildTargetVpnGatewaysScopedListWarningData() {
+  var o = new api.TargetVpnGatewaysScopedListWarningData();
+  buildCounterTargetVpnGatewaysScopedListWarningData++;
+  if (buildCounterTargetVpnGatewaysScopedListWarningData < 3) {
+    o.key = "foo";
+    o.value = "foo";
+  }
+  buildCounterTargetVpnGatewaysScopedListWarningData--;
+  return o;
+}
+
+checkTargetVpnGatewaysScopedListWarningData(api.TargetVpnGatewaysScopedListWarningData o) {
+  buildCounterTargetVpnGatewaysScopedListWarningData++;
+  if (buildCounterTargetVpnGatewaysScopedListWarningData < 3) {
+    unittest.expect(o.key, unittest.equals('foo'));
+    unittest.expect(o.value, unittest.equals('foo'));
+  }
+  buildCounterTargetVpnGatewaysScopedListWarningData--;
+}
+
+buildUnnamed544() {
+  var o = new core.List<api.TargetVpnGatewaysScopedListWarningData>();
+  o.add(buildTargetVpnGatewaysScopedListWarningData());
+  o.add(buildTargetVpnGatewaysScopedListWarningData());
+  return o;
+}
+
+checkUnnamed544(core.List<api.TargetVpnGatewaysScopedListWarningData> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkTargetVpnGatewaysScopedListWarningData(o[0]);
+  checkTargetVpnGatewaysScopedListWarningData(o[1]);
+}
+
+core.int buildCounterTargetVpnGatewaysScopedListWarning = 0;
+buildTargetVpnGatewaysScopedListWarning() {
+  var o = new api.TargetVpnGatewaysScopedListWarning();
+  buildCounterTargetVpnGatewaysScopedListWarning++;
+  if (buildCounterTargetVpnGatewaysScopedListWarning < 3) {
+    o.code = "foo";
+    o.data = buildUnnamed544();
+    o.message = "foo";
+  }
+  buildCounterTargetVpnGatewaysScopedListWarning--;
+  return o;
+}
+
+checkTargetVpnGatewaysScopedListWarning(api.TargetVpnGatewaysScopedListWarning o) {
+  buildCounterTargetVpnGatewaysScopedListWarning++;
+  if (buildCounterTargetVpnGatewaysScopedListWarning < 3) {
+    unittest.expect(o.code, unittest.equals('foo'));
+    checkUnnamed544(o.data);
+    unittest.expect(o.message, unittest.equals('foo'));
+  }
+  buildCounterTargetVpnGatewaysScopedListWarning--;
+}
+
+core.int buildCounterTargetVpnGatewaysScopedList = 0;
+buildTargetVpnGatewaysScopedList() {
+  var o = new api.TargetVpnGatewaysScopedList();
+  buildCounterTargetVpnGatewaysScopedList++;
+  if (buildCounterTargetVpnGatewaysScopedList < 3) {
+    o.targetVpnGateways = buildUnnamed543();
+    o.warning = buildTargetVpnGatewaysScopedListWarning();
+  }
+  buildCounterTargetVpnGatewaysScopedList--;
+  return o;
+}
+
+checkTargetVpnGatewaysScopedList(api.TargetVpnGatewaysScopedList o) {
+  buildCounterTargetVpnGatewaysScopedList++;
+  if (buildCounterTargetVpnGatewaysScopedList < 3) {
+    checkUnnamed543(o.targetVpnGateways);
+    checkTargetVpnGatewaysScopedListWarning(o.warning);
+  }
+  buildCounterTargetVpnGatewaysScopedList--;
+}
+
 core.int buildCounterTestFailure = 0;
 buildTestFailure() {
   var o = new api.TestFailure();
@@ -4229,40 +4546,40 @@
   buildCounterTestFailure--;
 }
 
-buildUnnamed1324() {
+buildUnnamed545() {
   var o = new core.List<api.HostRule>();
   o.add(buildHostRule());
   o.add(buildHostRule());
   return o;
 }
 
-checkUnnamed1324(core.List<api.HostRule> o) {
+checkUnnamed545(core.List<api.HostRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHostRule(o[0]);
   checkHostRule(o[1]);
 }
 
-buildUnnamed1325() {
+buildUnnamed546() {
   var o = new core.List<api.PathMatcher>();
   o.add(buildPathMatcher());
   o.add(buildPathMatcher());
   return o;
 }
 
-checkUnnamed1325(core.List<api.PathMatcher> o) {
+checkUnnamed546(core.List<api.PathMatcher> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPathMatcher(o[0]);
   checkPathMatcher(o[1]);
 }
 
-buildUnnamed1326() {
+buildUnnamed547() {
   var o = new core.List<api.UrlMapTest>();
   o.add(buildUrlMapTest());
   o.add(buildUrlMapTest());
   return o;
 }
 
-checkUnnamed1326(core.List<api.UrlMapTest> o) {
+checkUnnamed547(core.List<api.UrlMapTest> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlMapTest(o[0]);
   checkUrlMapTest(o[1]);
@@ -4277,13 +4594,13 @@
     o.defaultService = "foo";
     o.description = "foo";
     o.fingerprint = "foo";
-    o.hostRules = buildUnnamed1324();
+    o.hostRules = buildUnnamed545();
     o.id = "foo";
     o.kind = "foo";
     o.name = "foo";
-    o.pathMatchers = buildUnnamed1325();
+    o.pathMatchers = buildUnnamed546();
     o.selfLink = "foo";
-    o.tests = buildUnnamed1326();
+    o.tests = buildUnnamed547();
   }
   buildCounterUrlMap--;
   return o;
@@ -4296,25 +4613,25 @@
     unittest.expect(o.defaultService, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.fingerprint, unittest.equals('foo'));
-    checkUnnamed1324(o.hostRules);
+    checkUnnamed545(o.hostRules);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1325(o.pathMatchers);
+    checkUnnamed546(o.pathMatchers);
     unittest.expect(o.selfLink, unittest.equals('foo'));
-    checkUnnamed1326(o.tests);
+    checkUnnamed547(o.tests);
   }
   buildCounterUrlMap--;
 }
 
-buildUnnamed1327() {
+buildUnnamed548() {
   var o = new core.List<api.UrlMap>();
   o.add(buildUrlMap());
   o.add(buildUrlMap());
   return o;
 }
 
-checkUnnamed1327(core.List<api.UrlMap> o) {
+checkUnnamed548(core.List<api.UrlMap> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlMap(o[0]);
   checkUrlMap(o[1]);
@@ -4326,7 +4643,7 @@
   buildCounterUrlMapList++;
   if (buildCounterUrlMapList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1327();
+    o.items = buildUnnamed548();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -4339,7 +4656,7 @@
   buildCounterUrlMapList++;
   if (buildCounterUrlMapList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1327(o.items);
+    checkUnnamed548(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -4391,27 +4708,27 @@
   buildCounterUrlMapTest--;
 }
 
-buildUnnamed1328() {
+buildUnnamed549() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1328(core.List<core.String> o) {
+checkUnnamed549(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1329() {
+buildUnnamed550() {
   var o = new core.List<api.TestFailure>();
   o.add(buildTestFailure());
   o.add(buildTestFailure());
   return o;
 }
 
-checkUnnamed1329(core.List<api.TestFailure> o) {
+checkUnnamed550(core.List<api.TestFailure> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTestFailure(o[0]);
   checkTestFailure(o[1]);
@@ -4422,9 +4739,9 @@
   var o = new api.UrlMapValidationResult();
   buildCounterUrlMapValidationResult++;
   if (buildCounterUrlMapValidationResult < 3) {
-    o.loadErrors = buildUnnamed1328();
+    o.loadErrors = buildUnnamed549();
     o.loadSucceeded = true;
-    o.testFailures = buildUnnamed1329();
+    o.testFailures = buildUnnamed550();
     o.testPassed = true;
   }
   buildCounterUrlMapValidationResult--;
@@ -4434,9 +4751,9 @@
 checkUrlMapValidationResult(api.UrlMapValidationResult o) {
   buildCounterUrlMapValidationResult++;
   if (buildCounterUrlMapValidationResult < 3) {
-    checkUnnamed1328(o.loadErrors);
+    checkUnnamed549(o.loadErrors);
     unittest.expect(o.loadSucceeded, unittest.isTrue);
-    checkUnnamed1329(o.testFailures);
+    checkUnnamed550(o.testFailures);
     unittest.expect(o.testPassed, unittest.isTrue);
   }
   buildCounterUrlMapValidationResult--;
@@ -4501,6 +4818,237 @@
   buildCounterUsageExportLocation--;
 }
 
+buildUnnamed551() {
+  var o = new core.List<core.String>();
+  o.add("foo");
+  o.add("foo");
+  return o;
+}
+
+checkUnnamed551(core.List<core.String> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  unittest.expect(o[0], unittest.equals('foo'));
+  unittest.expect(o[1], unittest.equals('foo'));
+}
+
+core.int buildCounterVpnTunnel = 0;
+buildVpnTunnel() {
+  var o = new api.VpnTunnel();
+  buildCounterVpnTunnel++;
+  if (buildCounterVpnTunnel < 3) {
+    o.creationTimestamp = "foo";
+    o.description = "foo";
+    o.detailedStatus = "foo";
+    o.id = "foo";
+    o.ikeNetworks = buildUnnamed551();
+    o.ikeVersion = 42;
+    o.kind = "foo";
+    o.name = "foo";
+    o.peerIp = "foo";
+    o.region = "foo";
+    o.selfLink = "foo";
+    o.sharedSecret = "foo";
+    o.sharedSecretHash = "foo";
+    o.status = "foo";
+    o.targetVpnGateway = "foo";
+  }
+  buildCounterVpnTunnel--;
+  return o;
+}
+
+checkVpnTunnel(api.VpnTunnel o) {
+  buildCounterVpnTunnel++;
+  if (buildCounterVpnTunnel < 3) {
+    unittest.expect(o.creationTimestamp, unittest.equals('foo'));
+    unittest.expect(o.description, unittest.equals('foo'));
+    unittest.expect(o.detailedStatus, unittest.equals('foo'));
+    unittest.expect(o.id, unittest.equals('foo'));
+    checkUnnamed551(o.ikeNetworks);
+    unittest.expect(o.ikeVersion, unittest.equals(42));
+    unittest.expect(o.kind, unittest.equals('foo'));
+    unittest.expect(o.name, unittest.equals('foo'));
+    unittest.expect(o.peerIp, unittest.equals('foo'));
+    unittest.expect(o.region, unittest.equals('foo'));
+    unittest.expect(o.selfLink, unittest.equals('foo'));
+    unittest.expect(o.sharedSecret, unittest.equals('foo'));
+    unittest.expect(o.sharedSecretHash, unittest.equals('foo'));
+    unittest.expect(o.status, unittest.equals('foo'));
+    unittest.expect(o.targetVpnGateway, unittest.equals('foo'));
+  }
+  buildCounterVpnTunnel--;
+}
+
+buildUnnamed552() {
+  var o = new core.Map<core.String, api.VpnTunnelsScopedList>();
+  o["x"] = buildVpnTunnelsScopedList();
+  o["y"] = buildVpnTunnelsScopedList();
+  return o;
+}
+
+checkUnnamed552(core.Map<core.String, api.VpnTunnelsScopedList> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkVpnTunnelsScopedList(o["x"]);
+  checkVpnTunnelsScopedList(o["y"]);
+}
+
+core.int buildCounterVpnTunnelAggregatedList = 0;
+buildVpnTunnelAggregatedList() {
+  var o = new api.VpnTunnelAggregatedList();
+  buildCounterVpnTunnelAggregatedList++;
+  if (buildCounterVpnTunnelAggregatedList < 3) {
+    o.id = "foo";
+    o.items = buildUnnamed552();
+    o.kind = "foo";
+    o.nextPageToken = "foo";
+    o.selfLink = "foo";
+  }
+  buildCounterVpnTunnelAggregatedList--;
+  return o;
+}
+
+checkVpnTunnelAggregatedList(api.VpnTunnelAggregatedList o) {
+  buildCounterVpnTunnelAggregatedList++;
+  if (buildCounterVpnTunnelAggregatedList < 3) {
+    unittest.expect(o.id, unittest.equals('foo'));
+    checkUnnamed552(o.items);
+    unittest.expect(o.kind, unittest.equals('foo'));
+    unittest.expect(o.nextPageToken, unittest.equals('foo'));
+    unittest.expect(o.selfLink, unittest.equals('foo'));
+  }
+  buildCounterVpnTunnelAggregatedList--;
+}
+
+buildUnnamed553() {
+  var o = new core.List<api.VpnTunnel>();
+  o.add(buildVpnTunnel());
+  o.add(buildVpnTunnel());
+  return o;
+}
+
+checkUnnamed553(core.List<api.VpnTunnel> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkVpnTunnel(o[0]);
+  checkVpnTunnel(o[1]);
+}
+
+core.int buildCounterVpnTunnelList = 0;
+buildVpnTunnelList() {
+  var o = new api.VpnTunnelList();
+  buildCounterVpnTunnelList++;
+  if (buildCounterVpnTunnelList < 3) {
+    o.id = "foo";
+    o.items = buildUnnamed553();
+    o.kind = "foo";
+    o.nextPageToken = "foo";
+    o.selfLink = "foo";
+  }
+  buildCounterVpnTunnelList--;
+  return o;
+}
+
+checkVpnTunnelList(api.VpnTunnelList o) {
+  buildCounterVpnTunnelList++;
+  if (buildCounterVpnTunnelList < 3) {
+    unittest.expect(o.id, unittest.equals('foo'));
+    checkUnnamed553(o.items);
+    unittest.expect(o.kind, unittest.equals('foo'));
+    unittest.expect(o.nextPageToken, unittest.equals('foo'));
+    unittest.expect(o.selfLink, unittest.equals('foo'));
+  }
+  buildCounterVpnTunnelList--;
+}
+
+buildUnnamed554() {
+  var o = new core.List<api.VpnTunnel>();
+  o.add(buildVpnTunnel());
+  o.add(buildVpnTunnel());
+  return o;
+}
+
+checkUnnamed554(core.List<api.VpnTunnel> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkVpnTunnel(o[0]);
+  checkVpnTunnel(o[1]);
+}
+
+core.int buildCounterVpnTunnelsScopedListWarningData = 0;
+buildVpnTunnelsScopedListWarningData() {
+  var o = new api.VpnTunnelsScopedListWarningData();
+  buildCounterVpnTunnelsScopedListWarningData++;
+  if (buildCounterVpnTunnelsScopedListWarningData < 3) {
+    o.key = "foo";
+    o.value = "foo";
+  }
+  buildCounterVpnTunnelsScopedListWarningData--;
+  return o;
+}
+
+checkVpnTunnelsScopedListWarningData(api.VpnTunnelsScopedListWarningData o) {
+  buildCounterVpnTunnelsScopedListWarningData++;
+  if (buildCounterVpnTunnelsScopedListWarningData < 3) {
+    unittest.expect(o.key, unittest.equals('foo'));
+    unittest.expect(o.value, unittest.equals('foo'));
+  }
+  buildCounterVpnTunnelsScopedListWarningData--;
+}
+
+buildUnnamed555() {
+  var o = new core.List<api.VpnTunnelsScopedListWarningData>();
+  o.add(buildVpnTunnelsScopedListWarningData());
+  o.add(buildVpnTunnelsScopedListWarningData());
+  return o;
+}
+
+checkUnnamed555(core.List<api.VpnTunnelsScopedListWarningData> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkVpnTunnelsScopedListWarningData(o[0]);
+  checkVpnTunnelsScopedListWarningData(o[1]);
+}
+
+core.int buildCounterVpnTunnelsScopedListWarning = 0;
+buildVpnTunnelsScopedListWarning() {
+  var o = new api.VpnTunnelsScopedListWarning();
+  buildCounterVpnTunnelsScopedListWarning++;
+  if (buildCounterVpnTunnelsScopedListWarning < 3) {
+    o.code = "foo";
+    o.data = buildUnnamed555();
+    o.message = "foo";
+  }
+  buildCounterVpnTunnelsScopedListWarning--;
+  return o;
+}
+
+checkVpnTunnelsScopedListWarning(api.VpnTunnelsScopedListWarning o) {
+  buildCounterVpnTunnelsScopedListWarning++;
+  if (buildCounterVpnTunnelsScopedListWarning < 3) {
+    unittest.expect(o.code, unittest.equals('foo'));
+    checkUnnamed555(o.data);
+    unittest.expect(o.message, unittest.equals('foo'));
+  }
+  buildCounterVpnTunnelsScopedListWarning--;
+}
+
+core.int buildCounterVpnTunnelsScopedList = 0;
+buildVpnTunnelsScopedList() {
+  var o = new api.VpnTunnelsScopedList();
+  buildCounterVpnTunnelsScopedList++;
+  if (buildCounterVpnTunnelsScopedList < 3) {
+    o.vpnTunnels = buildUnnamed554();
+    o.warning = buildVpnTunnelsScopedListWarning();
+  }
+  buildCounterVpnTunnelsScopedList--;
+  return o;
+}
+
+checkVpnTunnelsScopedList(api.VpnTunnelsScopedList o) {
+  buildCounterVpnTunnelsScopedList++;
+  if (buildCounterVpnTunnelsScopedList < 3) {
+    checkUnnamed554(o.vpnTunnels);
+    checkVpnTunnelsScopedListWarning(o.warning);
+  }
+  buildCounterVpnTunnelsScopedList--;
+}
+
 core.int buildCounterZoneMaintenanceWindows = 0;
 buildZoneMaintenanceWindows() {
   var o = new api.ZoneMaintenanceWindows();
@@ -4526,14 +5074,14 @@
   buildCounterZoneMaintenanceWindows--;
 }
 
-buildUnnamed1330() {
+buildUnnamed556() {
   var o = new core.List<api.ZoneMaintenanceWindows>();
   o.add(buildZoneMaintenanceWindows());
   o.add(buildZoneMaintenanceWindows());
   return o;
 }
 
-checkUnnamed1330(core.List<api.ZoneMaintenanceWindows> o) {
+checkUnnamed556(core.List<api.ZoneMaintenanceWindows> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkZoneMaintenanceWindows(o[0]);
   checkZoneMaintenanceWindows(o[1]);
@@ -4549,7 +5097,7 @@
     o.description = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.maintenanceWindows = buildUnnamed1330();
+    o.maintenanceWindows = buildUnnamed556();
     o.name = "foo";
     o.region = "foo";
     o.selfLink = "foo";
@@ -4567,7 +5115,7 @@
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1330(o.maintenanceWindows);
+    checkUnnamed556(o.maintenanceWindows);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.region, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -4576,14 +5124,14 @@
   buildCounterZone--;
 }
 
-buildUnnamed1331() {
+buildUnnamed557() {
   var o = new core.List<api.Zone>();
   o.add(buildZone());
   o.add(buildZone());
   return o;
 }
 
-checkUnnamed1331(core.List<api.Zone> o) {
+checkUnnamed557(core.List<api.Zone> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkZone(o[0]);
   checkZone(o[1]);
@@ -4595,7 +5143,7 @@
   buildCounterZoneList++;
   if (buildCounterZoneList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed1331();
+    o.items = buildUnnamed557();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -4608,7 +5156,7 @@
   buildCounterZoneList++;
   if (buildCounterZoneList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1331(o.items);
+    checkUnnamed557(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -4771,6 +5319,15 @@
   });
 
 
+  unittest.group("obj-schema-DiskMoveRequest", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildDiskMoveRequest();
+      var od = new api.DiskMoveRequest.fromJson(o.toJson());
+      checkDiskMoveRequest(od);
+    });
+  });
+
+
   unittest.group("obj-schema-DiskType", () {
     unittest.test("to-json--from-json", () {
       var o = buildDiskType();
@@ -5032,6 +5589,15 @@
   });
 
 
+  unittest.group("obj-schema-InstanceMoveRequest", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildInstanceMoveRequest();
+      var od = new api.InstanceMoveRequest.fromJson(o.toJson());
+      checkInstanceMoveRequest(od);
+    });
+  });
+
+
   unittest.group("obj-schema-InstanceProperties", () {
     unittest.test("to-json--from-json", () {
       var o = buildInstanceProperties();
@@ -5635,6 +6201,60 @@
   });
 
 
+  unittest.group("obj-schema-TargetVpnGateway", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildTargetVpnGateway();
+      var od = new api.TargetVpnGateway.fromJson(o.toJson());
+      checkTargetVpnGateway(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-TargetVpnGatewayAggregatedList", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildTargetVpnGatewayAggregatedList();
+      var od = new api.TargetVpnGatewayAggregatedList.fromJson(o.toJson());
+      checkTargetVpnGatewayAggregatedList(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-TargetVpnGatewayList", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildTargetVpnGatewayList();
+      var od = new api.TargetVpnGatewayList.fromJson(o.toJson());
+      checkTargetVpnGatewayList(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-TargetVpnGatewaysScopedListWarningData", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildTargetVpnGatewaysScopedListWarningData();
+      var od = new api.TargetVpnGatewaysScopedListWarningData.fromJson(o.toJson());
+      checkTargetVpnGatewaysScopedListWarningData(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-TargetVpnGatewaysScopedListWarning", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildTargetVpnGatewaysScopedListWarning();
+      var od = new api.TargetVpnGatewaysScopedListWarning.fromJson(o.toJson());
+      checkTargetVpnGatewaysScopedListWarning(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-TargetVpnGatewaysScopedList", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildTargetVpnGatewaysScopedList();
+      var od = new api.TargetVpnGatewaysScopedList.fromJson(o.toJson());
+      checkTargetVpnGatewaysScopedList(od);
+    });
+  });
+
+
   unittest.group("obj-schema-TestFailure", () {
     unittest.test("to-json--from-json", () {
       var o = buildTestFailure();
@@ -5716,6 +6336,60 @@
   });
 
 
+  unittest.group("obj-schema-VpnTunnel", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildVpnTunnel();
+      var od = new api.VpnTunnel.fromJson(o.toJson());
+      checkVpnTunnel(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-VpnTunnelAggregatedList", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildVpnTunnelAggregatedList();
+      var od = new api.VpnTunnelAggregatedList.fromJson(o.toJson());
+      checkVpnTunnelAggregatedList(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-VpnTunnelList", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildVpnTunnelList();
+      var od = new api.VpnTunnelList.fromJson(o.toJson());
+      checkVpnTunnelList(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-VpnTunnelsScopedListWarningData", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildVpnTunnelsScopedListWarningData();
+      var od = new api.VpnTunnelsScopedListWarningData.fromJson(o.toJson());
+      checkVpnTunnelsScopedListWarningData(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-VpnTunnelsScopedListWarning", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildVpnTunnelsScopedListWarning();
+      var od = new api.VpnTunnelsScopedListWarning.fromJson(o.toJson());
+      checkVpnTunnelsScopedListWarning(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-VpnTunnelsScopedList", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildVpnTunnelsScopedList();
+      var od = new api.VpnTunnelsScopedList.fromJson(o.toJson());
+      checkVpnTunnelsScopedList(od);
+    });
+  });
+
+
   unittest.group("obj-schema-ZoneMaintenanceWindows", () {
     unittest.test("to-json--from-json", () {
       var o = buildZoneMaintenanceWindows();
@@ -5746,7 +6420,7 @@
   unittest.group("resource-AddressesResourceApi", () {
     unittest.test("method--aggregatedList", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AddressesResourceApi res = new api.ComputeApi(mock).addresses;
       var arg_project = "foo";
       var arg_filter = "foo";
@@ -5785,7 +6459,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAddressAggregatedList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.aggregatedList(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.AddressAggregatedList response) {
         checkAddressAggregatedList(response);
@@ -5794,7 +6468,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AddressesResourceApi res = new api.ComputeApi(mock).addresses;
       var arg_project = "foo";
       var arg_region = "foo";
@@ -5829,7 +6503,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_project, arg_region, arg_address).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -5838,7 +6512,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AddressesResourceApi res = new api.ComputeApi(mock).addresses;
       var arg_project = "foo";
       var arg_region = "foo";
@@ -5873,7 +6547,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAddress());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_region, arg_address).then(unittest.expectAsync(((api.Address response) {
         checkAddress(response);
@@ -5882,7 +6556,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AddressesResourceApi res = new api.ComputeApi(mock).addresses;
       var arg_request = buildAddress();
       var arg_project = "foo";
@@ -5920,7 +6594,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_project, arg_region).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -5929,7 +6603,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AddressesResourceApi res = new api.ComputeApi(mock).addresses;
       var arg_project = "foo";
       var arg_region = "foo";
@@ -5969,7 +6643,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAddressList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, arg_region, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.AddressList response) {
         checkAddressList(response);
@@ -5982,7 +6656,7 @@
   unittest.group("resource-BackendServicesResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BackendServicesResourceApi res = new api.ComputeApi(mock).backendServices;
       var arg_project = "foo";
       var arg_backendService = "foo";
@@ -6016,7 +6690,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_project, arg_backendService).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -6025,7 +6699,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BackendServicesResourceApi res = new api.ComputeApi(mock).backendServices;
       var arg_project = "foo";
       var arg_backendService = "foo";
@@ -6059,7 +6733,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBackendService());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_backendService).then(unittest.expectAsync(((api.BackendService response) {
         checkBackendService(response);
@@ -6068,7 +6742,7 @@
 
     unittest.test("method--getHealth", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BackendServicesResourceApi res = new api.ComputeApi(mock).backendServices;
       var arg_request = buildResourceGroupReference();
       var arg_project = "foo";
@@ -6106,7 +6780,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBackendServiceGroupHealth());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.getHealth(arg_request, arg_project, arg_backendService).then(unittest.expectAsync(((api.BackendServiceGroupHealth response) {
         checkBackendServiceGroupHealth(response);
@@ -6115,7 +6789,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BackendServicesResourceApi res = new api.ComputeApi(mock).backendServices;
       var arg_request = buildBackendService();
       var arg_project = "foo";
@@ -6152,7 +6826,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_project).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -6161,7 +6835,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BackendServicesResourceApi res = new api.ComputeApi(mock).backendServices;
       var arg_project = "foo";
       var arg_filter = "foo";
@@ -6200,7 +6874,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBackendServiceList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.BackendServiceList response) {
         checkBackendServiceList(response);
@@ -6209,7 +6883,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BackendServicesResourceApi res = new api.ComputeApi(mock).backendServices;
       var arg_request = buildBackendService();
       var arg_project = "foo";
@@ -6247,7 +6921,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_project, arg_backendService).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -6256,7 +6930,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BackendServicesResourceApi res = new api.ComputeApi(mock).backendServices;
       var arg_request = buildBackendService();
       var arg_project = "foo";
@@ -6294,7 +6968,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_project, arg_backendService).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -6307,7 +6981,7 @@
   unittest.group("resource-DiskTypesResourceApi", () {
     unittest.test("method--aggregatedList", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DiskTypesResourceApi res = new api.ComputeApi(mock).diskTypes;
       var arg_project = "foo";
       var arg_filter = "foo";
@@ -6346,7 +7020,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDiskTypeAggregatedList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.aggregatedList(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.DiskTypeAggregatedList response) {
         checkDiskTypeAggregatedList(response);
@@ -6355,7 +7029,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DiskTypesResourceApi res = new api.ComputeApi(mock).diskTypes;
       var arg_project = "foo";
       var arg_zone = "foo";
@@ -6390,7 +7064,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDiskType());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_zone, arg_diskType).then(unittest.expectAsync(((api.DiskType response) {
         checkDiskType(response);
@@ -6399,7 +7073,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DiskTypesResourceApi res = new api.ComputeApi(mock).diskTypes;
       var arg_project = "foo";
       var arg_zone = "foo";
@@ -6439,7 +7113,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDiskTypeList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, arg_zone, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.DiskTypeList response) {
         checkDiskTypeList(response);
@@ -6452,7 +7126,7 @@
   unittest.group("resource-DisksResourceApi", () {
     unittest.test("method--aggregatedList", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DisksResourceApi res = new api.ComputeApi(mock).disks;
       var arg_project = "foo";
       var arg_filter = "foo";
@@ -6491,7 +7165,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDiskAggregatedList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.aggregatedList(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.DiskAggregatedList response) {
         checkDiskAggregatedList(response);
@@ -6500,7 +7174,7 @@
 
     unittest.test("method--createSnapshot", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DisksResourceApi res = new api.ComputeApi(mock).disks;
       var arg_request = buildSnapshot();
       var arg_project = "foo";
@@ -6539,7 +7213,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.createSnapshot(arg_request, arg_project, arg_zone, arg_disk).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -6548,7 +7222,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DisksResourceApi res = new api.ComputeApi(mock).disks;
       var arg_project = "foo";
       var arg_zone = "foo";
@@ -6583,7 +7257,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_project, arg_zone, arg_disk).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -6592,7 +7266,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DisksResourceApi res = new api.ComputeApi(mock).disks;
       var arg_project = "foo";
       var arg_zone = "foo";
@@ -6627,7 +7301,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDisk());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_zone, arg_disk).then(unittest.expectAsync(((api.Disk response) {
         checkDisk(response);
@@ -6636,7 +7310,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DisksResourceApi res = new api.ComputeApi(mock).disks;
       var arg_request = buildDisk();
       var arg_project = "foo";
@@ -6676,7 +7350,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_project, arg_zone, sourceImage: arg_sourceImage).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -6685,7 +7359,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DisksResourceApi res = new api.ComputeApi(mock).disks;
       var arg_project = "foo";
       var arg_zone = "foo";
@@ -6725,7 +7399,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDiskList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, arg_zone, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.DiskList response) {
         checkDiskList(response);
@@ -6738,7 +7412,7 @@
   unittest.group("resource-FirewallsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FirewallsResourceApi res = new api.ComputeApi(mock).firewalls;
       var arg_project = "foo";
       var arg_firewall = "foo";
@@ -6772,7 +7446,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_project, arg_firewall).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -6781,7 +7455,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FirewallsResourceApi res = new api.ComputeApi(mock).firewalls;
       var arg_project = "foo";
       var arg_firewall = "foo";
@@ -6815,7 +7489,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFirewall());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_firewall).then(unittest.expectAsync(((api.Firewall response) {
         checkFirewall(response);
@@ -6824,7 +7498,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FirewallsResourceApi res = new api.ComputeApi(mock).firewalls;
       var arg_request = buildFirewall();
       var arg_project = "foo";
@@ -6861,7 +7535,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_project).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -6870,7 +7544,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FirewallsResourceApi res = new api.ComputeApi(mock).firewalls;
       var arg_project = "foo";
       var arg_filter = "foo";
@@ -6909,7 +7583,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFirewallList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.FirewallList response) {
         checkFirewallList(response);
@@ -6918,7 +7592,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FirewallsResourceApi res = new api.ComputeApi(mock).firewalls;
       var arg_request = buildFirewall();
       var arg_project = "foo";
@@ -6956,7 +7630,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_project, arg_firewall).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -6965,7 +7639,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FirewallsResourceApi res = new api.ComputeApi(mock).firewalls;
       var arg_request = buildFirewall();
       var arg_project = "foo";
@@ -7003,7 +7677,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_project, arg_firewall).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -7016,7 +7690,7 @@
   unittest.group("resource-ForwardingRulesResourceApi", () {
     unittest.test("method--aggregatedList", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ForwardingRulesResourceApi res = new api.ComputeApi(mock).forwardingRules;
       var arg_project = "foo";
       var arg_filter = "foo";
@@ -7055,7 +7729,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildForwardingRuleAggregatedList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.aggregatedList(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.ForwardingRuleAggregatedList response) {
         checkForwardingRuleAggregatedList(response);
@@ -7064,7 +7738,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ForwardingRulesResourceApi res = new api.ComputeApi(mock).forwardingRules;
       var arg_project = "foo";
       var arg_region = "foo";
@@ -7099,7 +7773,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_project, arg_region, arg_forwardingRule).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -7108,7 +7782,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ForwardingRulesResourceApi res = new api.ComputeApi(mock).forwardingRules;
       var arg_project = "foo";
       var arg_region = "foo";
@@ -7143,7 +7817,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildForwardingRule());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_region, arg_forwardingRule).then(unittest.expectAsync(((api.ForwardingRule response) {
         checkForwardingRule(response);
@@ -7152,7 +7826,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ForwardingRulesResourceApi res = new api.ComputeApi(mock).forwardingRules;
       var arg_request = buildForwardingRule();
       var arg_project = "foo";
@@ -7190,7 +7864,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_project, arg_region).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -7199,7 +7873,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ForwardingRulesResourceApi res = new api.ComputeApi(mock).forwardingRules;
       var arg_project = "foo";
       var arg_region = "foo";
@@ -7239,7 +7913,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildForwardingRuleList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, arg_region, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.ForwardingRuleList response) {
         checkForwardingRuleList(response);
@@ -7248,7 +7922,7 @@
 
     unittest.test("method--setTarget", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ForwardingRulesResourceApi res = new api.ComputeApi(mock).forwardingRules;
       var arg_request = buildTargetReference();
       var arg_project = "foo";
@@ -7287,7 +7961,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.setTarget(arg_request, arg_project, arg_region, arg_forwardingRule).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -7300,7 +7974,7 @@
   unittest.group("resource-GlobalAddressesResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GlobalAddressesResourceApi res = new api.ComputeApi(mock).globalAddresses;
       var arg_project = "foo";
       var arg_address = "foo";
@@ -7334,7 +8008,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_project, arg_address).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -7343,7 +8017,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GlobalAddressesResourceApi res = new api.ComputeApi(mock).globalAddresses;
       var arg_project = "foo";
       var arg_address = "foo";
@@ -7377,7 +8051,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAddress());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_address).then(unittest.expectAsync(((api.Address response) {
         checkAddress(response);
@@ -7386,7 +8060,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GlobalAddressesResourceApi res = new api.ComputeApi(mock).globalAddresses;
       var arg_request = buildAddress();
       var arg_project = "foo";
@@ -7423,7 +8097,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_project).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -7432,7 +8106,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GlobalAddressesResourceApi res = new api.ComputeApi(mock).globalAddresses;
       var arg_project = "foo";
       var arg_filter = "foo";
@@ -7471,7 +8145,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAddressList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.AddressList response) {
         checkAddressList(response);
@@ -7484,7 +8158,7 @@
   unittest.group("resource-GlobalForwardingRulesResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GlobalForwardingRulesResourceApi res = new api.ComputeApi(mock).globalForwardingRules;
       var arg_project = "foo";
       var arg_forwardingRule = "foo";
@@ -7518,7 +8192,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_project, arg_forwardingRule).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -7527,7 +8201,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GlobalForwardingRulesResourceApi res = new api.ComputeApi(mock).globalForwardingRules;
       var arg_project = "foo";
       var arg_forwardingRule = "foo";
@@ -7561,7 +8235,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildForwardingRule());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_forwardingRule).then(unittest.expectAsync(((api.ForwardingRule response) {
         checkForwardingRule(response);
@@ -7570,7 +8244,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GlobalForwardingRulesResourceApi res = new api.ComputeApi(mock).globalForwardingRules;
       var arg_request = buildForwardingRule();
       var arg_project = "foo";
@@ -7607,7 +8281,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_project).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -7616,7 +8290,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GlobalForwardingRulesResourceApi res = new api.ComputeApi(mock).globalForwardingRules;
       var arg_project = "foo";
       var arg_filter = "foo";
@@ -7655,7 +8329,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildForwardingRuleList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.ForwardingRuleList response) {
         checkForwardingRuleList(response);
@@ -7664,7 +8338,7 @@
 
     unittest.test("method--setTarget", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GlobalForwardingRulesResourceApi res = new api.ComputeApi(mock).globalForwardingRules;
       var arg_request = buildTargetReference();
       var arg_project = "foo";
@@ -7702,7 +8376,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.setTarget(arg_request, arg_project, arg_forwardingRule).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -7715,7 +8389,7 @@
   unittest.group("resource-GlobalOperationsResourceApi", () {
     unittest.test("method--aggregatedList", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GlobalOperationsResourceApi res = new api.ComputeApi(mock).globalOperations;
       var arg_project = "foo";
       var arg_filter = "foo";
@@ -7754,7 +8428,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperationAggregatedList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.aggregatedList(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.OperationAggregatedList response) {
         checkOperationAggregatedList(response);
@@ -7763,7 +8437,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GlobalOperationsResourceApi res = new api.ComputeApi(mock).globalOperations;
       var arg_project = "foo";
       var arg_operation = "foo";
@@ -7797,14 +8471,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_project, arg_operation).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GlobalOperationsResourceApi res = new api.ComputeApi(mock).globalOperations;
       var arg_project = "foo";
       var arg_operation = "foo";
@@ -7838,7 +8512,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_operation).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -7847,7 +8521,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GlobalOperationsResourceApi res = new api.ComputeApi(mock).globalOperations;
       var arg_project = "foo";
       var arg_filter = "foo";
@@ -7886,7 +8560,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperationList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.OperationList response) {
         checkOperationList(response);
@@ -7899,7 +8573,7 @@
   unittest.group("resource-HttpHealthChecksResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.HttpHealthChecksResourceApi res = new api.ComputeApi(mock).httpHealthChecks;
       var arg_project = "foo";
       var arg_httpHealthCheck = "foo";
@@ -7933,7 +8607,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_project, arg_httpHealthCheck).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -7942,7 +8616,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.HttpHealthChecksResourceApi res = new api.ComputeApi(mock).httpHealthChecks;
       var arg_project = "foo";
       var arg_httpHealthCheck = "foo";
@@ -7976,7 +8650,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildHttpHealthCheck());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_httpHealthCheck).then(unittest.expectAsync(((api.HttpHealthCheck response) {
         checkHttpHealthCheck(response);
@@ -7985,7 +8659,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.HttpHealthChecksResourceApi res = new api.ComputeApi(mock).httpHealthChecks;
       var arg_request = buildHttpHealthCheck();
       var arg_project = "foo";
@@ -8022,7 +8696,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_project).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -8031,7 +8705,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.HttpHealthChecksResourceApi res = new api.ComputeApi(mock).httpHealthChecks;
       var arg_project = "foo";
       var arg_filter = "foo";
@@ -8070,7 +8744,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildHttpHealthCheckList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.HttpHealthCheckList response) {
         checkHttpHealthCheckList(response);
@@ -8079,7 +8753,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.HttpHealthChecksResourceApi res = new api.ComputeApi(mock).httpHealthChecks;
       var arg_request = buildHttpHealthCheck();
       var arg_project = "foo";
@@ -8117,7 +8791,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_project, arg_httpHealthCheck).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -8126,7 +8800,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.HttpHealthChecksResourceApi res = new api.ComputeApi(mock).httpHealthChecks;
       var arg_request = buildHttpHealthCheck();
       var arg_project = "foo";
@@ -8164,7 +8838,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_project, arg_httpHealthCheck).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -8177,7 +8851,7 @@
   unittest.group("resource-ImagesResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ImagesResourceApi res = new api.ComputeApi(mock).images;
       var arg_project = "foo";
       var arg_image = "foo";
@@ -8211,7 +8885,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_project, arg_image).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -8220,7 +8894,7 @@
 
     unittest.test("method--deprecate", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ImagesResourceApi res = new api.ComputeApi(mock).images;
       var arg_request = buildDeprecationStatus();
       var arg_project = "foo";
@@ -8258,7 +8932,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.deprecate(arg_request, arg_project, arg_image).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -8267,7 +8941,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ImagesResourceApi res = new api.ComputeApi(mock).images;
       var arg_project = "foo";
       var arg_image = "foo";
@@ -8301,7 +8975,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildImage());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_image).then(unittest.expectAsync(((api.Image response) {
         checkImage(response);
@@ -8310,7 +8984,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ImagesResourceApi res = new api.ComputeApi(mock).images;
       var arg_request = buildImage();
       var arg_project = "foo";
@@ -8347,7 +9021,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_project).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -8356,7 +9030,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ImagesResourceApi res = new api.ComputeApi(mock).images;
       var arg_project = "foo";
       var arg_filter = "foo";
@@ -8395,7 +9069,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildImageList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.ImageList response) {
         checkImageList(response);
@@ -8408,7 +9082,7 @@
   unittest.group("resource-InstanceTemplatesResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InstanceTemplatesResourceApi res = new api.ComputeApi(mock).instanceTemplates;
       var arg_project = "foo";
       var arg_instanceTemplate = "foo";
@@ -8442,7 +9116,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_project, arg_instanceTemplate).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -8451,7 +9125,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InstanceTemplatesResourceApi res = new api.ComputeApi(mock).instanceTemplates;
       var arg_project = "foo";
       var arg_instanceTemplate = "foo";
@@ -8485,7 +9159,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildInstanceTemplate());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_instanceTemplate).then(unittest.expectAsync(((api.InstanceTemplate response) {
         checkInstanceTemplate(response);
@@ -8494,7 +9168,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InstanceTemplatesResourceApi res = new api.ComputeApi(mock).instanceTemplates;
       var arg_request = buildInstanceTemplate();
       var arg_project = "foo";
@@ -8531,7 +9205,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_project).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -8540,7 +9214,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InstanceTemplatesResourceApi res = new api.ComputeApi(mock).instanceTemplates;
       var arg_project = "foo";
       var arg_filter = "foo";
@@ -8579,7 +9253,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildInstanceTemplateList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.InstanceTemplateList response) {
         checkInstanceTemplateList(response);
@@ -8592,7 +9266,7 @@
   unittest.group("resource-InstancesResourceApi", () {
     unittest.test("method--addAccessConfig", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InstancesResourceApi res = new api.ComputeApi(mock).instances;
       var arg_request = buildAccessConfig();
       var arg_project = "foo";
@@ -8633,7 +9307,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.addAccessConfig(arg_request, arg_project, arg_zone, arg_instance, arg_networkInterface).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -8642,7 +9316,7 @@
 
     unittest.test("method--aggregatedList", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InstancesResourceApi res = new api.ComputeApi(mock).instances;
       var arg_project = "foo";
       var arg_filter = "foo";
@@ -8681,7 +9355,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildInstanceAggregatedList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.aggregatedList(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.InstanceAggregatedList response) {
         checkInstanceAggregatedList(response);
@@ -8690,7 +9364,7 @@
 
     unittest.test("method--attachDisk", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InstancesResourceApi res = new api.ComputeApi(mock).instances;
       var arg_request = buildAttachedDisk();
       var arg_project = "foo";
@@ -8729,7 +9403,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.attachDisk(arg_request, arg_project, arg_zone, arg_instance).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -8738,7 +9412,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InstancesResourceApi res = new api.ComputeApi(mock).instances;
       var arg_project = "foo";
       var arg_zone = "foo";
@@ -8773,7 +9447,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_project, arg_zone, arg_instance).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -8782,7 +9456,7 @@
 
     unittest.test("method--deleteAccessConfig", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InstancesResourceApi res = new api.ComputeApi(mock).instances;
       var arg_project = "foo";
       var arg_zone = "foo";
@@ -8821,7 +9495,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.deleteAccessConfig(arg_project, arg_zone, arg_instance, arg_accessConfig, arg_networkInterface).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -8830,7 +9504,7 @@
 
     unittest.test("method--detachDisk", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InstancesResourceApi res = new api.ComputeApi(mock).instances;
       var arg_project = "foo";
       var arg_zone = "foo";
@@ -8867,7 +9541,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.detachDisk(arg_project, arg_zone, arg_instance, arg_deviceName).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -8876,7 +9550,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InstancesResourceApi res = new api.ComputeApi(mock).instances;
       var arg_project = "foo";
       var arg_zone = "foo";
@@ -8911,7 +9585,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildInstance());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_zone, arg_instance).then(unittest.expectAsync(((api.Instance response) {
         checkInstance(response);
@@ -8920,7 +9594,7 @@
 
     unittest.test("method--getSerialPortOutput", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InstancesResourceApi res = new api.ComputeApi(mock).instances;
       var arg_project = "foo";
       var arg_zone = "foo";
@@ -8955,7 +9629,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSerialPortOutput());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.getSerialPortOutput(arg_project, arg_zone, arg_instance).then(unittest.expectAsync(((api.SerialPortOutput response) {
         checkSerialPortOutput(response);
@@ -8964,7 +9638,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InstancesResourceApi res = new api.ComputeApi(mock).instances;
       var arg_request = buildInstance();
       var arg_project = "foo";
@@ -9002,7 +9676,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_project, arg_zone).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -9011,7 +9685,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InstancesResourceApi res = new api.ComputeApi(mock).instances;
       var arg_project = "foo";
       var arg_zone = "foo";
@@ -9051,7 +9725,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildInstanceList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, arg_zone, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.InstanceList response) {
         checkInstanceList(response);
@@ -9060,7 +9734,7 @@
 
     unittest.test("method--reset", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InstancesResourceApi res = new api.ComputeApi(mock).instances;
       var arg_project = "foo";
       var arg_zone = "foo";
@@ -9095,7 +9769,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.reset(arg_project, arg_zone, arg_instance).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -9104,7 +9778,7 @@
 
     unittest.test("method--setDiskAutoDelete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InstancesResourceApi res = new api.ComputeApi(mock).instances;
       var arg_project = "foo";
       var arg_zone = "foo";
@@ -9143,7 +9817,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.setDiskAutoDelete(arg_project, arg_zone, arg_instance, arg_autoDelete, arg_deviceName).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -9152,7 +9826,7 @@
 
     unittest.test("method--setMetadata", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InstancesResourceApi res = new api.ComputeApi(mock).instances;
       var arg_request = buildMetadata();
       var arg_project = "foo";
@@ -9191,7 +9865,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.setMetadata(arg_request, arg_project, arg_zone, arg_instance).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -9200,7 +9874,7 @@
 
     unittest.test("method--setScheduling", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InstancesResourceApi res = new api.ComputeApi(mock).instances;
       var arg_request = buildScheduling();
       var arg_project = "foo";
@@ -9239,7 +9913,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.setScheduling(arg_request, arg_project, arg_zone, arg_instance).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -9248,7 +9922,7 @@
 
     unittest.test("method--setTags", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InstancesResourceApi res = new api.ComputeApi(mock).instances;
       var arg_request = buildTags();
       var arg_project = "foo";
@@ -9287,7 +9961,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.setTags(arg_request, arg_project, arg_zone, arg_instance).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -9296,7 +9970,7 @@
 
     unittest.test("method--start", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InstancesResourceApi res = new api.ComputeApi(mock).instances;
       var arg_project = "foo";
       var arg_zone = "foo";
@@ -9331,7 +10005,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.start(arg_project, arg_zone, arg_instance).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -9340,7 +10014,7 @@
 
     unittest.test("method--stop", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InstancesResourceApi res = new api.ComputeApi(mock).instances;
       var arg_project = "foo";
       var arg_zone = "foo";
@@ -9375,7 +10049,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.stop(arg_project, arg_zone, arg_instance).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -9388,7 +10062,7 @@
   unittest.group("resource-LicensesResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LicensesResourceApi res = new api.ComputeApi(mock).licenses;
       var arg_project = "foo";
       var arg_license = "foo";
@@ -9422,7 +10096,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLicense());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_license).then(unittest.expectAsync(((api.License response) {
         checkLicense(response);
@@ -9435,7 +10109,7 @@
   unittest.group("resource-MachineTypesResourceApi", () {
     unittest.test("method--aggregatedList", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MachineTypesResourceApi res = new api.ComputeApi(mock).machineTypes;
       var arg_project = "foo";
       var arg_filter = "foo";
@@ -9474,7 +10148,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMachineTypeAggregatedList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.aggregatedList(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.MachineTypeAggregatedList response) {
         checkMachineTypeAggregatedList(response);
@@ -9483,7 +10157,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MachineTypesResourceApi res = new api.ComputeApi(mock).machineTypes;
       var arg_project = "foo";
       var arg_zone = "foo";
@@ -9518,7 +10192,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMachineType());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_zone, arg_machineType).then(unittest.expectAsync(((api.MachineType response) {
         checkMachineType(response);
@@ -9527,7 +10201,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MachineTypesResourceApi res = new api.ComputeApi(mock).machineTypes;
       var arg_project = "foo";
       var arg_zone = "foo";
@@ -9567,7 +10241,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMachineTypeList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, arg_zone, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.MachineTypeList response) {
         checkMachineTypeList(response);
@@ -9580,7 +10254,7 @@
   unittest.group("resource-NetworksResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.NetworksResourceApi res = new api.ComputeApi(mock).networks;
       var arg_project = "foo";
       var arg_network = "foo";
@@ -9614,7 +10288,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_project, arg_network).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -9623,7 +10297,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.NetworksResourceApi res = new api.ComputeApi(mock).networks;
       var arg_project = "foo";
       var arg_network = "foo";
@@ -9657,7 +10331,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildNetwork());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_network).then(unittest.expectAsync(((api.Network response) {
         checkNetwork(response);
@@ -9666,7 +10340,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.NetworksResourceApi res = new api.ComputeApi(mock).networks;
       var arg_request = buildNetwork();
       var arg_project = "foo";
@@ -9703,7 +10377,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_project).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -9712,7 +10386,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.NetworksResourceApi res = new api.ComputeApi(mock).networks;
       var arg_project = "foo";
       var arg_filter = "foo";
@@ -9751,7 +10425,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildNetworkList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.NetworkList response) {
         checkNetworkList(response);
@@ -9764,7 +10438,7 @@
   unittest.group("resource-ProjectsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ProjectsResourceApi res = new api.ComputeApi(mock).projects;
       var arg_project = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -9797,16 +10471,108 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProject());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project).then(unittest.expectAsync(((api.Project response) {
         checkProject(response);
       })));
     });
 
+    unittest.test("method--moveDisk", () {
+
+      var mock = new HttpServerMock();
+      api.ProjectsResourceApi res = new api.ComputeApi(mock).projects;
+      var arg_request = buildDiskMoveRequest();
+      var arg_project = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var obj = new api.DiskMoveRequest.fromJson(json);
+        checkDiskMoveRequest(obj);
+
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildOperation());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.moveDisk(arg_request, arg_project).then(unittest.expectAsync(((api.Operation response) {
+        checkOperation(response);
+      })));
+    });
+
+    unittest.test("method--moveInstance", () {
+
+      var mock = new HttpServerMock();
+      api.ProjectsResourceApi res = new api.ComputeApi(mock).projects;
+      var arg_request = buildInstanceMoveRequest();
+      var arg_project = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var obj = new api.InstanceMoveRequest.fromJson(json);
+        checkInstanceMoveRequest(obj);
+
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildOperation());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.moveInstance(arg_request, arg_project).then(unittest.expectAsync(((api.Operation response) {
+        checkOperation(response);
+      })));
+    });
+
     unittest.test("method--setCommonInstanceMetadata", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ProjectsResourceApi res = new api.ComputeApi(mock).projects;
       var arg_request = buildMetadata();
       var arg_project = "foo";
@@ -9843,7 +10609,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.setCommonInstanceMetadata(arg_request, arg_project).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -9852,7 +10618,7 @@
 
     unittest.test("method--setUsageExportBucket", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ProjectsResourceApi res = new api.ComputeApi(mock).projects;
       var arg_request = buildUsageExportLocation();
       var arg_project = "foo";
@@ -9889,7 +10655,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.setUsageExportBucket(arg_request, arg_project).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -9902,7 +10668,7 @@
   unittest.group("resource-RegionOperationsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RegionOperationsResourceApi res = new api.ComputeApi(mock).regionOperations;
       var arg_project = "foo";
       var arg_region = "foo";
@@ -9937,14 +10703,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_project, arg_region, arg_operation).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RegionOperationsResourceApi res = new api.ComputeApi(mock).regionOperations;
       var arg_project = "foo";
       var arg_region = "foo";
@@ -9979,7 +10745,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_region, arg_operation).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -9988,7 +10754,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RegionOperationsResourceApi res = new api.ComputeApi(mock).regionOperations;
       var arg_project = "foo";
       var arg_region = "foo";
@@ -10028,7 +10794,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperationList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, arg_region, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.OperationList response) {
         checkOperationList(response);
@@ -10041,7 +10807,7 @@
   unittest.group("resource-RegionsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RegionsResourceApi res = new api.ComputeApi(mock).regions;
       var arg_project = "foo";
       var arg_region = "foo";
@@ -10075,7 +10841,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRegion());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_region).then(unittest.expectAsync(((api.Region response) {
         checkRegion(response);
@@ -10084,7 +10850,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RegionsResourceApi res = new api.ComputeApi(mock).regions;
       var arg_project = "foo";
       var arg_filter = "foo";
@@ -10123,7 +10889,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRegionList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.RegionList response) {
         checkRegionList(response);
@@ -10136,7 +10902,7 @@
   unittest.group("resource-RoutesResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RoutesResourceApi res = new api.ComputeApi(mock).routes;
       var arg_project = "foo";
       var arg_route = "foo";
@@ -10170,7 +10936,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_project, arg_route).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -10179,7 +10945,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RoutesResourceApi res = new api.ComputeApi(mock).routes;
       var arg_project = "foo";
       var arg_route = "foo";
@@ -10213,7 +10979,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRoute());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_route).then(unittest.expectAsync(((api.Route response) {
         checkRoute(response);
@@ -10222,7 +10988,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RoutesResourceApi res = new api.ComputeApi(mock).routes;
       var arg_request = buildRoute();
       var arg_project = "foo";
@@ -10259,7 +11025,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_project).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -10268,7 +11034,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RoutesResourceApi res = new api.ComputeApi(mock).routes;
       var arg_project = "foo";
       var arg_filter = "foo";
@@ -10307,7 +11073,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRouteList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.RouteList response) {
         checkRouteList(response);
@@ -10320,7 +11086,7 @@
   unittest.group("resource-SnapshotsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SnapshotsResourceApi res = new api.ComputeApi(mock).snapshots;
       var arg_project = "foo";
       var arg_snapshot = "foo";
@@ -10354,7 +11120,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_project, arg_snapshot).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -10363,7 +11129,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SnapshotsResourceApi res = new api.ComputeApi(mock).snapshots;
       var arg_project = "foo";
       var arg_snapshot = "foo";
@@ -10397,7 +11163,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSnapshot());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_snapshot).then(unittest.expectAsync(((api.Snapshot response) {
         checkSnapshot(response);
@@ -10406,7 +11172,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SnapshotsResourceApi res = new api.ComputeApi(mock).snapshots;
       var arg_project = "foo";
       var arg_filter = "foo";
@@ -10445,7 +11211,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSnapshotList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.SnapshotList response) {
         checkSnapshotList(response);
@@ -10458,7 +11224,7 @@
   unittest.group("resource-TargetHttpProxiesResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TargetHttpProxiesResourceApi res = new api.ComputeApi(mock).targetHttpProxies;
       var arg_project = "foo";
       var arg_targetHttpProxy = "foo";
@@ -10492,7 +11258,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_project, arg_targetHttpProxy).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -10501,7 +11267,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TargetHttpProxiesResourceApi res = new api.ComputeApi(mock).targetHttpProxies;
       var arg_project = "foo";
       var arg_targetHttpProxy = "foo";
@@ -10535,7 +11301,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTargetHttpProxy());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_targetHttpProxy).then(unittest.expectAsync(((api.TargetHttpProxy response) {
         checkTargetHttpProxy(response);
@@ -10544,7 +11310,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TargetHttpProxiesResourceApi res = new api.ComputeApi(mock).targetHttpProxies;
       var arg_request = buildTargetHttpProxy();
       var arg_project = "foo";
@@ -10581,7 +11347,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_project).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -10590,7 +11356,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TargetHttpProxiesResourceApi res = new api.ComputeApi(mock).targetHttpProxies;
       var arg_project = "foo";
       var arg_filter = "foo";
@@ -10629,7 +11395,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTargetHttpProxyList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.TargetHttpProxyList response) {
         checkTargetHttpProxyList(response);
@@ -10638,7 +11404,7 @@
 
     unittest.test("method--setUrlMap", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TargetHttpProxiesResourceApi res = new api.ComputeApi(mock).targetHttpProxies;
       var arg_request = buildUrlMapReference();
       var arg_project = "foo";
@@ -10676,7 +11442,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.setUrlMap(arg_request, arg_project, arg_targetHttpProxy).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -10689,7 +11455,7 @@
   unittest.group("resource-TargetInstancesResourceApi", () {
     unittest.test("method--aggregatedList", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TargetInstancesResourceApi res = new api.ComputeApi(mock).targetInstances;
       var arg_project = "foo";
       var arg_filter = "foo";
@@ -10728,7 +11494,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTargetInstanceAggregatedList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.aggregatedList(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.TargetInstanceAggregatedList response) {
         checkTargetInstanceAggregatedList(response);
@@ -10737,7 +11503,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TargetInstancesResourceApi res = new api.ComputeApi(mock).targetInstances;
       var arg_project = "foo";
       var arg_zone = "foo";
@@ -10772,7 +11538,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_project, arg_zone, arg_targetInstance).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -10781,7 +11547,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TargetInstancesResourceApi res = new api.ComputeApi(mock).targetInstances;
       var arg_project = "foo";
       var arg_zone = "foo";
@@ -10816,7 +11582,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTargetInstance());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_zone, arg_targetInstance).then(unittest.expectAsync(((api.TargetInstance response) {
         checkTargetInstance(response);
@@ -10825,7 +11591,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TargetInstancesResourceApi res = new api.ComputeApi(mock).targetInstances;
       var arg_request = buildTargetInstance();
       var arg_project = "foo";
@@ -10863,7 +11629,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_project, arg_zone).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -10872,7 +11638,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TargetInstancesResourceApi res = new api.ComputeApi(mock).targetInstances;
       var arg_project = "foo";
       var arg_zone = "foo";
@@ -10912,7 +11678,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTargetInstanceList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, arg_zone, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.TargetInstanceList response) {
         checkTargetInstanceList(response);
@@ -10925,7 +11691,7 @@
   unittest.group("resource-TargetPoolsResourceApi", () {
     unittest.test("method--addHealthCheck", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TargetPoolsResourceApi res = new api.ComputeApi(mock).targetPools;
       var arg_request = buildTargetPoolsAddHealthCheckRequest();
       var arg_project = "foo";
@@ -10964,7 +11730,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.addHealthCheck(arg_request, arg_project, arg_region, arg_targetPool).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -10973,7 +11739,7 @@
 
     unittest.test("method--addInstance", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TargetPoolsResourceApi res = new api.ComputeApi(mock).targetPools;
       var arg_request = buildTargetPoolsAddInstanceRequest();
       var arg_project = "foo";
@@ -11012,7 +11778,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.addInstance(arg_request, arg_project, arg_region, arg_targetPool).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -11021,7 +11787,7 @@
 
     unittest.test("method--aggregatedList", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TargetPoolsResourceApi res = new api.ComputeApi(mock).targetPools;
       var arg_project = "foo";
       var arg_filter = "foo";
@@ -11060,7 +11826,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTargetPoolAggregatedList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.aggregatedList(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.TargetPoolAggregatedList response) {
         checkTargetPoolAggregatedList(response);
@@ -11069,7 +11835,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TargetPoolsResourceApi res = new api.ComputeApi(mock).targetPools;
       var arg_project = "foo";
       var arg_region = "foo";
@@ -11104,7 +11870,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_project, arg_region, arg_targetPool).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -11113,7 +11879,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TargetPoolsResourceApi res = new api.ComputeApi(mock).targetPools;
       var arg_project = "foo";
       var arg_region = "foo";
@@ -11148,7 +11914,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTargetPool());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_region, arg_targetPool).then(unittest.expectAsync(((api.TargetPool response) {
         checkTargetPool(response);
@@ -11157,7 +11923,7 @@
 
     unittest.test("method--getHealth", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TargetPoolsResourceApi res = new api.ComputeApi(mock).targetPools;
       var arg_request = buildInstanceReference();
       var arg_project = "foo";
@@ -11196,7 +11962,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTargetPoolInstanceHealth());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.getHealth(arg_request, arg_project, arg_region, arg_targetPool).then(unittest.expectAsync(((api.TargetPoolInstanceHealth response) {
         checkTargetPoolInstanceHealth(response);
@@ -11205,7 +11971,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TargetPoolsResourceApi res = new api.ComputeApi(mock).targetPools;
       var arg_request = buildTargetPool();
       var arg_project = "foo";
@@ -11243,7 +12009,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_project, arg_region).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -11252,7 +12018,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TargetPoolsResourceApi res = new api.ComputeApi(mock).targetPools;
       var arg_project = "foo";
       var arg_region = "foo";
@@ -11292,7 +12058,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTargetPoolList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, arg_region, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.TargetPoolList response) {
         checkTargetPoolList(response);
@@ -11301,7 +12067,7 @@
 
     unittest.test("method--removeHealthCheck", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TargetPoolsResourceApi res = new api.ComputeApi(mock).targetPools;
       var arg_request = buildTargetPoolsRemoveHealthCheckRequest();
       var arg_project = "foo";
@@ -11340,7 +12106,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.removeHealthCheck(arg_request, arg_project, arg_region, arg_targetPool).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -11349,7 +12115,7 @@
 
     unittest.test("method--removeInstance", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TargetPoolsResourceApi res = new api.ComputeApi(mock).targetPools;
       var arg_request = buildTargetPoolsRemoveInstanceRequest();
       var arg_project = "foo";
@@ -11388,7 +12154,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.removeInstance(arg_request, arg_project, arg_region, arg_targetPool).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -11397,7 +12163,7 @@
 
     unittest.test("method--setBackup", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TargetPoolsResourceApi res = new api.ComputeApi(mock).targetPools;
       var arg_request = buildTargetReference();
       var arg_project = "foo";
@@ -11438,7 +12204,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.setBackup(arg_request, arg_project, arg_region, arg_targetPool, failoverRatio: arg_failoverRatio).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -11448,10 +12214,246 @@
   });
 
 
+  unittest.group("resource-TargetVpnGatewaysResourceApi", () {
+    unittest.test("method--aggregatedList", () {
+
+      var mock = new HttpServerMock();
+      api.TargetVpnGatewaysResourceApi res = new api.ComputeApi(mock).targetVpnGateways;
+      var arg_project = "foo";
+      var arg_filter = "foo";
+      var arg_maxResults = 42;
+      var arg_pageToken = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+        unittest.expect(queryMap["filter"].first, unittest.equals(arg_filter));
+        unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
+        unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildTargetVpnGatewayAggregatedList());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.aggregatedList(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.TargetVpnGatewayAggregatedList response) {
+        checkTargetVpnGatewayAggregatedList(response);
+      })));
+    });
+
+    unittest.test("method--delete", () {
+
+      var mock = new HttpServerMock();
+      api.TargetVpnGatewaysResourceApi res = new api.ComputeApi(mock).targetVpnGateways;
+      var arg_project = "foo";
+      var arg_region = "foo";
+      var arg_targetVpnGateway = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildOperation());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.delete(arg_project, arg_region, arg_targetVpnGateway).then(unittest.expectAsync(((api.Operation response) {
+        checkOperation(response);
+      })));
+    });
+
+    unittest.test("method--get", () {
+
+      var mock = new HttpServerMock();
+      api.TargetVpnGatewaysResourceApi res = new api.ComputeApi(mock).targetVpnGateways;
+      var arg_project = "foo";
+      var arg_region = "foo";
+      var arg_targetVpnGateway = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildTargetVpnGateway());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.get(arg_project, arg_region, arg_targetVpnGateway).then(unittest.expectAsync(((api.TargetVpnGateway response) {
+        checkTargetVpnGateway(response);
+      })));
+    });
+
+    unittest.test("method--insert", () {
+
+      var mock = new HttpServerMock();
+      api.TargetVpnGatewaysResourceApi res = new api.ComputeApi(mock).targetVpnGateways;
+      var arg_request = buildTargetVpnGateway();
+      var arg_project = "foo";
+      var arg_region = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var obj = new api.TargetVpnGateway.fromJson(json);
+        checkTargetVpnGateway(obj);
+
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildOperation());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.insert(arg_request, arg_project, arg_region).then(unittest.expectAsync(((api.Operation response) {
+        checkOperation(response);
+      })));
+    });
+
+    unittest.test("method--list", () {
+
+      var mock = new HttpServerMock();
+      api.TargetVpnGatewaysResourceApi res = new api.ComputeApi(mock).targetVpnGateways;
+      var arg_project = "foo";
+      var arg_region = "foo";
+      var arg_filter = "foo";
+      var arg_maxResults = 42;
+      var arg_pageToken = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+        unittest.expect(queryMap["filter"].first, unittest.equals(arg_filter));
+        unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
+        unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildTargetVpnGatewayList());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.list(arg_project, arg_region, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.TargetVpnGatewayList response) {
+        checkTargetVpnGatewayList(response);
+      })));
+    });
+
+  });
+
+
   unittest.group("resource-UrlMapsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UrlMapsResourceApi res = new api.ComputeApi(mock).urlMaps;
       var arg_project = "foo";
       var arg_urlMap = "foo";
@@ -11485,7 +12487,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_project, arg_urlMap).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -11494,7 +12496,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UrlMapsResourceApi res = new api.ComputeApi(mock).urlMaps;
       var arg_project = "foo";
       var arg_urlMap = "foo";
@@ -11528,7 +12530,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUrlMap());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_urlMap).then(unittest.expectAsync(((api.UrlMap response) {
         checkUrlMap(response);
@@ -11537,7 +12539,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UrlMapsResourceApi res = new api.ComputeApi(mock).urlMaps;
       var arg_request = buildUrlMap();
       var arg_project = "foo";
@@ -11574,7 +12576,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_project).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -11583,7 +12585,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UrlMapsResourceApi res = new api.ComputeApi(mock).urlMaps;
       var arg_project = "foo";
       var arg_filter = "foo";
@@ -11622,7 +12624,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUrlMapList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.UrlMapList response) {
         checkUrlMapList(response);
@@ -11631,7 +12633,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UrlMapsResourceApi res = new api.ComputeApi(mock).urlMaps;
       var arg_request = buildUrlMap();
       var arg_project = "foo";
@@ -11669,7 +12671,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_project, arg_urlMap).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -11678,7 +12680,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UrlMapsResourceApi res = new api.ComputeApi(mock).urlMaps;
       var arg_request = buildUrlMap();
       var arg_project = "foo";
@@ -11716,7 +12718,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_project, arg_urlMap).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -11725,7 +12727,7 @@
 
     unittest.test("method--validate", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UrlMapsResourceApi res = new api.ComputeApi(mock).urlMaps;
       var arg_request = buildUrlMapsValidateRequest();
       var arg_project = "foo";
@@ -11763,7 +12765,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUrlMapsValidateResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.validate(arg_request, arg_project, arg_urlMap).then(unittest.expectAsync(((api.UrlMapsValidateResponse response) {
         checkUrlMapsValidateResponse(response);
@@ -11773,10 +12775,246 @@
   });
 
 
+  unittest.group("resource-VpnTunnelsResourceApi", () {
+    unittest.test("method--aggregatedList", () {
+
+      var mock = new HttpServerMock();
+      api.VpnTunnelsResourceApi res = new api.ComputeApi(mock).vpnTunnels;
+      var arg_project = "foo";
+      var arg_filter = "foo";
+      var arg_maxResults = 42;
+      var arg_pageToken = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+        unittest.expect(queryMap["filter"].first, unittest.equals(arg_filter));
+        unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
+        unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildVpnTunnelAggregatedList());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.aggregatedList(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.VpnTunnelAggregatedList response) {
+        checkVpnTunnelAggregatedList(response);
+      })));
+    });
+
+    unittest.test("method--delete", () {
+
+      var mock = new HttpServerMock();
+      api.VpnTunnelsResourceApi res = new api.ComputeApi(mock).vpnTunnels;
+      var arg_project = "foo";
+      var arg_region = "foo";
+      var arg_vpnTunnel = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildOperation());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.delete(arg_project, arg_region, arg_vpnTunnel).then(unittest.expectAsync(((api.Operation response) {
+        checkOperation(response);
+      })));
+    });
+
+    unittest.test("method--get", () {
+
+      var mock = new HttpServerMock();
+      api.VpnTunnelsResourceApi res = new api.ComputeApi(mock).vpnTunnels;
+      var arg_project = "foo";
+      var arg_region = "foo";
+      var arg_vpnTunnel = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildVpnTunnel());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.get(arg_project, arg_region, arg_vpnTunnel).then(unittest.expectAsync(((api.VpnTunnel response) {
+        checkVpnTunnel(response);
+      })));
+    });
+
+    unittest.test("method--insert", () {
+
+      var mock = new HttpServerMock();
+      api.VpnTunnelsResourceApi res = new api.ComputeApi(mock).vpnTunnels;
+      var arg_request = buildVpnTunnel();
+      var arg_project = "foo";
+      var arg_region = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var obj = new api.VpnTunnel.fromJson(json);
+        checkVpnTunnel(obj);
+
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildOperation());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.insert(arg_request, arg_project, arg_region).then(unittest.expectAsync(((api.Operation response) {
+        checkOperation(response);
+      })));
+    });
+
+    unittest.test("method--list", () {
+
+      var mock = new HttpServerMock();
+      api.VpnTunnelsResourceApi res = new api.ComputeApi(mock).vpnTunnels;
+      var arg_project = "foo";
+      var arg_region = "foo";
+      var arg_filter = "foo";
+      var arg_maxResults = 42;
+      var arg_pageToken = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+        unittest.expect(queryMap["filter"].first, unittest.equals(arg_filter));
+        unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
+        unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildVpnTunnelList());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.list(arg_project, arg_region, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.VpnTunnelList response) {
+        checkVpnTunnelList(response);
+      })));
+    });
+
+  });
+
+
   unittest.group("resource-ZoneOperationsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ZoneOperationsResourceApi res = new api.ComputeApi(mock).zoneOperations;
       var arg_project = "foo";
       var arg_zone = "foo";
@@ -11811,14 +13049,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_project, arg_zone, arg_operation).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ZoneOperationsResourceApi res = new api.ComputeApi(mock).zoneOperations;
       var arg_project = "foo";
       var arg_zone = "foo";
@@ -11853,7 +13091,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_zone, arg_operation).then(unittest.expectAsync(((api.Operation response) {
         checkOperation(response);
@@ -11862,7 +13100,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ZoneOperationsResourceApi res = new api.ComputeApi(mock).zoneOperations;
       var arg_project = "foo";
       var arg_zone = "foo";
@@ -11902,7 +13140,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperationList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, arg_zone, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.OperationList response) {
         checkOperationList(response);
@@ -11915,7 +13153,7 @@
   unittest.group("resource-ZonesResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ZonesResourceApi res = new api.ComputeApi(mock).zones;
       var arg_project = "foo";
       var arg_zone = "foo";
@@ -11949,7 +13187,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildZone());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_zone).then(unittest.expectAsync(((api.Zone response) {
         checkZone(response);
@@ -11958,7 +13196,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ZonesResourceApi res = new api.ComputeApi(mock).zones;
       var arg_project = "foo";
       var arg_filter = "foo";
@@ -11997,7 +13235,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildZoneList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, filter: arg_filter, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.ZoneList response) {
         checkZoneList(response);
diff --git a/generated/googleapis/test/content/v2_test.dart b/generated/googleapis/test/content/v2_test.dart
index 59d524a..4337615 100644
--- a/generated/googleapis/test/content/v2_test.dart
+++ b/generated/googleapis/test/content/v2_test.dart
@@ -8,35 +8,70 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/content/v2.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
 
-buildUnnamed539() {
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+buildUnnamed558() {
   var o = new core.List<api.AccountAdwordsLink>();
   o.add(buildAccountAdwordsLink());
   o.add(buildAccountAdwordsLink());
   return o;
 }
 
-checkUnnamed539(core.List<api.AccountAdwordsLink> o) {
+checkUnnamed558(core.List<api.AccountAdwordsLink> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountAdwordsLink(o[0]);
   checkAccountAdwordsLink(o[1]);
 }
 
-buildUnnamed540() {
+buildUnnamed559() {
   var o = new core.List<api.AccountUser>();
   o.add(buildAccountUser());
   o.add(buildAccountUser());
   return o;
 }
 
-checkUnnamed540(core.List<api.AccountUser> o) {
+checkUnnamed559(core.List<api.AccountUser> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountUser(o[0]);
   checkAccountUser(o[1]);
@@ -48,13 +83,13 @@
   buildCounterAccount++;
   if (buildCounterAccount < 3) {
     o.adultContent = true;
-    o.adwordsLinks = buildUnnamed539();
+    o.adwordsLinks = buildUnnamed558();
     o.id = "foo";
     o.kind = "foo";
     o.name = "foo";
     o.reviewsUrl = "foo";
     o.sellerId = "foo";
-    o.users = buildUnnamed540();
+    o.users = buildUnnamed559();
     o.websiteUrl = "foo";
   }
   buildCounterAccount--;
@@ -65,13 +100,13 @@
   buildCounterAccount++;
   if (buildCounterAccount < 3) {
     unittest.expect(o.adultContent, unittest.isTrue);
-    checkUnnamed539(o.adwordsLinks);
+    checkUnnamed558(o.adwordsLinks);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.reviewsUrl, unittest.equals('foo'));
     unittest.expect(o.sellerId, unittest.equals('foo'));
-    checkUnnamed540(o.users);
+    checkUnnamed559(o.users);
     unittest.expect(o.websiteUrl, unittest.equals('foo'));
   }
   buildCounterAccount--;
@@ -98,53 +133,74 @@
   buildCounterAccountAdwordsLink--;
 }
 
-buildUnnamed541() {
+core.int buildCounterAccountIdentifier = 0;
+buildAccountIdentifier() {
+  var o = new api.AccountIdentifier();
+  buildCounterAccountIdentifier++;
+  if (buildCounterAccountIdentifier < 3) {
+    o.aggregatorId = "foo";
+    o.merchantId = "foo";
+  }
+  buildCounterAccountIdentifier--;
+  return o;
+}
+
+checkAccountIdentifier(api.AccountIdentifier o) {
+  buildCounterAccountIdentifier++;
+  if (buildCounterAccountIdentifier < 3) {
+    unittest.expect(o.aggregatorId, unittest.equals('foo'));
+    unittest.expect(o.merchantId, unittest.equals('foo'));
+  }
+  buildCounterAccountIdentifier--;
+}
+
+buildUnnamed560() {
   var o = new core.List<api.AccountShippingCarrierRate>();
   o.add(buildAccountShippingCarrierRate());
   o.add(buildAccountShippingCarrierRate());
   return o;
 }
 
-checkUnnamed541(core.List<api.AccountShippingCarrierRate> o) {
+checkUnnamed560(core.List<api.AccountShippingCarrierRate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountShippingCarrierRate(o[0]);
   checkAccountShippingCarrierRate(o[1]);
 }
 
-buildUnnamed542() {
+buildUnnamed561() {
   var o = new core.List<api.AccountShippingLocationGroup>();
   o.add(buildAccountShippingLocationGroup());
   o.add(buildAccountShippingLocationGroup());
   return o;
 }
 
-checkUnnamed542(core.List<api.AccountShippingLocationGroup> o) {
+checkUnnamed561(core.List<api.AccountShippingLocationGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountShippingLocationGroup(o[0]);
   checkAccountShippingLocationGroup(o[1]);
 }
 
-buildUnnamed543() {
+buildUnnamed562() {
   var o = new core.List<api.AccountShippingRateTable>();
   o.add(buildAccountShippingRateTable());
   o.add(buildAccountShippingRateTable());
   return o;
 }
 
-checkUnnamed543(core.List<api.AccountShippingRateTable> o) {
+checkUnnamed562(core.List<api.AccountShippingRateTable> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountShippingRateTable(o[0]);
   checkAccountShippingRateTable(o[1]);
 }
 
-buildUnnamed544() {
+buildUnnamed563() {
   var o = new core.List<api.AccountShippingShippingService>();
   o.add(buildAccountShippingShippingService());
   o.add(buildAccountShippingShippingService());
   return o;
 }
 
-checkUnnamed544(core.List<api.AccountShippingShippingService> o) {
+checkUnnamed563(core.List<api.AccountShippingShippingService> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountShippingShippingService(o[0]);
   checkAccountShippingShippingService(o[1]);
@@ -156,11 +212,11 @@
   buildCounterAccountShipping++;
   if (buildCounterAccountShipping < 3) {
     o.accountId = "foo";
-    o.carrierRates = buildUnnamed541();
+    o.carrierRates = buildUnnamed560();
     o.kind = "foo";
-    o.locationGroups = buildUnnamed542();
-    o.rateTables = buildUnnamed543();
-    o.services = buildUnnamed544();
+    o.locationGroups = buildUnnamed561();
+    o.rateTables = buildUnnamed562();
+    o.services = buildUnnamed563();
   }
   buildCounterAccountShipping--;
   return o;
@@ -170,11 +226,11 @@
   buildCounterAccountShipping++;
   if (buildCounterAccountShipping < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
-    checkUnnamed541(o.carrierRates);
+    checkUnnamed560(o.carrierRates);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed542(o.locationGroups);
-    checkUnnamed543(o.rateTables);
-    checkUnnamed544(o.services);
+    checkUnnamed561(o.locationGroups);
+    checkUnnamed562(o.rateTables);
+    checkUnnamed563(o.services);
   }
   buildCounterAccountShipping--;
 }
@@ -241,40 +297,40 @@
   buildCounterAccountShippingCondition--;
 }
 
-buildUnnamed545() {
+buildUnnamed564() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed545(core.List<core.String> o) {
+checkUnnamed564(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed546() {
+buildUnnamed565() {
   var o = new core.List<api.AccountShippingPostalCodeRange>();
   o.add(buildAccountShippingPostalCodeRange());
   o.add(buildAccountShippingPostalCodeRange());
   return o;
 }
 
-checkUnnamed546(core.List<api.AccountShippingPostalCodeRange> o) {
+checkUnnamed565(core.List<api.AccountShippingPostalCodeRange> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountShippingPostalCodeRange(o[0]);
   checkAccountShippingPostalCodeRange(o[1]);
 }
 
-buildUnnamed547() {
+buildUnnamed566() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed547(core.List<core.String> o) {
+checkUnnamed566(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -286,10 +342,10 @@
   buildCounterAccountShippingLocationGroup++;
   if (buildCounterAccountShippingLocationGroup < 3) {
     o.country = "foo";
-    o.locationIds = buildUnnamed545();
+    o.locationIds = buildUnnamed564();
     o.name = "foo";
-    o.postalCodeRanges = buildUnnamed546();
-    o.postalCodes = buildUnnamed547();
+    o.postalCodeRanges = buildUnnamed565();
+    o.postalCodes = buildUnnamed566();
   }
   buildCounterAccountShippingLocationGroup--;
   return o;
@@ -299,10 +355,10 @@
   buildCounterAccountShippingLocationGroup++;
   if (buildCounterAccountShippingLocationGroup < 3) {
     unittest.expect(o.country, unittest.equals('foo'));
-    checkUnnamed545(o.locationIds);
+    checkUnnamed564(o.locationIds);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed546(o.postalCodeRanges);
-    checkUnnamed547(o.postalCodes);
+    checkUnnamed565(o.postalCodeRanges);
+    checkUnnamed566(o.postalCodes);
   }
   buildCounterAccountShippingLocationGroup--;
 }
@@ -328,14 +384,14 @@
   buildCounterAccountShippingPostalCodeRange--;
 }
 
-buildUnnamed548() {
+buildUnnamed567() {
   var o = new core.List<api.AccountShippingRateTableCell>();
   o.add(buildAccountShippingRateTableCell());
   o.add(buildAccountShippingRateTableCell());
   return o;
 }
 
-checkUnnamed548(core.List<api.AccountShippingRateTableCell> o) {
+checkUnnamed567(core.List<api.AccountShippingRateTableCell> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountShippingRateTableCell(o[0]);
   checkAccountShippingRateTableCell(o[1]);
@@ -346,7 +402,7 @@
   var o = new api.AccountShippingRateTable();
   buildCounterAccountShippingRateTable++;
   if (buildCounterAccountShippingRateTable < 3) {
-    o.content = buildUnnamed548();
+    o.content = buildUnnamed567();
     o.name = "foo";
     o.saleCountry = "foo";
   }
@@ -357,7 +413,7 @@
 checkAccountShippingRateTable(api.AccountShippingRateTable o) {
   buildCounterAccountShippingRateTable++;
   if (buildCounterAccountShippingRateTable < 3) {
-    checkUnnamed548(o.content);
+    checkUnnamed567(o.content);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.saleCountry, unittest.equals('foo'));
   }
@@ -439,14 +495,14 @@
   buildCounterAccountShippingShippingServiceCalculationMethod--;
 }
 
-buildUnnamed549() {
+buildUnnamed568() {
   var o = new core.List<api.AccountShippingShippingServiceCostRule>();
   o.add(buildAccountShippingShippingServiceCostRule());
   o.add(buildAccountShippingShippingServiceCostRule());
   return o;
 }
 
-checkUnnamed549(core.List<api.AccountShippingShippingServiceCostRule> o) {
+checkUnnamed568(core.List<api.AccountShippingShippingServiceCostRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountShippingShippingServiceCostRule(o[0]);
   checkAccountShippingShippingServiceCostRule(o[1]);
@@ -458,7 +514,7 @@
   buildCounterAccountShippingShippingServiceCostRule++;
   if (buildCounterAccountShippingShippingServiceCostRule < 3) {
     o.calculationMethod = buildAccountShippingShippingServiceCalculationMethod();
-    o.children = buildUnnamed549();
+    o.children = buildUnnamed568();
     o.condition = buildAccountShippingCondition();
   }
   buildCounterAccountShippingShippingServiceCostRule--;
@@ -469,20 +525,20 @@
   buildCounterAccountShippingShippingServiceCostRule++;
   if (buildCounterAccountShippingShippingServiceCostRule < 3) {
     checkAccountShippingShippingServiceCalculationMethod(o.calculationMethod);
-    checkUnnamed549(o.children);
+    checkUnnamed568(o.children);
     checkAccountShippingCondition(o.condition);
   }
   buildCounterAccountShippingShippingServiceCostRule--;
 }
 
-buildUnnamed550() {
+buildUnnamed569() {
   var o = new core.List<api.AccountStatusDataQualityIssue>();
   o.add(buildAccountStatusDataQualityIssue());
   o.add(buildAccountStatusDataQualityIssue());
   return o;
 }
 
-checkUnnamed550(core.List<api.AccountStatusDataQualityIssue> o) {
+checkUnnamed569(core.List<api.AccountStatusDataQualityIssue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountStatusDataQualityIssue(o[0]);
   checkAccountStatusDataQualityIssue(o[1]);
@@ -494,7 +550,7 @@
   buildCounterAccountStatus++;
   if (buildCounterAccountStatus < 3) {
     o.accountId = "foo";
-    o.dataQualityIssues = buildUnnamed550();
+    o.dataQualityIssues = buildUnnamed569();
     o.kind = "foo";
   }
   buildCounterAccountStatus--;
@@ -505,20 +561,20 @@
   buildCounterAccountStatus++;
   if (buildCounterAccountStatus < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
-    checkUnnamed550(o.dataQualityIssues);
+    checkUnnamed569(o.dataQualityIssues);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAccountStatus--;
 }
 
-buildUnnamed551() {
+buildUnnamed570() {
   var o = new core.List<api.AccountStatusExampleItem>();
   o.add(buildAccountStatusExampleItem());
   o.add(buildAccountStatusExampleItem());
   return o;
 }
 
-checkUnnamed551(core.List<api.AccountStatusExampleItem> o) {
+checkUnnamed570(core.List<api.AccountStatusExampleItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountStatusExampleItem(o[0]);
   checkAccountStatusExampleItem(o[1]);
@@ -531,7 +587,7 @@
   if (buildCounterAccountStatusDataQualityIssue < 3) {
     o.country = "foo";
     o.displayedValue = "foo";
-    o.exampleItems = buildUnnamed551();
+    o.exampleItems = buildUnnamed570();
     o.id = "foo";
     o.lastChecked = "foo";
     o.numItems = 42;
@@ -547,7 +603,7 @@
   if (buildCounterAccountStatusDataQualityIssue < 3) {
     unittest.expect(o.country, unittest.equals('foo'));
     unittest.expect(o.displayedValue, unittest.equals('foo'));
-    checkUnnamed551(o.exampleItems);
+    checkUnnamed570(o.exampleItems);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.lastChecked, unittest.equals('foo'));
     unittest.expect(o.numItems, unittest.equals(42));
@@ -584,14 +640,14 @@
   buildCounterAccountStatusExampleItem--;
 }
 
-buildUnnamed552() {
+buildUnnamed571() {
   var o = new core.List<api.AccountTaxTaxRule>();
   o.add(buildAccountTaxTaxRule());
   o.add(buildAccountTaxTaxRule());
   return o;
 }
 
-checkUnnamed552(core.List<api.AccountTaxTaxRule> o) {
+checkUnnamed571(core.List<api.AccountTaxTaxRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountTaxTaxRule(o[0]);
   checkAccountTaxTaxRule(o[1]);
@@ -604,7 +660,7 @@
   if (buildCounterAccountTax < 3) {
     o.accountId = "foo";
     o.kind = "foo";
-    o.rules = buildUnnamed552();
+    o.rules = buildUnnamed571();
   }
   buildCounterAccountTax--;
   return o;
@@ -615,7 +671,7 @@
   if (buildCounterAccountTax < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed552(o.rules);
+    checkUnnamed571(o.rules);
   }
   buildCounterAccountTax--;
 }
@@ -668,14 +724,48 @@
   buildCounterAccountUser--;
 }
 
-buildUnnamed553() {
+buildUnnamed572() {
+  var o = new core.List<api.AccountIdentifier>();
+  o.add(buildAccountIdentifier());
+  o.add(buildAccountIdentifier());
+  return o;
+}
+
+checkUnnamed572(core.List<api.AccountIdentifier> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkAccountIdentifier(o[0]);
+  checkAccountIdentifier(o[1]);
+}
+
+core.int buildCounterAccountsAuthInfoResponse = 0;
+buildAccountsAuthInfoResponse() {
+  var o = new api.AccountsAuthInfoResponse();
+  buildCounterAccountsAuthInfoResponse++;
+  if (buildCounterAccountsAuthInfoResponse < 3) {
+    o.accountIdentifiers = buildUnnamed572();
+    o.kind = "foo";
+  }
+  buildCounterAccountsAuthInfoResponse--;
+  return o;
+}
+
+checkAccountsAuthInfoResponse(api.AccountsAuthInfoResponse o) {
+  buildCounterAccountsAuthInfoResponse++;
+  if (buildCounterAccountsAuthInfoResponse < 3) {
+    checkUnnamed572(o.accountIdentifiers);
+    unittest.expect(o.kind, unittest.equals('foo'));
+  }
+  buildCounterAccountsAuthInfoResponse--;
+}
+
+buildUnnamed573() {
   var o = new core.List<api.AccountsCustomBatchRequestEntry>();
   o.add(buildAccountsCustomBatchRequestEntry());
   o.add(buildAccountsCustomBatchRequestEntry());
   return o;
 }
 
-checkUnnamed553(core.List<api.AccountsCustomBatchRequestEntry> o) {
+checkUnnamed573(core.List<api.AccountsCustomBatchRequestEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountsCustomBatchRequestEntry(o[0]);
   checkAccountsCustomBatchRequestEntry(o[1]);
@@ -686,7 +776,7 @@
   var o = new api.AccountsCustomBatchRequest();
   buildCounterAccountsCustomBatchRequest++;
   if (buildCounterAccountsCustomBatchRequest < 3) {
-    o.entries = buildUnnamed553();
+    o.entries = buildUnnamed573();
   }
   buildCounterAccountsCustomBatchRequest--;
   return o;
@@ -695,7 +785,7 @@
 checkAccountsCustomBatchRequest(api.AccountsCustomBatchRequest o) {
   buildCounterAccountsCustomBatchRequest++;
   if (buildCounterAccountsCustomBatchRequest < 3) {
-    checkUnnamed553(o.entries);
+    checkUnnamed573(o.entries);
   }
   buildCounterAccountsCustomBatchRequest--;
 }
@@ -727,14 +817,14 @@
   buildCounterAccountsCustomBatchRequestEntry--;
 }
 
-buildUnnamed554() {
+buildUnnamed574() {
   var o = new core.List<api.AccountsCustomBatchResponseEntry>();
   o.add(buildAccountsCustomBatchResponseEntry());
   o.add(buildAccountsCustomBatchResponseEntry());
   return o;
 }
 
-checkUnnamed554(core.List<api.AccountsCustomBatchResponseEntry> o) {
+checkUnnamed574(core.List<api.AccountsCustomBatchResponseEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountsCustomBatchResponseEntry(o[0]);
   checkAccountsCustomBatchResponseEntry(o[1]);
@@ -745,7 +835,7 @@
   var o = new api.AccountsCustomBatchResponse();
   buildCounterAccountsCustomBatchResponse++;
   if (buildCounterAccountsCustomBatchResponse < 3) {
-    o.entries = buildUnnamed554();
+    o.entries = buildUnnamed574();
     o.kind = "foo";
   }
   buildCounterAccountsCustomBatchResponse--;
@@ -755,7 +845,7 @@
 checkAccountsCustomBatchResponse(api.AccountsCustomBatchResponse o) {
   buildCounterAccountsCustomBatchResponse++;
   if (buildCounterAccountsCustomBatchResponse < 3) {
-    checkUnnamed554(o.entries);
+    checkUnnamed574(o.entries);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAccountsCustomBatchResponse--;
@@ -786,14 +876,14 @@
   buildCounterAccountsCustomBatchResponseEntry--;
 }
 
-buildUnnamed555() {
+buildUnnamed575() {
   var o = new core.List<api.Account>();
   o.add(buildAccount());
   o.add(buildAccount());
   return o;
 }
 
-checkUnnamed555(core.List<api.Account> o) {
+checkUnnamed575(core.List<api.Account> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccount(o[0]);
   checkAccount(o[1]);
@@ -806,7 +896,7 @@
   if (buildCounterAccountsListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.resources = buildUnnamed555();
+    o.resources = buildUnnamed575();
   }
   buildCounterAccountsListResponse--;
   return o;
@@ -817,19 +907,19 @@
   if (buildCounterAccountsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed555(o.resources);
+    checkUnnamed575(o.resources);
   }
   buildCounterAccountsListResponse--;
 }
 
-buildUnnamed556() {
+buildUnnamed576() {
   var o = new core.List<api.AccountshippingCustomBatchRequestEntry>();
   o.add(buildAccountshippingCustomBatchRequestEntry());
   o.add(buildAccountshippingCustomBatchRequestEntry());
   return o;
 }
 
-checkUnnamed556(core.List<api.AccountshippingCustomBatchRequestEntry> o) {
+checkUnnamed576(core.List<api.AccountshippingCustomBatchRequestEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountshippingCustomBatchRequestEntry(o[0]);
   checkAccountshippingCustomBatchRequestEntry(o[1]);
@@ -840,7 +930,7 @@
   var o = new api.AccountshippingCustomBatchRequest();
   buildCounterAccountshippingCustomBatchRequest++;
   if (buildCounterAccountshippingCustomBatchRequest < 3) {
-    o.entries = buildUnnamed556();
+    o.entries = buildUnnamed576();
   }
   buildCounterAccountshippingCustomBatchRequest--;
   return o;
@@ -849,7 +939,7 @@
 checkAccountshippingCustomBatchRequest(api.AccountshippingCustomBatchRequest o) {
   buildCounterAccountshippingCustomBatchRequest++;
   if (buildCounterAccountshippingCustomBatchRequest < 3) {
-    checkUnnamed556(o.entries);
+    checkUnnamed576(o.entries);
   }
   buildCounterAccountshippingCustomBatchRequest--;
 }
@@ -881,14 +971,14 @@
   buildCounterAccountshippingCustomBatchRequestEntry--;
 }
 
-buildUnnamed557() {
+buildUnnamed577() {
   var o = new core.List<api.AccountshippingCustomBatchResponseEntry>();
   o.add(buildAccountshippingCustomBatchResponseEntry());
   o.add(buildAccountshippingCustomBatchResponseEntry());
   return o;
 }
 
-checkUnnamed557(core.List<api.AccountshippingCustomBatchResponseEntry> o) {
+checkUnnamed577(core.List<api.AccountshippingCustomBatchResponseEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountshippingCustomBatchResponseEntry(o[0]);
   checkAccountshippingCustomBatchResponseEntry(o[1]);
@@ -899,7 +989,7 @@
   var o = new api.AccountshippingCustomBatchResponse();
   buildCounterAccountshippingCustomBatchResponse++;
   if (buildCounterAccountshippingCustomBatchResponse < 3) {
-    o.entries = buildUnnamed557();
+    o.entries = buildUnnamed577();
     o.kind = "foo";
   }
   buildCounterAccountshippingCustomBatchResponse--;
@@ -909,7 +999,7 @@
 checkAccountshippingCustomBatchResponse(api.AccountshippingCustomBatchResponse o) {
   buildCounterAccountshippingCustomBatchResponse++;
   if (buildCounterAccountshippingCustomBatchResponse < 3) {
-    checkUnnamed557(o.entries);
+    checkUnnamed577(o.entries);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAccountshippingCustomBatchResponse--;
@@ -940,14 +1030,14 @@
   buildCounterAccountshippingCustomBatchResponseEntry--;
 }
 
-buildUnnamed558() {
+buildUnnamed578() {
   var o = new core.List<api.AccountShipping>();
   o.add(buildAccountShipping());
   o.add(buildAccountShipping());
   return o;
 }
 
-checkUnnamed558(core.List<api.AccountShipping> o) {
+checkUnnamed578(core.List<api.AccountShipping> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountShipping(o[0]);
   checkAccountShipping(o[1]);
@@ -960,7 +1050,7 @@
   if (buildCounterAccountshippingListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.resources = buildUnnamed558();
+    o.resources = buildUnnamed578();
   }
   buildCounterAccountshippingListResponse--;
   return o;
@@ -971,19 +1061,19 @@
   if (buildCounterAccountshippingListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed558(o.resources);
+    checkUnnamed578(o.resources);
   }
   buildCounterAccountshippingListResponse--;
 }
 
-buildUnnamed559() {
+buildUnnamed579() {
   var o = new core.List<api.AccountstatusesCustomBatchRequestEntry>();
   o.add(buildAccountstatusesCustomBatchRequestEntry());
   o.add(buildAccountstatusesCustomBatchRequestEntry());
   return o;
 }
 
-checkUnnamed559(core.List<api.AccountstatusesCustomBatchRequestEntry> o) {
+checkUnnamed579(core.List<api.AccountstatusesCustomBatchRequestEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountstatusesCustomBatchRequestEntry(o[0]);
   checkAccountstatusesCustomBatchRequestEntry(o[1]);
@@ -994,7 +1084,7 @@
   var o = new api.AccountstatusesCustomBatchRequest();
   buildCounterAccountstatusesCustomBatchRequest++;
   if (buildCounterAccountstatusesCustomBatchRequest < 3) {
-    o.entries = buildUnnamed559();
+    o.entries = buildUnnamed579();
   }
   buildCounterAccountstatusesCustomBatchRequest--;
   return o;
@@ -1003,7 +1093,7 @@
 checkAccountstatusesCustomBatchRequest(api.AccountstatusesCustomBatchRequest o) {
   buildCounterAccountstatusesCustomBatchRequest++;
   if (buildCounterAccountstatusesCustomBatchRequest < 3) {
-    checkUnnamed559(o.entries);
+    checkUnnamed579(o.entries);
   }
   buildCounterAccountstatusesCustomBatchRequest--;
 }
@@ -1033,14 +1123,14 @@
   buildCounterAccountstatusesCustomBatchRequestEntry--;
 }
 
-buildUnnamed560() {
+buildUnnamed580() {
   var o = new core.List<api.AccountstatusesCustomBatchResponseEntry>();
   o.add(buildAccountstatusesCustomBatchResponseEntry());
   o.add(buildAccountstatusesCustomBatchResponseEntry());
   return o;
 }
 
-checkUnnamed560(core.List<api.AccountstatusesCustomBatchResponseEntry> o) {
+checkUnnamed580(core.List<api.AccountstatusesCustomBatchResponseEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountstatusesCustomBatchResponseEntry(o[0]);
   checkAccountstatusesCustomBatchResponseEntry(o[1]);
@@ -1051,7 +1141,7 @@
   var o = new api.AccountstatusesCustomBatchResponse();
   buildCounterAccountstatusesCustomBatchResponse++;
   if (buildCounterAccountstatusesCustomBatchResponse < 3) {
-    o.entries = buildUnnamed560();
+    o.entries = buildUnnamed580();
     o.kind = "foo";
   }
   buildCounterAccountstatusesCustomBatchResponse--;
@@ -1061,7 +1151,7 @@
 checkAccountstatusesCustomBatchResponse(api.AccountstatusesCustomBatchResponse o) {
   buildCounterAccountstatusesCustomBatchResponse++;
   if (buildCounterAccountstatusesCustomBatchResponse < 3) {
-    checkUnnamed560(o.entries);
+    checkUnnamed580(o.entries);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAccountstatusesCustomBatchResponse--;
@@ -1090,14 +1180,14 @@
   buildCounterAccountstatusesCustomBatchResponseEntry--;
 }
 
-buildUnnamed561() {
+buildUnnamed581() {
   var o = new core.List<api.AccountStatus>();
   o.add(buildAccountStatus());
   o.add(buildAccountStatus());
   return o;
 }
 
-checkUnnamed561(core.List<api.AccountStatus> o) {
+checkUnnamed581(core.List<api.AccountStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountStatus(o[0]);
   checkAccountStatus(o[1]);
@@ -1110,7 +1200,7 @@
   if (buildCounterAccountstatusesListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.resources = buildUnnamed561();
+    o.resources = buildUnnamed581();
   }
   buildCounterAccountstatusesListResponse--;
   return o;
@@ -1121,19 +1211,19 @@
   if (buildCounterAccountstatusesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed561(o.resources);
+    checkUnnamed581(o.resources);
   }
   buildCounterAccountstatusesListResponse--;
 }
 
-buildUnnamed562() {
+buildUnnamed582() {
   var o = new core.List<api.AccounttaxCustomBatchRequestEntry>();
   o.add(buildAccounttaxCustomBatchRequestEntry());
   o.add(buildAccounttaxCustomBatchRequestEntry());
   return o;
 }
 
-checkUnnamed562(core.List<api.AccounttaxCustomBatchRequestEntry> o) {
+checkUnnamed582(core.List<api.AccounttaxCustomBatchRequestEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccounttaxCustomBatchRequestEntry(o[0]);
   checkAccounttaxCustomBatchRequestEntry(o[1]);
@@ -1144,7 +1234,7 @@
   var o = new api.AccounttaxCustomBatchRequest();
   buildCounterAccounttaxCustomBatchRequest++;
   if (buildCounterAccounttaxCustomBatchRequest < 3) {
-    o.entries = buildUnnamed562();
+    o.entries = buildUnnamed582();
   }
   buildCounterAccounttaxCustomBatchRequest--;
   return o;
@@ -1153,7 +1243,7 @@
 checkAccounttaxCustomBatchRequest(api.AccounttaxCustomBatchRequest o) {
   buildCounterAccounttaxCustomBatchRequest++;
   if (buildCounterAccounttaxCustomBatchRequest < 3) {
-    checkUnnamed562(o.entries);
+    checkUnnamed582(o.entries);
   }
   buildCounterAccounttaxCustomBatchRequest--;
 }
@@ -1185,14 +1275,14 @@
   buildCounterAccounttaxCustomBatchRequestEntry--;
 }
 
-buildUnnamed563() {
+buildUnnamed583() {
   var o = new core.List<api.AccounttaxCustomBatchResponseEntry>();
   o.add(buildAccounttaxCustomBatchResponseEntry());
   o.add(buildAccounttaxCustomBatchResponseEntry());
   return o;
 }
 
-checkUnnamed563(core.List<api.AccounttaxCustomBatchResponseEntry> o) {
+checkUnnamed583(core.List<api.AccounttaxCustomBatchResponseEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccounttaxCustomBatchResponseEntry(o[0]);
   checkAccounttaxCustomBatchResponseEntry(o[1]);
@@ -1203,7 +1293,7 @@
   var o = new api.AccounttaxCustomBatchResponse();
   buildCounterAccounttaxCustomBatchResponse++;
   if (buildCounterAccounttaxCustomBatchResponse < 3) {
-    o.entries = buildUnnamed563();
+    o.entries = buildUnnamed583();
     o.kind = "foo";
   }
   buildCounterAccounttaxCustomBatchResponse--;
@@ -1213,7 +1303,7 @@
 checkAccounttaxCustomBatchResponse(api.AccounttaxCustomBatchResponse o) {
   buildCounterAccounttaxCustomBatchResponse++;
   if (buildCounterAccounttaxCustomBatchResponse < 3) {
-    checkUnnamed563(o.entries);
+    checkUnnamed583(o.entries);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAccounttaxCustomBatchResponse--;
@@ -1244,14 +1334,14 @@
   buildCounterAccounttaxCustomBatchResponseEntry--;
 }
 
-buildUnnamed564() {
+buildUnnamed584() {
   var o = new core.List<api.AccountTax>();
   o.add(buildAccountTax());
   o.add(buildAccountTax());
   return o;
 }
 
-checkUnnamed564(core.List<api.AccountTax> o) {
+checkUnnamed584(core.List<api.AccountTax> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountTax(o[0]);
   checkAccountTax(o[1]);
@@ -1264,7 +1354,7 @@
   if (buildCounterAccounttaxListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.resources = buildUnnamed564();
+    o.resources = buildUnnamed584();
   }
   buildCounterAccounttaxListResponse--;
   return o;
@@ -1275,19 +1365,19 @@
   if (buildCounterAccounttaxListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed564(o.resources);
+    checkUnnamed584(o.resources);
   }
   buildCounterAccounttaxListResponse--;
 }
 
-buildUnnamed565() {
+buildUnnamed585() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed565(core.List<core.String> o) {
+checkUnnamed585(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1305,7 +1395,7 @@
     o.fileName = "foo";
     o.format = buildDatafeedFormat();
     o.id = "foo";
-    o.intendedDestinations = buildUnnamed565();
+    o.intendedDestinations = buildUnnamed585();
     o.kind = "foo";
     o.name = "foo";
     o.targetCountry = "foo";
@@ -1324,7 +1414,7 @@
     unittest.expect(o.fileName, unittest.equals('foo'));
     checkDatafeedFormat(o.format);
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed565(o.intendedDestinations);
+    checkUnnamed585(o.intendedDestinations);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.targetCountry, unittest.equals('foo'));
@@ -1386,27 +1476,27 @@
   buildCounterDatafeedFormat--;
 }
 
-buildUnnamed566() {
+buildUnnamed586() {
   var o = new core.List<api.DatafeedStatusError>();
   o.add(buildDatafeedStatusError());
   o.add(buildDatafeedStatusError());
   return o;
 }
 
-checkUnnamed566(core.List<api.DatafeedStatusError> o) {
+checkUnnamed586(core.List<api.DatafeedStatusError> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatafeedStatusError(o[0]);
   checkDatafeedStatusError(o[1]);
 }
 
-buildUnnamed567() {
+buildUnnamed587() {
   var o = new core.List<api.DatafeedStatusError>();
   o.add(buildDatafeedStatusError());
   o.add(buildDatafeedStatusError());
   return o;
 }
 
-checkUnnamed567(core.List<api.DatafeedStatusError> o) {
+checkUnnamed587(core.List<api.DatafeedStatusError> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatafeedStatusError(o[0]);
   checkDatafeedStatusError(o[1]);
@@ -1418,12 +1508,12 @@
   buildCounterDatafeedStatus++;
   if (buildCounterDatafeedStatus < 3) {
     o.datafeedId = "foo";
-    o.errors = buildUnnamed566();
+    o.errors = buildUnnamed586();
     o.itemsTotal = "foo";
     o.itemsValid = "foo";
     o.kind = "foo";
     o.processingStatus = "foo";
-    o.warnings = buildUnnamed567();
+    o.warnings = buildUnnamed587();
   }
   buildCounterDatafeedStatus--;
   return o;
@@ -1433,24 +1523,24 @@
   buildCounterDatafeedStatus++;
   if (buildCounterDatafeedStatus < 3) {
     unittest.expect(o.datafeedId, unittest.equals('foo'));
-    checkUnnamed566(o.errors);
+    checkUnnamed586(o.errors);
     unittest.expect(o.itemsTotal, unittest.equals('foo'));
     unittest.expect(o.itemsValid, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.processingStatus, unittest.equals('foo'));
-    checkUnnamed567(o.warnings);
+    checkUnnamed587(o.warnings);
   }
   buildCounterDatafeedStatus--;
 }
 
-buildUnnamed568() {
+buildUnnamed588() {
   var o = new core.List<api.DatafeedStatusExample>();
   o.add(buildDatafeedStatusExample());
   o.add(buildDatafeedStatusExample());
   return o;
 }
 
-checkUnnamed568(core.List<api.DatafeedStatusExample> o) {
+checkUnnamed588(core.List<api.DatafeedStatusExample> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatafeedStatusExample(o[0]);
   checkDatafeedStatusExample(o[1]);
@@ -1463,7 +1553,7 @@
   if (buildCounterDatafeedStatusError < 3) {
     o.code = "foo";
     o.count = "foo";
-    o.examples = buildUnnamed568();
+    o.examples = buildUnnamed588();
     o.message = "foo";
   }
   buildCounterDatafeedStatusError--;
@@ -1475,7 +1565,7 @@
   if (buildCounterDatafeedStatusError < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
     unittest.expect(o.count, unittest.equals('foo'));
-    checkUnnamed568(o.examples);
+    checkUnnamed588(o.examples);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterDatafeedStatusError--;
@@ -1504,14 +1594,14 @@
   buildCounterDatafeedStatusExample--;
 }
 
-buildUnnamed569() {
+buildUnnamed589() {
   var o = new core.List<api.DatafeedsCustomBatchRequestEntry>();
   o.add(buildDatafeedsCustomBatchRequestEntry());
   o.add(buildDatafeedsCustomBatchRequestEntry());
   return o;
 }
 
-checkUnnamed569(core.List<api.DatafeedsCustomBatchRequestEntry> o) {
+checkUnnamed589(core.List<api.DatafeedsCustomBatchRequestEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatafeedsCustomBatchRequestEntry(o[0]);
   checkDatafeedsCustomBatchRequestEntry(o[1]);
@@ -1522,7 +1612,7 @@
   var o = new api.DatafeedsCustomBatchRequest();
   buildCounterDatafeedsCustomBatchRequest++;
   if (buildCounterDatafeedsCustomBatchRequest < 3) {
-    o.entries = buildUnnamed569();
+    o.entries = buildUnnamed589();
   }
   buildCounterDatafeedsCustomBatchRequest--;
   return o;
@@ -1531,7 +1621,7 @@
 checkDatafeedsCustomBatchRequest(api.DatafeedsCustomBatchRequest o) {
   buildCounterDatafeedsCustomBatchRequest++;
   if (buildCounterDatafeedsCustomBatchRequest < 3) {
-    checkUnnamed569(o.entries);
+    checkUnnamed589(o.entries);
   }
   buildCounterDatafeedsCustomBatchRequest--;
 }
@@ -1563,14 +1653,14 @@
   buildCounterDatafeedsCustomBatchRequestEntry--;
 }
 
-buildUnnamed570() {
+buildUnnamed590() {
   var o = new core.List<api.DatafeedsCustomBatchResponseEntry>();
   o.add(buildDatafeedsCustomBatchResponseEntry());
   o.add(buildDatafeedsCustomBatchResponseEntry());
   return o;
 }
 
-checkUnnamed570(core.List<api.DatafeedsCustomBatchResponseEntry> o) {
+checkUnnamed590(core.List<api.DatafeedsCustomBatchResponseEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatafeedsCustomBatchResponseEntry(o[0]);
   checkDatafeedsCustomBatchResponseEntry(o[1]);
@@ -1581,7 +1671,7 @@
   var o = new api.DatafeedsCustomBatchResponse();
   buildCounterDatafeedsCustomBatchResponse++;
   if (buildCounterDatafeedsCustomBatchResponse < 3) {
-    o.entries = buildUnnamed570();
+    o.entries = buildUnnamed590();
     o.kind = "foo";
   }
   buildCounterDatafeedsCustomBatchResponse--;
@@ -1591,7 +1681,7 @@
 checkDatafeedsCustomBatchResponse(api.DatafeedsCustomBatchResponse o) {
   buildCounterDatafeedsCustomBatchResponse++;
   if (buildCounterDatafeedsCustomBatchResponse < 3) {
-    checkUnnamed570(o.entries);
+    checkUnnamed590(o.entries);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterDatafeedsCustomBatchResponse--;
@@ -1620,14 +1710,14 @@
   buildCounterDatafeedsCustomBatchResponseEntry--;
 }
 
-buildUnnamed571() {
+buildUnnamed591() {
   var o = new core.List<api.Datafeed>();
   o.add(buildDatafeed());
   o.add(buildDatafeed());
   return o;
 }
 
-checkUnnamed571(core.List<api.Datafeed> o) {
+checkUnnamed591(core.List<api.Datafeed> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatafeed(o[0]);
   checkDatafeed(o[1]);
@@ -1640,7 +1730,7 @@
   if (buildCounterDatafeedsListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.resources = buildUnnamed571();
+    o.resources = buildUnnamed591();
   }
   buildCounterDatafeedsListResponse--;
   return o;
@@ -1651,19 +1741,19 @@
   if (buildCounterDatafeedsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed571(o.resources);
+    checkUnnamed591(o.resources);
   }
   buildCounterDatafeedsListResponse--;
 }
 
-buildUnnamed572() {
+buildUnnamed592() {
   var o = new core.List<api.DatafeedstatusesCustomBatchRequestEntry>();
   o.add(buildDatafeedstatusesCustomBatchRequestEntry());
   o.add(buildDatafeedstatusesCustomBatchRequestEntry());
   return o;
 }
 
-checkUnnamed572(core.List<api.DatafeedstatusesCustomBatchRequestEntry> o) {
+checkUnnamed592(core.List<api.DatafeedstatusesCustomBatchRequestEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatafeedstatusesCustomBatchRequestEntry(o[0]);
   checkDatafeedstatusesCustomBatchRequestEntry(o[1]);
@@ -1674,7 +1764,7 @@
   var o = new api.DatafeedstatusesCustomBatchRequest();
   buildCounterDatafeedstatusesCustomBatchRequest++;
   if (buildCounterDatafeedstatusesCustomBatchRequest < 3) {
-    o.entries = buildUnnamed572();
+    o.entries = buildUnnamed592();
   }
   buildCounterDatafeedstatusesCustomBatchRequest--;
   return o;
@@ -1683,7 +1773,7 @@
 checkDatafeedstatusesCustomBatchRequest(api.DatafeedstatusesCustomBatchRequest o) {
   buildCounterDatafeedstatusesCustomBatchRequest++;
   if (buildCounterDatafeedstatusesCustomBatchRequest < 3) {
-    checkUnnamed572(o.entries);
+    checkUnnamed592(o.entries);
   }
   buildCounterDatafeedstatusesCustomBatchRequest--;
 }
@@ -1713,14 +1803,14 @@
   buildCounterDatafeedstatusesCustomBatchRequestEntry--;
 }
 
-buildUnnamed573() {
+buildUnnamed593() {
   var o = new core.List<api.DatafeedstatusesCustomBatchResponseEntry>();
   o.add(buildDatafeedstatusesCustomBatchResponseEntry());
   o.add(buildDatafeedstatusesCustomBatchResponseEntry());
   return o;
 }
 
-checkUnnamed573(core.List<api.DatafeedstatusesCustomBatchResponseEntry> o) {
+checkUnnamed593(core.List<api.DatafeedstatusesCustomBatchResponseEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatafeedstatusesCustomBatchResponseEntry(o[0]);
   checkDatafeedstatusesCustomBatchResponseEntry(o[1]);
@@ -1731,7 +1821,7 @@
   var o = new api.DatafeedstatusesCustomBatchResponse();
   buildCounterDatafeedstatusesCustomBatchResponse++;
   if (buildCounterDatafeedstatusesCustomBatchResponse < 3) {
-    o.entries = buildUnnamed573();
+    o.entries = buildUnnamed593();
     o.kind = "foo";
   }
   buildCounterDatafeedstatusesCustomBatchResponse--;
@@ -1741,7 +1831,7 @@
 checkDatafeedstatusesCustomBatchResponse(api.DatafeedstatusesCustomBatchResponse o) {
   buildCounterDatafeedstatusesCustomBatchResponse++;
   if (buildCounterDatafeedstatusesCustomBatchResponse < 3) {
-    checkUnnamed573(o.entries);
+    checkUnnamed593(o.entries);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterDatafeedstatusesCustomBatchResponse--;
@@ -1770,14 +1860,14 @@
   buildCounterDatafeedstatusesCustomBatchResponseEntry--;
 }
 
-buildUnnamed574() {
+buildUnnamed594() {
   var o = new core.List<api.DatafeedStatus>();
   o.add(buildDatafeedStatus());
   o.add(buildDatafeedStatus());
   return o;
 }
 
-checkUnnamed574(core.List<api.DatafeedStatus> o) {
+checkUnnamed594(core.List<api.DatafeedStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatafeedStatus(o[0]);
   checkDatafeedStatus(o[1]);
@@ -1790,7 +1880,7 @@
   if (buildCounterDatafeedstatusesListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.resources = buildUnnamed574();
+    o.resources = buildUnnamed594();
   }
   buildCounterDatafeedstatusesListResponse--;
   return o;
@@ -1801,7 +1891,7 @@
   if (buildCounterDatafeedstatusesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed574(o.resources);
+    checkUnnamed594(o.resources);
   }
   buildCounterDatafeedstatusesListResponse--;
 }
@@ -1829,14 +1919,14 @@
   buildCounterError--;
 }
 
-buildUnnamed575() {
+buildUnnamed595() {
   var o = new core.List<api.Error>();
   o.add(buildError());
   o.add(buildError());
   return o;
 }
 
-checkUnnamed575(core.List<api.Error> o) {
+checkUnnamed595(core.List<api.Error> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkError(o[0]);
   checkError(o[1]);
@@ -1848,7 +1938,7 @@
   buildCounterErrors++;
   if (buildCounterErrors < 3) {
     o.code = 42;
-    o.errors = buildUnnamed575();
+    o.errors = buildUnnamed595();
     o.message = "foo";
   }
   buildCounterErrors--;
@@ -1859,7 +1949,7 @@
   buildCounterErrors++;
   if (buildCounterErrors < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed575(o.errors);
+    checkUnnamed595(o.errors);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterErrors--;
@@ -1894,14 +1984,14 @@
   buildCounterInventory--;
 }
 
-buildUnnamed576() {
+buildUnnamed596() {
   var o = new core.List<api.InventoryCustomBatchRequestEntry>();
   o.add(buildInventoryCustomBatchRequestEntry());
   o.add(buildInventoryCustomBatchRequestEntry());
   return o;
 }
 
-checkUnnamed576(core.List<api.InventoryCustomBatchRequestEntry> o) {
+checkUnnamed596(core.List<api.InventoryCustomBatchRequestEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInventoryCustomBatchRequestEntry(o[0]);
   checkInventoryCustomBatchRequestEntry(o[1]);
@@ -1912,7 +2002,7 @@
   var o = new api.InventoryCustomBatchRequest();
   buildCounterInventoryCustomBatchRequest++;
   if (buildCounterInventoryCustomBatchRequest < 3) {
-    o.entries = buildUnnamed576();
+    o.entries = buildUnnamed596();
   }
   buildCounterInventoryCustomBatchRequest--;
   return o;
@@ -1921,7 +2011,7 @@
 checkInventoryCustomBatchRequest(api.InventoryCustomBatchRequest o) {
   buildCounterInventoryCustomBatchRequest++;
   if (buildCounterInventoryCustomBatchRequest < 3) {
-    checkUnnamed576(o.entries);
+    checkUnnamed596(o.entries);
   }
   buildCounterInventoryCustomBatchRequest--;
 }
@@ -1953,14 +2043,14 @@
   buildCounterInventoryCustomBatchRequestEntry--;
 }
 
-buildUnnamed577() {
+buildUnnamed597() {
   var o = new core.List<api.InventoryCustomBatchResponseEntry>();
   o.add(buildInventoryCustomBatchResponseEntry());
   o.add(buildInventoryCustomBatchResponseEntry());
   return o;
 }
 
-checkUnnamed577(core.List<api.InventoryCustomBatchResponseEntry> o) {
+checkUnnamed597(core.List<api.InventoryCustomBatchResponseEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInventoryCustomBatchResponseEntry(o[0]);
   checkInventoryCustomBatchResponseEntry(o[1]);
@@ -1971,7 +2061,7 @@
   var o = new api.InventoryCustomBatchResponse();
   buildCounterInventoryCustomBatchResponse++;
   if (buildCounterInventoryCustomBatchResponse < 3) {
-    o.entries = buildUnnamed577();
+    o.entries = buildUnnamed597();
     o.kind = "foo";
   }
   buildCounterInventoryCustomBatchResponse--;
@@ -1981,7 +2071,7 @@
 checkInventoryCustomBatchResponse(api.InventoryCustomBatchResponse o) {
   buildCounterInventoryCustomBatchResponse++;
   if (buildCounterInventoryCustomBatchResponse < 3) {
-    checkUnnamed577(o.entries);
+    checkUnnamed597(o.entries);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterInventoryCustomBatchResponse--;
@@ -2100,144 +2190,157 @@
   buildCounterPrice--;
 }
 
-buildUnnamed578() {
+buildUnnamed598() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed578(core.List<core.String> o) {
+checkUnnamed598(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed579() {
+buildUnnamed599() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed579(core.List<core.String> o) {
+checkUnnamed599(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed580() {
+buildUnnamed600() {
+  var o = new core.List<api.ProductAspect>();
+  o.add(buildProductAspect());
+  o.add(buildProductAspect());
+  return o;
+}
+
+checkUnnamed600(core.List<api.ProductAspect> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkProductAspect(o[0]);
+  checkProductAspect(o[1]);
+}
+
+buildUnnamed601() {
   var o = new core.List<api.ProductCustomAttribute>();
   o.add(buildProductCustomAttribute());
   o.add(buildProductCustomAttribute());
   return o;
 }
 
-checkUnnamed580(core.List<api.ProductCustomAttribute> o) {
+checkUnnamed601(core.List<api.ProductCustomAttribute> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductCustomAttribute(o[0]);
   checkProductCustomAttribute(o[1]);
 }
 
-buildUnnamed581() {
+buildUnnamed602() {
   var o = new core.List<api.ProductCustomGroup>();
   o.add(buildProductCustomGroup());
   o.add(buildProductCustomGroup());
   return o;
 }
 
-checkUnnamed581(core.List<api.ProductCustomGroup> o) {
+checkUnnamed602(core.List<api.ProductCustomGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductCustomGroup(o[0]);
   checkProductCustomGroup(o[1]);
 }
 
-buildUnnamed582() {
+buildUnnamed603() {
   var o = new core.List<api.ProductDestination>();
   o.add(buildProductDestination());
   o.add(buildProductDestination());
   return o;
 }
 
-checkUnnamed582(core.List<api.ProductDestination> o) {
+checkUnnamed603(core.List<api.ProductDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductDestination(o[0]);
   checkProductDestination(o[1]);
 }
 
-buildUnnamed583() {
+buildUnnamed604() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed583(core.List<core.String> o) {
+checkUnnamed604(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed584() {
+buildUnnamed605() {
   var o = new core.List<api.ProductShipping>();
   o.add(buildProductShipping());
   o.add(buildProductShipping());
   return o;
 }
 
-checkUnnamed584(core.List<api.ProductShipping> o) {
+checkUnnamed605(core.List<api.ProductShipping> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductShipping(o[0]);
   checkProductShipping(o[1]);
 }
 
-buildUnnamed585() {
+buildUnnamed606() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed585(core.List<core.String> o) {
+checkUnnamed606(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed586() {
+buildUnnamed607() {
   var o = new core.List<api.ProductTax>();
   o.add(buildProductTax());
   o.add(buildProductTax());
   return o;
 }
 
-checkUnnamed586(core.List<api.ProductTax> o) {
+checkUnnamed607(core.List<api.ProductTax> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductTax(o[0]);
   checkProductTax(o[1]);
 }
 
-buildUnnamed587() {
+buildUnnamed608() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed587(core.List<core.String> o) {
+checkUnnamed608(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed588() {
+buildUnnamed609() {
   var o = new core.List<api.Error>();
   o.add(buildError());
   o.add(buildError());
   return o;
 }
 
-checkUnnamed588(core.List<api.Error> o) {
+checkUnnamed609(core.List<api.Error> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkError(o[0]);
   checkError(o[1]);
@@ -2248,12 +2351,13 @@
   var o = new api.Product();
   buildCounterProduct++;
   if (buildCounterProduct < 3) {
-    o.additionalImageLinks = buildUnnamed578();
+    o.additionalImageLinks = buildUnnamed598();
     o.adult = true;
     o.adwordsGrouping = "foo";
-    o.adwordsLabels = buildUnnamed579();
+    o.adwordsLabels = buildUnnamed599();
     o.adwordsRedirect = "foo";
     o.ageGroup = "foo";
+    o.aspects = buildUnnamed600();
     o.availability = "foo";
     o.availabilityDate = "foo";
     o.brand = "foo";
@@ -2261,18 +2365,18 @@
     o.color = "foo";
     o.condition = "foo";
     o.contentLanguage = "foo";
-    o.customAttributes = buildUnnamed580();
-    o.customGroups = buildUnnamed581();
+    o.customAttributes = buildUnnamed601();
+    o.customGroups = buildUnnamed602();
     o.customLabel0 = "foo";
     o.customLabel1 = "foo";
     o.customLabel2 = "foo";
     o.customLabel3 = "foo";
     o.customLabel4 = "foo";
     o.description = "foo";
-    o.destinations = buildUnnamed582();
+    o.destinations = buildUnnamed603();
     o.displayAdsId = "foo";
     o.displayAdsLink = "foo";
-    o.displayAdsSimilarIds = buildUnnamed583();
+    o.displayAdsSimilarIds = buildUnnamed604();
     o.displayAdsTitle = "foo";
     o.displayAdsValue = 42.0;
     o.energyEfficiencyClass = "foo";
@@ -2300,7 +2404,7 @@
     o.productType = "foo";
     o.salePrice = buildPrice();
     o.salePriceEffectiveDate = "foo";
-    o.shipping = buildUnnamed584();
+    o.shipping = buildUnnamed605();
     o.shippingHeight = buildProductShippingDimension();
     o.shippingLabel = "foo";
     o.shippingLength = buildProductShippingDimension();
@@ -2308,14 +2412,14 @@
     o.shippingWidth = buildProductShippingDimension();
     o.sizeSystem = "foo";
     o.sizeType = "foo";
-    o.sizes = buildUnnamed585();
+    o.sizes = buildUnnamed606();
     o.targetCountry = "foo";
-    o.taxes = buildUnnamed586();
+    o.taxes = buildUnnamed607();
     o.title = "foo";
     o.unitPricingBaseMeasure = buildProductUnitPricingBaseMeasure();
     o.unitPricingMeasure = buildProductUnitPricingMeasure();
-    o.validatedDestinations = buildUnnamed587();
-    o.warnings = buildUnnamed588();
+    o.validatedDestinations = buildUnnamed608();
+    o.warnings = buildUnnamed609();
   }
   buildCounterProduct--;
   return o;
@@ -2324,12 +2428,13 @@
 checkProduct(api.Product o) {
   buildCounterProduct++;
   if (buildCounterProduct < 3) {
-    checkUnnamed578(o.additionalImageLinks);
+    checkUnnamed598(o.additionalImageLinks);
     unittest.expect(o.adult, unittest.isTrue);
     unittest.expect(o.adwordsGrouping, unittest.equals('foo'));
-    checkUnnamed579(o.adwordsLabels);
+    checkUnnamed599(o.adwordsLabels);
     unittest.expect(o.adwordsRedirect, unittest.equals('foo'));
     unittest.expect(o.ageGroup, unittest.equals('foo'));
+    checkUnnamed600(o.aspects);
     unittest.expect(o.availability, unittest.equals('foo'));
     unittest.expect(o.availabilityDate, unittest.equals('foo'));
     unittest.expect(o.brand, unittest.equals('foo'));
@@ -2337,18 +2442,18 @@
     unittest.expect(o.color, unittest.equals('foo'));
     unittest.expect(o.condition, unittest.equals('foo'));
     unittest.expect(o.contentLanguage, unittest.equals('foo'));
-    checkUnnamed580(o.customAttributes);
-    checkUnnamed581(o.customGroups);
+    checkUnnamed601(o.customAttributes);
+    checkUnnamed602(o.customGroups);
     unittest.expect(o.customLabel0, unittest.equals('foo'));
     unittest.expect(o.customLabel1, unittest.equals('foo'));
     unittest.expect(o.customLabel2, unittest.equals('foo'));
     unittest.expect(o.customLabel3, unittest.equals('foo'));
     unittest.expect(o.customLabel4, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed582(o.destinations);
+    checkUnnamed603(o.destinations);
     unittest.expect(o.displayAdsId, unittest.equals('foo'));
     unittest.expect(o.displayAdsLink, unittest.equals('foo'));
-    checkUnnamed583(o.displayAdsSimilarIds);
+    checkUnnamed604(o.displayAdsSimilarIds);
     unittest.expect(o.displayAdsTitle, unittest.equals('foo'));
     unittest.expect(o.displayAdsValue, unittest.equals(42.0));
     unittest.expect(o.energyEfficiencyClass, unittest.equals('foo'));
@@ -2376,7 +2481,7 @@
     unittest.expect(o.productType, unittest.equals('foo'));
     checkPrice(o.salePrice);
     unittest.expect(o.salePriceEffectiveDate, unittest.equals('foo'));
-    checkUnnamed584(o.shipping);
+    checkUnnamed605(o.shipping);
     checkProductShippingDimension(o.shippingHeight);
     unittest.expect(o.shippingLabel, unittest.equals('foo'));
     checkProductShippingDimension(o.shippingLength);
@@ -2384,18 +2489,41 @@
     checkProductShippingDimension(o.shippingWidth);
     unittest.expect(o.sizeSystem, unittest.equals('foo'));
     unittest.expect(o.sizeType, unittest.equals('foo'));
-    checkUnnamed585(o.sizes);
+    checkUnnamed606(o.sizes);
     unittest.expect(o.targetCountry, unittest.equals('foo'));
-    checkUnnamed586(o.taxes);
+    checkUnnamed607(o.taxes);
     unittest.expect(o.title, unittest.equals('foo'));
     checkProductUnitPricingBaseMeasure(o.unitPricingBaseMeasure);
     checkProductUnitPricingMeasure(o.unitPricingMeasure);
-    checkUnnamed587(o.validatedDestinations);
-    checkUnnamed588(o.warnings);
+    checkUnnamed608(o.validatedDestinations);
+    checkUnnamed609(o.warnings);
   }
   buildCounterProduct--;
 }
 
+core.int buildCounterProductAspect = 0;
+buildProductAspect() {
+  var o = new api.ProductAspect();
+  buildCounterProductAspect++;
+  if (buildCounterProductAspect < 3) {
+    o.aspectName = "foo";
+    o.destinationName = "foo";
+    o.intention = "foo";
+  }
+  buildCounterProductAspect--;
+  return o;
+}
+
+checkProductAspect(api.ProductAspect o) {
+  buildCounterProductAspect++;
+  if (buildCounterProductAspect < 3) {
+    unittest.expect(o.aspectName, unittest.equals('foo'));
+    unittest.expect(o.destinationName, unittest.equals('foo'));
+    unittest.expect(o.intention, unittest.equals('foo'));
+  }
+  buildCounterProductAspect--;
+}
+
 core.int buildCounterProductCustomAttribute = 0;
 buildProductCustomAttribute() {
   var o = new api.ProductCustomAttribute();
@@ -2421,14 +2549,14 @@
   buildCounterProductCustomAttribute--;
 }
 
-buildUnnamed589() {
+buildUnnamed610() {
   var o = new core.List<api.ProductCustomAttribute>();
   o.add(buildProductCustomAttribute());
   o.add(buildProductCustomAttribute());
   return o;
 }
 
-checkUnnamed589(core.List<api.ProductCustomAttribute> o) {
+checkUnnamed610(core.List<api.ProductCustomAttribute> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductCustomAttribute(o[0]);
   checkProductCustomAttribute(o[1]);
@@ -2439,7 +2567,7 @@
   var o = new api.ProductCustomGroup();
   buildCounterProductCustomGroup++;
   if (buildCounterProductCustomGroup < 3) {
-    o.attributes = buildUnnamed589();
+    o.attributes = buildUnnamed610();
     o.name = "foo";
   }
   buildCounterProductCustomGroup--;
@@ -2449,7 +2577,7 @@
 checkProductCustomGroup(api.ProductCustomGroup o) {
   buildCounterProductCustomGroup++;
   if (buildCounterProductCustomGroup < 3) {
-    checkUnnamed589(o.attributes);
+    checkUnnamed610(o.attributes);
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterProductCustomGroup--;
@@ -2570,27 +2698,27 @@
   buildCounterProductShippingWeight--;
 }
 
-buildUnnamed590() {
+buildUnnamed611() {
   var o = new core.List<api.ProductStatusDataQualityIssue>();
   o.add(buildProductStatusDataQualityIssue());
   o.add(buildProductStatusDataQualityIssue());
   return o;
 }
 
-checkUnnamed590(core.List<api.ProductStatusDataQualityIssue> o) {
+checkUnnamed611(core.List<api.ProductStatusDataQualityIssue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductStatusDataQualityIssue(o[0]);
   checkProductStatusDataQualityIssue(o[1]);
 }
 
-buildUnnamed591() {
+buildUnnamed612() {
   var o = new core.List<api.ProductStatusDestinationStatus>();
   o.add(buildProductStatusDestinationStatus());
   o.add(buildProductStatusDestinationStatus());
   return o;
 }
 
-checkUnnamed591(core.List<api.ProductStatusDestinationStatus> o) {
+checkUnnamed612(core.List<api.ProductStatusDestinationStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductStatusDestinationStatus(o[0]);
   checkProductStatusDestinationStatus(o[1]);
@@ -2602,8 +2730,8 @@
   buildCounterProductStatus++;
   if (buildCounterProductStatus < 3) {
     o.creationDate = "foo";
-    o.dataQualityIssues = buildUnnamed590();
-    o.destinationStatuses = buildUnnamed591();
+    o.dataQualityIssues = buildUnnamed611();
+    o.destinationStatuses = buildUnnamed612();
     o.googleExpirationDate = "foo";
     o.kind = "foo";
     o.lastUpdateDate = "foo";
@@ -2619,8 +2747,8 @@
   buildCounterProductStatus++;
   if (buildCounterProductStatus < 3) {
     unittest.expect(o.creationDate, unittest.equals('foo'));
-    checkUnnamed590(o.dataQualityIssues);
-    checkUnnamed591(o.destinationStatuses);
+    checkUnnamed611(o.dataQualityIssues);
+    checkUnnamed612(o.destinationStatuses);
     unittest.expect(o.googleExpirationDate, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.lastUpdateDate, unittest.equals('foo'));
@@ -2758,14 +2886,14 @@
   buildCounterProductUnitPricingMeasure--;
 }
 
-buildUnnamed592() {
+buildUnnamed613() {
   var o = new core.List<api.ProductsCustomBatchRequestEntry>();
   o.add(buildProductsCustomBatchRequestEntry());
   o.add(buildProductsCustomBatchRequestEntry());
   return o;
 }
 
-checkUnnamed592(core.List<api.ProductsCustomBatchRequestEntry> o) {
+checkUnnamed613(core.List<api.ProductsCustomBatchRequestEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductsCustomBatchRequestEntry(o[0]);
   checkProductsCustomBatchRequestEntry(o[1]);
@@ -2776,7 +2904,7 @@
   var o = new api.ProductsCustomBatchRequest();
   buildCounterProductsCustomBatchRequest++;
   if (buildCounterProductsCustomBatchRequest < 3) {
-    o.entries = buildUnnamed592();
+    o.entries = buildUnnamed613();
   }
   buildCounterProductsCustomBatchRequest--;
   return o;
@@ -2785,7 +2913,7 @@
 checkProductsCustomBatchRequest(api.ProductsCustomBatchRequest o) {
   buildCounterProductsCustomBatchRequest++;
   if (buildCounterProductsCustomBatchRequest < 3) {
-    checkUnnamed592(o.entries);
+    checkUnnamed613(o.entries);
   }
   buildCounterProductsCustomBatchRequest--;
 }
@@ -2817,14 +2945,14 @@
   buildCounterProductsCustomBatchRequestEntry--;
 }
 
-buildUnnamed593() {
+buildUnnamed614() {
   var o = new core.List<api.ProductsCustomBatchResponseEntry>();
   o.add(buildProductsCustomBatchResponseEntry());
   o.add(buildProductsCustomBatchResponseEntry());
   return o;
 }
 
-checkUnnamed593(core.List<api.ProductsCustomBatchResponseEntry> o) {
+checkUnnamed614(core.List<api.ProductsCustomBatchResponseEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductsCustomBatchResponseEntry(o[0]);
   checkProductsCustomBatchResponseEntry(o[1]);
@@ -2835,7 +2963,7 @@
   var o = new api.ProductsCustomBatchResponse();
   buildCounterProductsCustomBatchResponse++;
   if (buildCounterProductsCustomBatchResponse < 3) {
-    o.entries = buildUnnamed593();
+    o.entries = buildUnnamed614();
     o.kind = "foo";
   }
   buildCounterProductsCustomBatchResponse--;
@@ -2845,7 +2973,7 @@
 checkProductsCustomBatchResponse(api.ProductsCustomBatchResponse o) {
   buildCounterProductsCustomBatchResponse++;
   if (buildCounterProductsCustomBatchResponse < 3) {
-    checkUnnamed593(o.entries);
+    checkUnnamed614(o.entries);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterProductsCustomBatchResponse--;
@@ -2876,14 +3004,14 @@
   buildCounterProductsCustomBatchResponseEntry--;
 }
 
-buildUnnamed594() {
+buildUnnamed615() {
   var o = new core.List<api.Product>();
   o.add(buildProduct());
   o.add(buildProduct());
   return o;
 }
 
-checkUnnamed594(core.List<api.Product> o) {
+checkUnnamed615(core.List<api.Product> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProduct(o[0]);
   checkProduct(o[1]);
@@ -2896,7 +3024,7 @@
   if (buildCounterProductsListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.resources = buildUnnamed594();
+    o.resources = buildUnnamed615();
   }
   buildCounterProductsListResponse--;
   return o;
@@ -2907,19 +3035,19 @@
   if (buildCounterProductsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed594(o.resources);
+    checkUnnamed615(o.resources);
   }
   buildCounterProductsListResponse--;
 }
 
-buildUnnamed595() {
+buildUnnamed616() {
   var o = new core.List<api.ProductstatusesCustomBatchRequestEntry>();
   o.add(buildProductstatusesCustomBatchRequestEntry());
   o.add(buildProductstatusesCustomBatchRequestEntry());
   return o;
 }
 
-checkUnnamed595(core.List<api.ProductstatusesCustomBatchRequestEntry> o) {
+checkUnnamed616(core.List<api.ProductstatusesCustomBatchRequestEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductstatusesCustomBatchRequestEntry(o[0]);
   checkProductstatusesCustomBatchRequestEntry(o[1]);
@@ -2930,7 +3058,7 @@
   var o = new api.ProductstatusesCustomBatchRequest();
   buildCounterProductstatusesCustomBatchRequest++;
   if (buildCounterProductstatusesCustomBatchRequest < 3) {
-    o.entries = buildUnnamed595();
+    o.entries = buildUnnamed616();
   }
   buildCounterProductstatusesCustomBatchRequest--;
   return o;
@@ -2939,7 +3067,7 @@
 checkProductstatusesCustomBatchRequest(api.ProductstatusesCustomBatchRequest o) {
   buildCounterProductstatusesCustomBatchRequest++;
   if (buildCounterProductstatusesCustomBatchRequest < 3) {
-    checkUnnamed595(o.entries);
+    checkUnnamed616(o.entries);
   }
   buildCounterProductstatusesCustomBatchRequest--;
 }
@@ -2969,14 +3097,14 @@
   buildCounterProductstatusesCustomBatchRequestEntry--;
 }
 
-buildUnnamed596() {
+buildUnnamed617() {
   var o = new core.List<api.ProductstatusesCustomBatchResponseEntry>();
   o.add(buildProductstatusesCustomBatchResponseEntry());
   o.add(buildProductstatusesCustomBatchResponseEntry());
   return o;
 }
 
-checkUnnamed596(core.List<api.ProductstatusesCustomBatchResponseEntry> o) {
+checkUnnamed617(core.List<api.ProductstatusesCustomBatchResponseEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductstatusesCustomBatchResponseEntry(o[0]);
   checkProductstatusesCustomBatchResponseEntry(o[1]);
@@ -2987,7 +3115,7 @@
   var o = new api.ProductstatusesCustomBatchResponse();
   buildCounterProductstatusesCustomBatchResponse++;
   if (buildCounterProductstatusesCustomBatchResponse < 3) {
-    o.entries = buildUnnamed596();
+    o.entries = buildUnnamed617();
     o.kind = "foo";
   }
   buildCounterProductstatusesCustomBatchResponse--;
@@ -2997,7 +3125,7 @@
 checkProductstatusesCustomBatchResponse(api.ProductstatusesCustomBatchResponse o) {
   buildCounterProductstatusesCustomBatchResponse++;
   if (buildCounterProductstatusesCustomBatchResponse < 3) {
-    checkUnnamed596(o.entries);
+    checkUnnamed617(o.entries);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterProductstatusesCustomBatchResponse--;
@@ -3028,14 +3156,14 @@
   buildCounterProductstatusesCustomBatchResponseEntry--;
 }
 
-buildUnnamed597() {
+buildUnnamed618() {
   var o = new core.List<api.ProductStatus>();
   o.add(buildProductStatus());
   o.add(buildProductStatus());
   return o;
 }
 
-checkUnnamed597(core.List<api.ProductStatus> o) {
+checkUnnamed618(core.List<api.ProductStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductStatus(o[0]);
   checkProductStatus(o[1]);
@@ -3048,7 +3176,7 @@
   if (buildCounterProductstatusesListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.resources = buildUnnamed597();
+    o.resources = buildUnnamed618();
   }
   buildCounterProductstatusesListResponse--;
   return o;
@@ -3059,7 +3187,7 @@
   if (buildCounterProductstatusesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed597(o.resources);
+    checkUnnamed618(o.resources);
   }
   buildCounterProductstatusesListResponse--;
 }
@@ -3105,6 +3233,15 @@
   });
 
 
+  unittest.group("obj-schema-AccountIdentifier", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildAccountIdentifier();
+      var od = new api.AccountIdentifier.fromJson(o.toJson());
+      checkAccountIdentifier(od);
+    });
+  });
+
+
   unittest.group("obj-schema-AccountShipping", () {
     unittest.test("to-json--from-json", () {
       var o = buildAccountShipping();
@@ -3249,6 +3386,15 @@
   });
 
 
+  unittest.group("obj-schema-AccountsAuthInfoResponse", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildAccountsAuthInfoResponse();
+      var od = new api.AccountsAuthInfoResponse.fromJson(o.toJson());
+      checkAccountsAuthInfoResponse(od);
+    });
+  });
+
+
   unittest.group("obj-schema-AccountsCustomBatchRequest", () {
     unittest.test("to-json--from-json", () {
       var o = buildAccountsCustomBatchRequest();
@@ -3681,6 +3827,15 @@
   });
 
 
+  unittest.group("obj-schema-ProductAspect", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildProductAspect();
+      var od = new api.ProductAspect.fromJson(o.toJson());
+      checkProductAspect(od);
+    });
+  });
+
+
   unittest.group("obj-schema-ProductCustomAttribute", () {
     unittest.test("to-json--from-json", () {
       var o = buildProductCustomAttribute();
@@ -3898,9 +4053,54 @@
 
 
   unittest.group("resource-AccountsResourceApi", () {
+    unittest.test("method--authinfo", () {
+
+      var mock = new HttpServerMock();
+      api.AccountsResourceApi res = new api.ContentApi(mock).accounts;
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 11), unittest.equals("content/v2/"));
+        pathOffset += 11;
+        unittest.expect(path.substring(pathOffset, pathOffset + 17), unittest.equals("accounts/authinfo"));
+        pathOffset += 17;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildAccountsAuthInfoResponse());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.authinfo().then(unittest.expectAsync(((api.AccountsAuthInfoResponse response) {
+        checkAccountsAuthInfoResponse(response);
+      })));
+    });
+
     unittest.test("method--custombatch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.ContentApi(mock).accounts;
       var arg_request = buildAccountsCustomBatchRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -3940,7 +4140,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountsCustomBatchResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.custombatch(arg_request).then(unittest.expectAsync(((api.AccountsCustomBatchResponse response) {
         checkAccountsCustomBatchResponse(response);
@@ -3949,7 +4149,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.ContentApi(mock).accounts;
       var arg_merchantId = "foo";
       var arg_accountId = "foo";
@@ -3983,14 +4183,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_merchantId, arg_accountId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.ContentApi(mock).accounts;
       var arg_merchantId = "foo";
       var arg_accountId = "foo";
@@ -4024,7 +4224,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccount());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_merchantId, arg_accountId).then(unittest.expectAsync(((api.Account response) {
         checkAccount(response);
@@ -4033,7 +4233,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.ContentApi(mock).accounts;
       var arg_request = buildAccount();
       var arg_merchantId = "foo";
@@ -4070,7 +4270,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccount());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_merchantId).then(unittest.expectAsync(((api.Account response) {
         checkAccount(response);
@@ -4079,7 +4279,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.ContentApi(mock).accounts;
       var arg_merchantId = "foo";
       var arg_maxResults = 42;
@@ -4116,7 +4316,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_merchantId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.AccountsListResponse response) {
         checkAccountsListResponse(response);
@@ -4125,7 +4325,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.ContentApi(mock).accounts;
       var arg_request = buildAccount();
       var arg_merchantId = "foo";
@@ -4163,7 +4363,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccount());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_merchantId, arg_accountId).then(unittest.expectAsync(((api.Account response) {
         checkAccount(response);
@@ -4172,7 +4372,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.ContentApi(mock).accounts;
       var arg_request = buildAccount();
       var arg_merchantId = "foo";
@@ -4210,7 +4410,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccount());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_merchantId, arg_accountId).then(unittest.expectAsync(((api.Account response) {
         checkAccount(response);
@@ -4223,7 +4423,7 @@
   unittest.group("resource-AccountshippingResourceApi", () {
     unittest.test("method--custombatch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountshippingResourceApi res = new api.ContentApi(mock).accountshipping;
       var arg_request = buildAccountshippingCustomBatchRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -4263,7 +4463,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountshippingCustomBatchResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.custombatch(arg_request).then(unittest.expectAsync(((api.AccountshippingCustomBatchResponse response) {
         checkAccountshippingCustomBatchResponse(response);
@@ -4272,7 +4472,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountshippingResourceApi res = new api.ContentApi(mock).accountshipping;
       var arg_merchantId = "foo";
       var arg_accountId = "foo";
@@ -4306,7 +4506,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountShipping());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_merchantId, arg_accountId).then(unittest.expectAsync(((api.AccountShipping response) {
         checkAccountShipping(response);
@@ -4315,7 +4515,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountshippingResourceApi res = new api.ContentApi(mock).accountshipping;
       var arg_merchantId = "foo";
       var arg_maxResults = 42;
@@ -4352,7 +4552,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountshippingListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_merchantId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.AccountshippingListResponse response) {
         checkAccountshippingListResponse(response);
@@ -4361,7 +4561,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountshippingResourceApi res = new api.ContentApi(mock).accountshipping;
       var arg_request = buildAccountShipping();
       var arg_merchantId = "foo";
@@ -4399,7 +4599,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountShipping());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_merchantId, arg_accountId).then(unittest.expectAsync(((api.AccountShipping response) {
         checkAccountShipping(response);
@@ -4408,7 +4608,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountshippingResourceApi res = new api.ContentApi(mock).accountshipping;
       var arg_request = buildAccountShipping();
       var arg_merchantId = "foo";
@@ -4446,7 +4646,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountShipping());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_merchantId, arg_accountId).then(unittest.expectAsync(((api.AccountShipping response) {
         checkAccountShipping(response);
@@ -4459,7 +4659,7 @@
   unittest.group("resource-AccountstatusesResourceApi", () {
     unittest.test("method--custombatch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountstatusesResourceApi res = new api.ContentApi(mock).accountstatuses;
       var arg_request = buildAccountstatusesCustomBatchRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -4499,7 +4699,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountstatusesCustomBatchResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.custombatch(arg_request).then(unittest.expectAsync(((api.AccountstatusesCustomBatchResponse response) {
         checkAccountstatusesCustomBatchResponse(response);
@@ -4508,7 +4708,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountstatusesResourceApi res = new api.ContentApi(mock).accountstatuses;
       var arg_merchantId = "foo";
       var arg_accountId = "foo";
@@ -4542,7 +4742,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountStatus());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_merchantId, arg_accountId).then(unittest.expectAsync(((api.AccountStatus response) {
         checkAccountStatus(response);
@@ -4551,7 +4751,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountstatusesResourceApi res = new api.ContentApi(mock).accountstatuses;
       var arg_merchantId = "foo";
       var arg_maxResults = 42;
@@ -4588,7 +4788,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountstatusesListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_merchantId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.AccountstatusesListResponse response) {
         checkAccountstatusesListResponse(response);
@@ -4601,7 +4801,7 @@
   unittest.group("resource-AccounttaxResourceApi", () {
     unittest.test("method--custombatch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccounttaxResourceApi res = new api.ContentApi(mock).accounttax;
       var arg_request = buildAccounttaxCustomBatchRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -4641,7 +4841,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccounttaxCustomBatchResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.custombatch(arg_request).then(unittest.expectAsync(((api.AccounttaxCustomBatchResponse response) {
         checkAccounttaxCustomBatchResponse(response);
@@ -4650,7 +4850,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccounttaxResourceApi res = new api.ContentApi(mock).accounttax;
       var arg_merchantId = "foo";
       var arg_accountId = "foo";
@@ -4684,7 +4884,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountTax());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_merchantId, arg_accountId).then(unittest.expectAsync(((api.AccountTax response) {
         checkAccountTax(response);
@@ -4693,7 +4893,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccounttaxResourceApi res = new api.ContentApi(mock).accounttax;
       var arg_merchantId = "foo";
       var arg_maxResults = 42;
@@ -4730,7 +4930,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccounttaxListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_merchantId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.AccounttaxListResponse response) {
         checkAccounttaxListResponse(response);
@@ -4739,7 +4939,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccounttaxResourceApi res = new api.ContentApi(mock).accounttax;
       var arg_request = buildAccountTax();
       var arg_merchantId = "foo";
@@ -4777,7 +4977,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountTax());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_merchantId, arg_accountId).then(unittest.expectAsync(((api.AccountTax response) {
         checkAccountTax(response);
@@ -4786,7 +4986,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccounttaxResourceApi res = new api.ContentApi(mock).accounttax;
       var arg_request = buildAccountTax();
       var arg_merchantId = "foo";
@@ -4824,7 +5024,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountTax());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_merchantId, arg_accountId).then(unittest.expectAsync(((api.AccountTax response) {
         checkAccountTax(response);
@@ -4837,7 +5037,7 @@
   unittest.group("resource-DatafeedsResourceApi", () {
     unittest.test("method--custombatch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DatafeedsResourceApi res = new api.ContentApi(mock).datafeeds;
       var arg_request = buildDatafeedsCustomBatchRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -4877,7 +5077,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDatafeedsCustomBatchResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.custombatch(arg_request).then(unittest.expectAsync(((api.DatafeedsCustomBatchResponse response) {
         checkDatafeedsCustomBatchResponse(response);
@@ -4886,7 +5086,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DatafeedsResourceApi res = new api.ContentApi(mock).datafeeds;
       var arg_merchantId = "foo";
       var arg_datafeedId = "foo";
@@ -4920,14 +5120,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_merchantId, arg_datafeedId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DatafeedsResourceApi res = new api.ContentApi(mock).datafeeds;
       var arg_merchantId = "foo";
       var arg_datafeedId = "foo";
@@ -4961,7 +5161,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDatafeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_merchantId, arg_datafeedId).then(unittest.expectAsync(((api.Datafeed response) {
         checkDatafeed(response);
@@ -4970,7 +5170,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DatafeedsResourceApi res = new api.ContentApi(mock).datafeeds;
       var arg_request = buildDatafeed();
       var arg_merchantId = "foo";
@@ -5007,7 +5207,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDatafeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_merchantId).then(unittest.expectAsync(((api.Datafeed response) {
         checkDatafeed(response);
@@ -5016,7 +5216,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DatafeedsResourceApi res = new api.ContentApi(mock).datafeeds;
       var arg_merchantId = "foo";
       var arg_maxResults = 42;
@@ -5053,7 +5253,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDatafeedsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_merchantId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.DatafeedsListResponse response) {
         checkDatafeedsListResponse(response);
@@ -5062,7 +5262,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DatafeedsResourceApi res = new api.ContentApi(mock).datafeeds;
       var arg_request = buildDatafeed();
       var arg_merchantId = "foo";
@@ -5100,7 +5300,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDatafeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_merchantId, arg_datafeedId).then(unittest.expectAsync(((api.Datafeed response) {
         checkDatafeed(response);
@@ -5109,7 +5309,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DatafeedsResourceApi res = new api.ContentApi(mock).datafeeds;
       var arg_request = buildDatafeed();
       var arg_merchantId = "foo";
@@ -5147,7 +5347,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDatafeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_merchantId, arg_datafeedId).then(unittest.expectAsync(((api.Datafeed response) {
         checkDatafeed(response);
@@ -5160,7 +5360,7 @@
   unittest.group("resource-DatafeedstatusesResourceApi", () {
     unittest.test("method--custombatch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DatafeedstatusesResourceApi res = new api.ContentApi(mock).datafeedstatuses;
       var arg_request = buildDatafeedstatusesCustomBatchRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -5200,7 +5400,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDatafeedstatusesCustomBatchResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.custombatch(arg_request).then(unittest.expectAsync(((api.DatafeedstatusesCustomBatchResponse response) {
         checkDatafeedstatusesCustomBatchResponse(response);
@@ -5209,7 +5409,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DatafeedstatusesResourceApi res = new api.ContentApi(mock).datafeedstatuses;
       var arg_merchantId = "foo";
       var arg_datafeedId = "foo";
@@ -5243,7 +5443,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDatafeedStatus());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_merchantId, arg_datafeedId).then(unittest.expectAsync(((api.DatafeedStatus response) {
         checkDatafeedStatus(response);
@@ -5252,7 +5452,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DatafeedstatusesResourceApi res = new api.ContentApi(mock).datafeedstatuses;
       var arg_merchantId = "foo";
       var arg_maxResults = 42;
@@ -5289,7 +5489,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDatafeedstatusesListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_merchantId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.DatafeedstatusesListResponse response) {
         checkDatafeedstatusesListResponse(response);
@@ -5302,7 +5502,7 @@
   unittest.group("resource-InventoryResourceApi", () {
     unittest.test("method--custombatch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InventoryResourceApi res = new api.ContentApi(mock).inventory;
       var arg_request = buildInventoryCustomBatchRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -5342,7 +5542,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildInventoryCustomBatchResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.custombatch(arg_request).then(unittest.expectAsync(((api.InventoryCustomBatchResponse response) {
         checkInventoryCustomBatchResponse(response);
@@ -5351,7 +5551,7 @@
 
     unittest.test("method--set", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.InventoryResourceApi res = new api.ContentApi(mock).inventory;
       var arg_request = buildInventorySetRequest();
       var arg_merchantId = "foo";
@@ -5390,7 +5590,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildInventorySetResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.set(arg_request, arg_merchantId, arg_storeCode, arg_productId).then(unittest.expectAsync(((api.InventorySetResponse response) {
         checkInventorySetResponse(response);
@@ -5403,7 +5603,7 @@
   unittest.group("resource-ProductsResourceApi", () {
     unittest.test("method--custombatch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ProductsResourceApi res = new api.ContentApi(mock).products;
       var arg_request = buildProductsCustomBatchRequest();
       var arg_dryRun = true;
@@ -5445,7 +5645,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProductsCustomBatchResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.custombatch(arg_request, dryRun: arg_dryRun).then(unittest.expectAsync(((api.ProductsCustomBatchResponse response) {
         checkProductsCustomBatchResponse(response);
@@ -5454,7 +5654,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ProductsResourceApi res = new api.ContentApi(mock).products;
       var arg_merchantId = "foo";
       var arg_productId = "foo";
@@ -5490,14 +5690,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_merchantId, arg_productId, dryRun: arg_dryRun).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ProductsResourceApi res = new api.ContentApi(mock).products;
       var arg_merchantId = "foo";
       var arg_productId = "foo";
@@ -5531,7 +5731,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProduct());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_merchantId, arg_productId).then(unittest.expectAsync(((api.Product response) {
         checkProduct(response);
@@ -5540,7 +5740,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ProductsResourceApi res = new api.ContentApi(mock).products;
       var arg_request = buildProduct();
       var arg_merchantId = "foo";
@@ -5579,7 +5779,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProduct());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_merchantId, dryRun: arg_dryRun).then(unittest.expectAsync(((api.Product response) {
         checkProduct(response);
@@ -5588,7 +5788,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ProductsResourceApi res = new api.ContentApi(mock).products;
       var arg_merchantId = "foo";
       var arg_maxResults = 42;
@@ -5625,7 +5825,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProductsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_merchantId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.ProductsListResponse response) {
         checkProductsListResponse(response);
@@ -5638,7 +5838,7 @@
   unittest.group("resource-ProductstatusesResourceApi", () {
     unittest.test("method--custombatch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ProductstatusesResourceApi res = new api.ContentApi(mock).productstatuses;
       var arg_request = buildProductstatusesCustomBatchRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -5678,7 +5878,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProductstatusesCustomBatchResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.custombatch(arg_request).then(unittest.expectAsync(((api.ProductstatusesCustomBatchResponse response) {
         checkProductstatusesCustomBatchResponse(response);
@@ -5687,7 +5887,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ProductstatusesResourceApi res = new api.ContentApi(mock).productstatuses;
       var arg_merchantId = "foo";
       var arg_productId = "foo";
@@ -5721,7 +5921,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProductStatus());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_merchantId, arg_productId).then(unittest.expectAsync(((api.ProductStatus response) {
         checkProductStatus(response);
@@ -5730,7 +5930,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ProductstatusesResourceApi res = new api.ContentApi(mock).productstatuses;
       var arg_merchantId = "foo";
       var arg_maxResults = 42;
@@ -5767,7 +5967,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProductstatusesListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_merchantId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.ProductstatusesListResponse response) {
         checkProductstatusesListResponse(response);
diff --git a/generated/googleapis/test/coordinate/v1_test.dart b/generated/googleapis/test/coordinate/v1_test.dart
index 455a90c..40dd9ce 100644
--- a/generated/googleapis/test/coordinate/v1_test.dart
+++ b/generated/googleapis/test/coordinate/v1_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/coordinate/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterCustomField = 0;
 buildCustomField() {
@@ -39,14 +74,14 @@
   buildCounterCustomField--;
 }
 
-buildUnnamed747() {
+buildUnnamed619() {
   var o = new core.List<api.EnumItemDef>();
   o.add(buildEnumItemDef());
   o.add(buildEnumItemDef());
   return o;
 }
 
-checkUnnamed747(core.List<api.EnumItemDef> o) {
+checkUnnamed619(core.List<api.EnumItemDef> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEnumItemDef(o[0]);
   checkEnumItemDef(o[1]);
@@ -58,7 +93,7 @@
   buildCounterCustomFieldDef++;
   if (buildCounterCustomFieldDef < 3) {
     o.enabled = true;
-    o.enumitems = buildUnnamed747();
+    o.enumitems = buildUnnamed619();
     o.id = "foo";
     o.kind = "foo";
     o.name = "foo";
@@ -73,7 +108,7 @@
   buildCounterCustomFieldDef++;
   if (buildCounterCustomFieldDef < 3) {
     unittest.expect(o.enabled, unittest.isTrue);
-    checkUnnamed747(o.enumitems);
+    checkUnnamed619(o.enumitems);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
@@ -83,14 +118,14 @@
   buildCounterCustomFieldDef--;
 }
 
-buildUnnamed748() {
+buildUnnamed620() {
   var o = new core.List<api.CustomFieldDef>();
   o.add(buildCustomFieldDef());
   o.add(buildCustomFieldDef());
   return o;
 }
 
-checkUnnamed748(core.List<api.CustomFieldDef> o) {
+checkUnnamed620(core.List<api.CustomFieldDef> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomFieldDef(o[0]);
   checkCustomFieldDef(o[1]);
@@ -101,7 +136,7 @@
   var o = new api.CustomFieldDefListResponse();
   buildCounterCustomFieldDefListResponse++;
   if (buildCounterCustomFieldDefListResponse < 3) {
-    o.items = buildUnnamed748();
+    o.items = buildUnnamed620();
     o.kind = "foo";
   }
   buildCounterCustomFieldDefListResponse--;
@@ -111,20 +146,20 @@
 checkCustomFieldDefListResponse(api.CustomFieldDefListResponse o) {
   buildCounterCustomFieldDefListResponse++;
   if (buildCounterCustomFieldDefListResponse < 3) {
-    checkUnnamed748(o.items);
+    checkUnnamed620(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterCustomFieldDefListResponse--;
 }
 
-buildUnnamed749() {
+buildUnnamed621() {
   var o = new core.List<api.CustomField>();
   o.add(buildCustomField());
   o.add(buildCustomField());
   return o;
 }
 
-checkUnnamed749(core.List<api.CustomField> o) {
+checkUnnamed621(core.List<api.CustomField> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomField(o[0]);
   checkCustomField(o[1]);
@@ -135,7 +170,7 @@
   var o = new api.CustomFields();
   buildCounterCustomFields++;
   if (buildCounterCustomFields < 3) {
-    o.customField = buildUnnamed749();
+    o.customField = buildUnnamed621();
     o.kind = "foo";
   }
   buildCounterCustomFields--;
@@ -145,7 +180,7 @@
 checkCustomFields(api.CustomFields o) {
   buildCounterCustomFields++;
   if (buildCounterCustomFields < 3) {
-    checkUnnamed749(o.customField);
+    checkUnnamed621(o.customField);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterCustomFields--;
@@ -174,14 +209,14 @@
   buildCounterEnumItemDef--;
 }
 
-buildUnnamed750() {
+buildUnnamed622() {
   var o = new core.List<api.JobChange>();
   o.add(buildJobChange());
   o.add(buildJobChange());
   return o;
 }
 
-checkUnnamed750(core.List<api.JobChange> o) {
+checkUnnamed622(core.List<api.JobChange> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkJobChange(o[0]);
   checkJobChange(o[1]);
@@ -193,7 +228,7 @@
   buildCounterJob++;
   if (buildCounterJob < 3) {
     o.id = "foo";
-    o.jobChange = buildUnnamed750();
+    o.jobChange = buildUnnamed622();
     o.kind = "foo";
     o.state = buildJobState();
   }
@@ -205,7 +240,7 @@
   buildCounterJob++;
   if (buildCounterJob < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed750(o.jobChange);
+    checkUnnamed622(o.jobChange);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkJobState(o.state);
   }
@@ -235,14 +270,14 @@
   buildCounterJobChange--;
 }
 
-buildUnnamed751() {
+buildUnnamed623() {
   var o = new core.List<api.Job>();
   o.add(buildJob());
   o.add(buildJob());
   return o;
 }
 
-checkUnnamed751(core.List<api.Job> o) {
+checkUnnamed623(core.List<api.Job> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkJob(o[0]);
   checkJob(o[1]);
@@ -253,7 +288,7 @@
   var o = new api.JobListResponse();
   buildCounterJobListResponse++;
   if (buildCounterJobListResponse < 3) {
-    o.items = buildUnnamed751();
+    o.items = buildUnnamed623();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -264,21 +299,21 @@
 checkJobListResponse(api.JobListResponse o) {
   buildCounterJobListResponse++;
   if (buildCounterJobListResponse < 3) {
-    checkUnnamed751(o.items);
+    checkUnnamed623(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterJobListResponse--;
 }
 
-buildUnnamed752() {
+buildUnnamed624() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed752(core.List<core.String> o) {
+checkUnnamed624(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -295,7 +330,7 @@
     o.customerPhoneNumber = "foo";
     o.kind = "foo";
     o.location = buildLocation();
-    o.note = buildUnnamed752();
+    o.note = buildUnnamed624();
     o.progress = "foo";
     o.title = "foo";
   }
@@ -312,21 +347,21 @@
     unittest.expect(o.customerPhoneNumber, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     checkLocation(o.location);
-    checkUnnamed752(o.note);
+    checkUnnamed624(o.note);
     unittest.expect(o.progress, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
   }
   buildCounterJobState--;
 }
 
-buildUnnamed753() {
+buildUnnamed625() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed753(core.List<core.String> o) {
+checkUnnamed625(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -337,7 +372,7 @@
   var o = new api.Location();
   buildCounterLocation++;
   if (buildCounterLocation < 3) {
-    o.addressLine = buildUnnamed753();
+    o.addressLine = buildUnnamed625();
     o.kind = "foo";
     o.lat = 42.0;
     o.lng = 42.0;
@@ -349,7 +384,7 @@
 checkLocation(api.Location o) {
   buildCounterLocation++;
   if (buildCounterLocation < 3) {
-    checkUnnamed753(o.addressLine);
+    checkUnnamed625(o.addressLine);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.lat, unittest.equals(42.0));
     unittest.expect(o.lng, unittest.equals(42.0));
@@ -357,14 +392,14 @@
   buildCounterLocation--;
 }
 
-buildUnnamed754() {
+buildUnnamed626() {
   var o = new core.List<api.LocationRecord>();
   o.add(buildLocationRecord());
   o.add(buildLocationRecord());
   return o;
 }
 
-checkUnnamed754(core.List<api.LocationRecord> o) {
+checkUnnamed626(core.List<api.LocationRecord> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLocationRecord(o[0]);
   checkLocationRecord(o[1]);
@@ -375,7 +410,7 @@
   var o = new api.LocationListResponse();
   buildCounterLocationListResponse++;
   if (buildCounterLocationListResponse < 3) {
-    o.items = buildUnnamed754();
+    o.items = buildUnnamed626();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.tokenPagination = buildTokenPagination();
@@ -387,7 +422,7 @@
 checkLocationListResponse(api.LocationListResponse o) {
   buildCounterLocationListResponse++;
   if (buildCounterLocationListResponse < 3) {
-    checkUnnamed754(o.items);
+    checkUnnamed626(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkTokenPagination(o.tokenPagination);
@@ -472,14 +507,14 @@
   buildCounterTeam--;
 }
 
-buildUnnamed755() {
+buildUnnamed627() {
   var o = new core.List<api.Team>();
   o.add(buildTeam());
   o.add(buildTeam());
   return o;
 }
 
-checkUnnamed755(core.List<api.Team> o) {
+checkUnnamed627(core.List<api.Team> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTeam(o[0]);
   checkTeam(o[1]);
@@ -490,7 +525,7 @@
   var o = new api.TeamListResponse();
   buildCounterTeamListResponse++;
   if (buildCounterTeamListResponse < 3) {
-    o.items = buildUnnamed755();
+    o.items = buildUnnamed627();
     o.kind = "foo";
   }
   buildCounterTeamListResponse--;
@@ -500,7 +535,7 @@
 checkTeamListResponse(api.TeamListResponse o) {
   buildCounterTeamListResponse++;
   if (buildCounterTeamListResponse < 3) {
-    checkUnnamed755(o.items);
+    checkUnnamed627(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterTeamListResponse--;
@@ -550,14 +585,14 @@
   buildCounterWorker--;
 }
 
-buildUnnamed756() {
+buildUnnamed628() {
   var o = new core.List<api.Worker>();
   o.add(buildWorker());
   o.add(buildWorker());
   return o;
 }
 
-checkUnnamed756(core.List<api.Worker> o) {
+checkUnnamed628(core.List<api.Worker> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWorker(o[0]);
   checkWorker(o[1]);
@@ -568,7 +603,7 @@
   var o = new api.WorkerListResponse();
   buildCounterWorkerListResponse++;
   if (buildCounterWorkerListResponse < 3) {
-    o.items = buildUnnamed756();
+    o.items = buildUnnamed628();
     o.kind = "foo";
   }
   buildCounterWorkerListResponse--;
@@ -578,46 +613,46 @@
 checkWorkerListResponse(api.WorkerListResponse o) {
   buildCounterWorkerListResponse++;
   if (buildCounterWorkerListResponse < 3) {
-    checkUnnamed756(o.items);
+    checkUnnamed628(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterWorkerListResponse--;
 }
 
-buildUnnamed757() {
+buildUnnamed629() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed757(core.List<core.String> o) {
+checkUnnamed629(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed758() {
+buildUnnamed630() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed758(core.List<core.String> o) {
+checkUnnamed630(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed759() {
+buildUnnamed631() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed759(core.List<core.String> o) {
+checkUnnamed631(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -790,7 +825,7 @@
   unittest.group("resource-CustomFieldDefResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CustomFieldDefResourceApi res = new api.CoordinateApi(mock).customFieldDef;
       var arg_teamId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -834,7 +869,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomFieldDefListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_teamId).then(unittest.expectAsync(((api.CustomFieldDefListResponse response) {
         checkCustomFieldDefListResponse(response);
@@ -847,7 +882,7 @@
   unittest.group("resource-JobsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.JobsResourceApi res = new api.CoordinateApi(mock).jobs;
       var arg_teamId = "foo";
       var arg_jobId = "foo";
@@ -895,7 +930,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildJob());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_teamId, arg_jobId).then(unittest.expectAsync(((api.Job response) {
         checkJob(response);
@@ -904,7 +939,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.JobsResourceApi res = new api.CoordinateApi(mock).jobs;
       var arg_request = buildJob();
       var arg_teamId = "foo";
@@ -913,7 +948,7 @@
       var arg_lng = 42.0;
       var arg_title = "foo";
       var arg_assignee = "foo";
-      var arg_customField = buildUnnamed757();
+      var arg_customField = buildUnnamed629();
       var arg_customerName = "foo";
       var arg_customerPhoneNumber = "foo";
       var arg_note = "foo";
@@ -970,7 +1005,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildJob());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_teamId, arg_address, arg_lat, arg_lng, arg_title, assignee: arg_assignee, customField: arg_customField, customerName: arg_customerName, customerPhoneNumber: arg_customerPhoneNumber, note: arg_note).then(unittest.expectAsync(((api.Job response) {
         checkJob(response);
@@ -979,7 +1014,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.JobsResourceApi res = new api.CoordinateApi(mock).jobs;
       var arg_teamId = "foo";
       var arg_maxResults = 42;
@@ -1029,7 +1064,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildJobListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_teamId, maxResults: arg_maxResults, minModifiedTimestampMs: arg_minModifiedTimestampMs, pageToken: arg_pageToken).then(unittest.expectAsync(((api.JobListResponse response) {
         checkJobListResponse(response);
@@ -1038,14 +1073,14 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.JobsResourceApi res = new api.CoordinateApi(mock).jobs;
       var arg_request = buildJob();
       var arg_teamId = "foo";
       var arg_jobId = "foo";
       var arg_address = "foo";
       var arg_assignee = "foo";
-      var arg_customField = buildUnnamed758();
+      var arg_customField = buildUnnamed630();
       var arg_customerName = "foo";
       var arg_customerPhoneNumber = "foo";
       var arg_lat = 42.0;
@@ -1110,7 +1145,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildJob());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_teamId, arg_jobId, address: arg_address, assignee: arg_assignee, customField: arg_customField, customerName: arg_customerName, customerPhoneNumber: arg_customerPhoneNumber, lat: arg_lat, lng: arg_lng, note: arg_note, progress: arg_progress, title: arg_title).then(unittest.expectAsync(((api.Job response) {
         checkJob(response);
@@ -1119,14 +1154,14 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.JobsResourceApi res = new api.CoordinateApi(mock).jobs;
       var arg_request = buildJob();
       var arg_teamId = "foo";
       var arg_jobId = "foo";
       var arg_address = "foo";
       var arg_assignee = "foo";
-      var arg_customField = buildUnnamed759();
+      var arg_customField = buildUnnamed631();
       var arg_customerName = "foo";
       var arg_customerPhoneNumber = "foo";
       var arg_lat = 42.0;
@@ -1191,7 +1226,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildJob());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_teamId, arg_jobId, address: arg_address, assignee: arg_assignee, customField: arg_customField, customerName: arg_customerName, customerPhoneNumber: arg_customerPhoneNumber, lat: arg_lat, lng: arg_lng, note: arg_note, progress: arg_progress, title: arg_title).then(unittest.expectAsync(((api.Job response) {
         checkJob(response);
@@ -1204,7 +1239,7 @@
   unittest.group("resource-LocationResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LocationResourceApi res = new api.CoordinateApi(mock).location;
       var arg_teamId = "foo";
       var arg_workerEmail = "foo";
@@ -1262,7 +1297,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLocationListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_teamId, arg_workerEmail, arg_startTimestampMs, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.LocationListResponse response) {
         checkLocationListResponse(response);
@@ -1275,7 +1310,7 @@
   unittest.group("resource-ScheduleResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ScheduleResourceApi res = new api.CoordinateApi(mock).schedule;
       var arg_teamId = "foo";
       var arg_jobId = "foo";
@@ -1327,7 +1362,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSchedule());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_teamId, arg_jobId).then(unittest.expectAsync(((api.Schedule response) {
         checkSchedule(response);
@@ -1336,7 +1371,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ScheduleResourceApi res = new api.CoordinateApi(mock).schedule;
       var arg_request = buildSchedule();
       var arg_teamId = "foo";
@@ -1400,7 +1435,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSchedule());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_teamId, arg_jobId, allDay: arg_allDay, duration: arg_duration, endTime: arg_endTime, startTime: arg_startTime).then(unittest.expectAsync(((api.Schedule response) {
         checkSchedule(response);
@@ -1409,7 +1444,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ScheduleResourceApi res = new api.CoordinateApi(mock).schedule;
       var arg_request = buildSchedule();
       var arg_teamId = "foo";
@@ -1473,7 +1508,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSchedule());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_teamId, arg_jobId, allDay: arg_allDay, duration: arg_duration, endTime: arg_endTime, startTime: arg_startTime).then(unittest.expectAsync(((api.Schedule response) {
         checkSchedule(response);
@@ -1486,7 +1521,7 @@
   unittest.group("resource-TeamResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TeamResourceApi res = new api.CoordinateApi(mock).team;
       var arg_admin = true;
       var arg_dispatcher = true;
@@ -1528,7 +1563,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTeamListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(admin: arg_admin, dispatcher: arg_dispatcher, worker: arg_worker).then(unittest.expectAsync(((api.TeamListResponse response) {
         checkTeamListResponse(response);
@@ -1541,7 +1576,7 @@
   unittest.group("resource-WorkerResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.WorkerResourceApi res = new api.CoordinateApi(mock).worker;
       var arg_teamId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1585,7 +1620,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildWorkerListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_teamId).then(unittest.expectAsync(((api.WorkerListResponse response) {
         checkWorkerListResponse(response);
diff --git a/generated/googleapis/test/customsearch/v1_test.dart b/generated/googleapis/test/customsearch/v1_test.dart
index 67c6998..3e46876 100644
--- a/generated/googleapis/test/customsearch/v1_test.dart
+++ b/generated/googleapis/test/customsearch/v1_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/customsearch/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterContextFacets = 0;
 buildContextFacets() {
@@ -39,30 +74,30 @@
   buildCounterContextFacets--;
 }
 
-buildUnnamed273() {
+buildUnnamed632() {
   var o = new core.List<api.ContextFacets>();
   o.add(buildContextFacets());
   o.add(buildContextFacets());
   return o;
 }
 
-checkUnnamed273(core.List<api.ContextFacets> o) {
+checkUnnamed632(core.List<api.ContextFacets> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContextFacets(o[0]);
   checkContextFacets(o[1]);
 }
 
-buildUnnamed274() {
+buildUnnamed633() {
   var o = new core.List<core.List<api.ContextFacets>>();
-  o.add(buildUnnamed273());
-  o.add(buildUnnamed273());
+  o.add(buildUnnamed632());
+  o.add(buildUnnamed632());
   return o;
 }
 
-checkUnnamed274(core.List<core.List<api.ContextFacets>> o) {
+checkUnnamed633(core.List<core.List<api.ContextFacets>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed273(o[0]);
-  checkUnnamed273(o[1]);
+  checkUnnamed632(o[0]);
+  checkUnnamed632(o[1]);
 }
 
 core.int buildCounterContext = 0;
@@ -70,7 +105,7 @@
   var o = new api.Context();
   buildCounterContext++;
   if (buildCounterContext < 3) {
-    o.facets = buildUnnamed274();
+    o.facets = buildUnnamed633();
     o.title = "foo";
   }
   buildCounterContext--;
@@ -80,7 +115,7 @@
 checkContext(api.Context o) {
   buildCounterContext++;
   if (buildCounterContext < 3) {
-    checkUnnamed274(o.facets);
+    checkUnnamed633(o.facets);
     unittest.expect(o.title, unittest.equals('foo'));
   }
   buildCounterContext--;
@@ -111,14 +146,14 @@
   buildCounterPromotionBodyLines--;
 }
 
-buildUnnamed275() {
+buildUnnamed634() {
   var o = new core.List<api.PromotionBodyLines>();
   o.add(buildPromotionBodyLines());
   o.add(buildPromotionBodyLines());
   return o;
 }
 
-checkUnnamed275(core.List<api.PromotionBodyLines> o) {
+checkUnnamed634(core.List<api.PromotionBodyLines> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPromotionBodyLines(o[0]);
   checkPromotionBodyLines(o[1]);
@@ -152,7 +187,7 @@
   var o = new api.Promotion();
   buildCounterPromotion++;
   if (buildCounterPromotion < 3) {
-    o.bodyLines = buildUnnamed275();
+    o.bodyLines = buildUnnamed634();
     o.displayLink = "foo";
     o.htmlTitle = "foo";
     o.image = buildPromotionImage();
@@ -166,7 +201,7 @@
 checkPromotion(api.Promotion o) {
   buildCounterPromotion++;
   if (buildCounterPromotion < 3) {
-    checkUnnamed275(o.bodyLines);
+    checkUnnamed634(o.bodyLines);
     unittest.expect(o.displayLink, unittest.equals('foo'));
     unittest.expect(o.htmlTitle, unittest.equals('foo'));
     checkPromotionImage(o.image);
@@ -321,56 +356,56 @@
   buildCounterResultLabels--;
 }
 
-buildUnnamed276() {
+buildUnnamed635() {
   var o = new core.List<api.ResultLabels>();
   o.add(buildResultLabels());
   o.add(buildResultLabels());
   return o;
 }
 
-checkUnnamed276(core.List<api.ResultLabels> o) {
+checkUnnamed635(core.List<api.ResultLabels> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResultLabels(o[0]);
   checkResultLabels(o[1]);
 }
 
-buildUnnamed277() {
+buildUnnamed636() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'};
   o["y"] = {'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'};
   return o;
 }
 
-checkUnnamed277(core.Map<core.String, core.Object> o) {
+checkUnnamed636(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map; unittest.expect(casted1, unittest.hasLength(3)); unittest.expect(casted1["list"], unittest.equals([1, 2, 3])); unittest.expect(casted1["bool"], unittest.equals(true)); unittest.expect(casted1["string"], unittest.equals('foo')); 
   var casted2 = (o["y"]) as core.Map; unittest.expect(casted2, unittest.hasLength(3)); unittest.expect(casted2["list"], unittest.equals([1, 2, 3])); unittest.expect(casted2["bool"], unittest.equals(true)); unittest.expect(casted2["string"], unittest.equals('foo')); 
 }
 
-buildUnnamed278() {
+buildUnnamed637() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed277());
-  o.add(buildUnnamed277());
+  o.add(buildUnnamed636());
+  o.add(buildUnnamed636());
   return o;
 }
 
-checkUnnamed278(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed637(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed277(o[0]);
-  checkUnnamed277(o[1]);
+  checkUnnamed636(o[0]);
+  checkUnnamed636(o[1]);
 }
 
-buildUnnamed279() {
+buildUnnamed638() {
   var o = new core.Map<core.String, core.List<core.Map<core.String, core.Object>>>();
-  o["x"] = buildUnnamed278();
-  o["y"] = buildUnnamed278();
+  o["x"] = buildUnnamed637();
+  o["y"] = buildUnnamed637();
   return o;
 }
 
-checkUnnamed279(core.Map<core.String, core.List<core.Map<core.String, core.Object>>> o) {
+checkUnnamed638(core.Map<core.String, core.List<core.Map<core.String, core.Object>>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed278(o["x"]);
-  checkUnnamed278(o["y"]);
+  checkUnnamed637(o["x"]);
+  checkUnnamed637(o["y"]);
 }
 
 core.int buildCounterResult = 0;
@@ -387,10 +422,10 @@
     o.htmlTitle = "foo";
     o.image = buildResultImage();
     o.kind = "foo";
-    o.labels = buildUnnamed276();
+    o.labels = buildUnnamed635();
     o.link = "foo";
     o.mime = "foo";
-    o.pagemap = buildUnnamed279();
+    o.pagemap = buildUnnamed638();
     o.snippet = "foo";
     o.title = "foo";
   }
@@ -410,66 +445,66 @@
     unittest.expect(o.htmlTitle, unittest.equals('foo'));
     checkResultImage(o.image);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed276(o.labels);
+    checkUnnamed635(o.labels);
     unittest.expect(o.link, unittest.equals('foo'));
     unittest.expect(o.mime, unittest.equals('foo'));
-    checkUnnamed279(o.pagemap);
+    checkUnnamed638(o.pagemap);
     unittest.expect(o.snippet, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
   }
   buildCounterResult--;
 }
 
-buildUnnamed280() {
+buildUnnamed639() {
   var o = new core.List<api.Result>();
   o.add(buildResult());
   o.add(buildResult());
   return o;
 }
 
-checkUnnamed280(core.List<api.Result> o) {
+checkUnnamed639(core.List<api.Result> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResult(o[0]);
   checkResult(o[1]);
 }
 
-buildUnnamed281() {
+buildUnnamed640() {
   var o = new core.List<api.Promotion>();
   o.add(buildPromotion());
   o.add(buildPromotion());
   return o;
 }
 
-checkUnnamed281(core.List<api.Promotion> o) {
+checkUnnamed640(core.List<api.Promotion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPromotion(o[0]);
   checkPromotion(o[1]);
 }
 
-buildUnnamed282() {
+buildUnnamed641() {
   var o = new core.List<api.Query>();
   o.add(buildQuery());
   o.add(buildQuery());
   return o;
 }
 
-checkUnnamed282(core.List<api.Query> o) {
+checkUnnamed641(core.List<api.Query> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuery(o[0]);
   checkQuery(o[1]);
 }
 
-buildUnnamed283() {
+buildUnnamed642() {
   var o = new core.Map<core.String, core.List<api.Query>>();
-  o["x"] = buildUnnamed282();
-  o["y"] = buildUnnamed282();
+  o["x"] = buildUnnamed641();
+  o["y"] = buildUnnamed641();
   return o;
 }
 
-checkUnnamed283(core.Map<core.String, core.List<api.Query>> o) {
+checkUnnamed642(core.Map<core.String, core.List<api.Query>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed282(o["x"]);
-  checkUnnamed282(o["y"]);
+  checkUnnamed641(o["x"]);
+  checkUnnamed641(o["y"]);
 }
 
 core.int buildCounterSearchSearchInformation = 0;
@@ -545,10 +580,10 @@
   buildCounterSearch++;
   if (buildCounterSearch < 3) {
     o.context = buildContext();
-    o.items = buildUnnamed280();
+    o.items = buildUnnamed639();
     o.kind = "foo";
-    o.promotions = buildUnnamed281();
-    o.queries = buildUnnamed283();
+    o.promotions = buildUnnamed640();
+    o.queries = buildUnnamed642();
     o.searchInformation = buildSearchSearchInformation();
     o.spelling = buildSearchSpelling();
     o.url = buildSearchUrl();
@@ -561,10 +596,10 @@
   buildCounterSearch++;
   if (buildCounterSearch < 3) {
     checkContext(o.context);
-    checkUnnamed280(o.items);
+    checkUnnamed639(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed281(o.promotions);
-    checkUnnamed283(o.queries);
+    checkUnnamed640(o.promotions);
+    checkUnnamed642(o.queries);
     checkSearchSearchInformation(o.searchInformation);
     checkSearchSpelling(o.spelling);
     checkSearchUrl(o.url);
@@ -694,7 +729,7 @@
   unittest.group("resource-CseResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CseResourceApi res = new api.CustomsearchApi(mock).cse;
       var arg_q = "foo";
       var arg_c2coff = "foo";
@@ -794,7 +829,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSearch());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_q, c2coff: arg_c2coff, cr: arg_cr, cref: arg_cref, cx: arg_cx, dateRestrict: arg_dateRestrict, exactTerms: arg_exactTerms, excludeTerms: arg_excludeTerms, fileType: arg_fileType, filter: arg_filter, gl: arg_gl, googlehost: arg_googlehost, highRange: arg_highRange, hl: arg_hl, hq: arg_hq, imgColorType: arg_imgColorType, imgDominantColor: arg_imgDominantColor, imgSize: arg_imgSize, imgType: arg_imgType, linkSite: arg_linkSite, lowRange: arg_lowRange, lr: arg_lr, num: arg_num, orTerms: arg_orTerms, relatedSite: arg_relatedSite, rights: arg_rights, safe: arg_safe, searchType: arg_searchType, siteSearch: arg_siteSearch, siteSearchFilter: arg_siteSearchFilter, sort: arg_sort, start: arg_start).then(unittest.expectAsync(((api.Search response) {
         checkSearch(response);
diff --git a/generated/googleapis/test/dfareporting/v1_3_test.dart b/generated/googleapis/test/dfareporting/v1_3_test.dart
index 88f263b..530f379 100644
--- a/generated/googleapis/test/dfareporting/v1_3_test.dart
+++ b/generated/googleapis/test/dfareporting/v1_3_test.dart
@@ -8,35 +8,70 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/dfareporting/v1_3.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
 
-buildUnnamed196() {
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+buildUnnamed643() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed196(core.List<api.DimensionValue> o) {
+checkUnnamed643(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed197() {
+buildUnnamed644() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed197(core.List<core.String> o) {
+checkUnnamed644(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -47,9 +82,9 @@
   var o = new api.Activities();
   buildCounterActivities++;
   if (buildCounterActivities < 3) {
-    o.filters = buildUnnamed196();
+    o.filters = buildUnnamed643();
     o.kind = "foo";
-    o.metricNames = buildUnnamed197();
+    o.metricNames = buildUnnamed644();
   }
   buildCounterActivities--;
   return o;
@@ -58,9 +93,9 @@
 checkActivities(api.Activities o) {
   buildCounterActivities++;
   if (buildCounterActivities < 3) {
-    checkUnnamed196(o.filters);
+    checkUnnamed643(o.filters);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed197(o.metricNames);
+    checkUnnamed644(o.metricNames);
   }
   buildCounterActivities--;
 }
@@ -94,53 +129,53 @@
   buildCounterCompatibleFields--;
 }
 
-buildUnnamed198() {
+buildUnnamed645() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed198(core.List<api.Dimension> o) {
+checkUnnamed645(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed199() {
+buildUnnamed646() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed199(core.List<api.Dimension> o) {
+checkUnnamed646(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed200() {
+buildUnnamed647() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed200(core.List<api.Metric> o) {
+checkUnnamed647(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
 }
 
-buildUnnamed201() {
+buildUnnamed648() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed201(core.List<api.Metric> o) {
+checkUnnamed648(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
@@ -151,11 +186,11 @@
   var o = new api.CrossDimensionReachReportCompatibleFields();
   buildCounterCrossDimensionReachReportCompatibleFields++;
   if (buildCounterCrossDimensionReachReportCompatibleFields < 3) {
-    o.breakdown = buildUnnamed198();
-    o.dimensionFilters = buildUnnamed199();
+    o.breakdown = buildUnnamed645();
+    o.dimensionFilters = buildUnnamed646();
     o.kind = "foo";
-    o.metrics = buildUnnamed200();
-    o.overlapMetrics = buildUnnamed201();
+    o.metrics = buildUnnamed647();
+    o.overlapMetrics = buildUnnamed648();
   }
   buildCounterCrossDimensionReachReportCompatibleFields--;
   return o;
@@ -164,23 +199,23 @@
 checkCrossDimensionReachReportCompatibleFields(api.CrossDimensionReachReportCompatibleFields o) {
   buildCounterCrossDimensionReachReportCompatibleFields++;
   if (buildCounterCrossDimensionReachReportCompatibleFields < 3) {
-    checkUnnamed198(o.breakdown);
-    checkUnnamed199(o.dimensionFilters);
+    checkUnnamed645(o.breakdown);
+    checkUnnamed646(o.dimensionFilters);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed200(o.metrics);
-    checkUnnamed201(o.overlapMetrics);
+    checkUnnamed647(o.metrics);
+    checkUnnamed648(o.overlapMetrics);
   }
   buildCounterCrossDimensionReachReportCompatibleFields--;
 }
 
-buildUnnamed202() {
+buildUnnamed649() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed202(core.List<api.DimensionValue> o) {
+checkUnnamed649(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
@@ -191,7 +226,7 @@
   var o = new api.CustomRichMediaEvents();
   buildCounterCustomRichMediaEvents++;
   if (buildCounterCustomRichMediaEvents < 3) {
-    o.filteredEventIds = buildUnnamed202();
+    o.filteredEventIds = buildUnnamed649();
     o.kind = "foo";
   }
   buildCounterCustomRichMediaEvents--;
@@ -201,7 +236,7 @@
 checkCustomRichMediaEvents(api.CustomRichMediaEvents o) {
   buildCounterCustomRichMediaEvents++;
   if (buildCounterCustomRichMediaEvents < 3) {
-    checkUnnamed202(o.filteredEventIds);
+    checkUnnamed649(o.filteredEventIds);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterCustomRichMediaEvents--;
@@ -305,14 +340,14 @@
   buildCounterDimensionValue--;
 }
 
-buildUnnamed203() {
+buildUnnamed650() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed203(core.List<api.DimensionValue> o) {
+checkUnnamed650(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
@@ -324,7 +359,7 @@
   buildCounterDimensionValueList++;
   if (buildCounterDimensionValueList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed203();
+    o.items = buildUnnamed650();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -336,21 +371,21 @@
   buildCounterDimensionValueList++;
   if (buildCounterDimensionValueList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed203(o.items);
+    checkUnnamed650(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterDimensionValueList--;
 }
 
-buildUnnamed204() {
+buildUnnamed651() {
   var o = new core.List<api.DimensionFilter>();
   o.add(buildDimensionFilter());
   o.add(buildDimensionFilter());
   return o;
 }
 
-checkUnnamed204(core.List<api.DimensionFilter> o) {
+checkUnnamed651(core.List<api.DimensionFilter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionFilter(o[0]);
   checkDimensionFilter(o[1]);
@@ -363,7 +398,7 @@
   if (buildCounterDimensionValueRequest < 3) {
     o.dimensionName = "foo";
     o.endDate = core.DateTime.parse("2002-02-27T14:01:02Z");
-    o.filters = buildUnnamed204();
+    o.filters = buildUnnamed651();
     o.kind = "foo";
     o.startDate = core.DateTime.parse("2002-02-27T14:01:02Z");
   }
@@ -376,7 +411,7 @@
   if (buildCounterDimensionValueRequest < 3) {
     unittest.expect(o.dimensionName, unittest.equals('foo'));
     unittest.expect(o.endDate, unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
-    checkUnnamed204(o.filters);
+    checkUnnamed651(o.filters);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.startDate, unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
   }
@@ -441,14 +476,14 @@
   buildCounterFile--;
 }
 
-buildUnnamed205() {
+buildUnnamed652() {
   var o = new core.List<api.File>();
   o.add(buildFile());
   o.add(buildFile());
   return o;
 }
 
-checkUnnamed205(core.List<api.File> o) {
+checkUnnamed652(core.List<api.File> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFile(o[0]);
   checkFile(o[1]);
@@ -460,7 +495,7 @@
   buildCounterFileList++;
   if (buildCounterFileList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed205();
+    o.items = buildUnnamed652();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -472,47 +507,47 @@
   buildCounterFileList++;
   if (buildCounterFileList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed205(o.items);
+    checkUnnamed652(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterFileList--;
 }
 
-buildUnnamed206() {
+buildUnnamed653() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed206(core.List<api.Dimension> o) {
+checkUnnamed653(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed207() {
+buildUnnamed654() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed207(core.List<api.Dimension> o) {
+checkUnnamed654(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed208() {
+buildUnnamed655() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed208(core.List<api.Metric> o) {
+checkUnnamed655(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
@@ -523,10 +558,10 @@
   var o = new api.FloodlightReportCompatibleFields();
   buildCounterFloodlightReportCompatibleFields++;
   if (buildCounterFloodlightReportCompatibleFields < 3) {
-    o.dimensionFilters = buildUnnamed206();
-    o.dimensions = buildUnnamed207();
+    o.dimensionFilters = buildUnnamed653();
+    o.dimensions = buildUnnamed654();
     o.kind = "foo";
-    o.metrics = buildUnnamed208();
+    o.metrics = buildUnnamed655();
   }
   buildCounterFloodlightReportCompatibleFields--;
   return o;
@@ -535,10 +570,10 @@
 checkFloodlightReportCompatibleFields(api.FloodlightReportCompatibleFields o) {
   buildCounterFloodlightReportCompatibleFields++;
   if (buildCounterFloodlightReportCompatibleFields < 3) {
-    checkUnnamed206(o.dimensionFilters);
-    checkUnnamed207(o.dimensions);
+    checkUnnamed653(o.dimensionFilters);
+    checkUnnamed654(o.dimensions);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed208(o.metrics);
+    checkUnnamed655(o.metrics);
   }
   buildCounterFloodlightReportCompatibleFields--;
 }
@@ -564,53 +599,53 @@
   buildCounterMetric--;
 }
 
-buildUnnamed209() {
+buildUnnamed656() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed209(core.List<api.Dimension> o) {
+checkUnnamed656(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed210() {
+buildUnnamed657() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed210(core.List<api.Dimension> o) {
+checkUnnamed657(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed211() {
+buildUnnamed658() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed211(core.List<api.Metric> o) {
+checkUnnamed658(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
 }
 
-buildUnnamed212() {
+buildUnnamed659() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed212(core.List<api.Dimension> o) {
+checkUnnamed659(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
@@ -621,11 +656,11 @@
   var o = new api.PathToConversionReportCompatibleFields();
   buildCounterPathToConversionReportCompatibleFields++;
   if (buildCounterPathToConversionReportCompatibleFields < 3) {
-    o.conversionDimensions = buildUnnamed209();
-    o.customFloodlightVariables = buildUnnamed210();
+    o.conversionDimensions = buildUnnamed656();
+    o.customFloodlightVariables = buildUnnamed657();
     o.kind = "foo";
-    o.metrics = buildUnnamed211();
-    o.perInteractionDimensions = buildUnnamed212();
+    o.metrics = buildUnnamed658();
+    o.perInteractionDimensions = buildUnnamed659();
   }
   buildCounterPathToConversionReportCompatibleFields--;
   return o;
@@ -634,75 +669,75 @@
 checkPathToConversionReportCompatibleFields(api.PathToConversionReportCompatibleFields o) {
   buildCounterPathToConversionReportCompatibleFields++;
   if (buildCounterPathToConversionReportCompatibleFields < 3) {
-    checkUnnamed209(o.conversionDimensions);
-    checkUnnamed210(o.customFloodlightVariables);
+    checkUnnamed656(o.conversionDimensions);
+    checkUnnamed657(o.customFloodlightVariables);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed211(o.metrics);
-    checkUnnamed212(o.perInteractionDimensions);
+    checkUnnamed658(o.metrics);
+    checkUnnamed659(o.perInteractionDimensions);
   }
   buildCounterPathToConversionReportCompatibleFields--;
 }
 
-buildUnnamed213() {
+buildUnnamed660() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed213(core.List<api.Dimension> o) {
+checkUnnamed660(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed214() {
+buildUnnamed661() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed214(core.List<api.Dimension> o) {
+checkUnnamed661(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed215() {
+buildUnnamed662() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed215(core.List<api.Metric> o) {
+checkUnnamed662(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
 }
 
-buildUnnamed216() {
+buildUnnamed663() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed216(core.List<api.Metric> o) {
+checkUnnamed663(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
 }
 
-buildUnnamed217() {
+buildUnnamed664() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed217(core.List<api.Metric> o) {
+checkUnnamed664(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
@@ -713,12 +748,12 @@
   var o = new api.ReachReportCompatibleFields();
   buildCounterReachReportCompatibleFields++;
   if (buildCounterReachReportCompatibleFields < 3) {
-    o.dimensionFilters = buildUnnamed213();
-    o.dimensions = buildUnnamed214();
+    o.dimensionFilters = buildUnnamed660();
+    o.dimensions = buildUnnamed661();
     o.kind = "foo";
-    o.metrics = buildUnnamed215();
-    o.pivotedActivityMetrics = buildUnnamed216();
-    o.reachByFrequencyMetrics = buildUnnamed217();
+    o.metrics = buildUnnamed662();
+    o.pivotedActivityMetrics = buildUnnamed663();
+    o.reachByFrequencyMetrics = buildUnnamed664();
   }
   buildCounterReachReportCompatibleFields--;
   return o;
@@ -727,12 +762,12 @@
 checkReachReportCompatibleFields(api.ReachReportCompatibleFields o) {
   buildCounterReachReportCompatibleFields++;
   if (buildCounterReachReportCompatibleFields < 3) {
-    checkUnnamed213(o.dimensionFilters);
-    checkUnnamed214(o.dimensions);
+    checkUnnamed660(o.dimensionFilters);
+    checkUnnamed661(o.dimensions);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed215(o.metrics);
-    checkUnnamed216(o.pivotedActivityMetrics);
-    checkUnnamed217(o.reachByFrequencyMetrics);
+    checkUnnamed662(o.metrics);
+    checkUnnamed663(o.pivotedActivityMetrics);
+    checkUnnamed664(o.reachByFrequencyMetrics);
   }
   buildCounterReachReportCompatibleFields--;
 }
@@ -760,40 +795,40 @@
   buildCounterRecipient--;
 }
 
-buildUnnamed218() {
+buildUnnamed665() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed218(core.List<api.DimensionValue> o) {
+checkUnnamed665(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed219() {
+buildUnnamed666() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed219(core.List<api.SortedDimension> o) {
+checkUnnamed666(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
 }
 
-buildUnnamed220() {
+buildUnnamed667() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed220(core.List<core.String> o) {
+checkUnnamed667(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -805,9 +840,9 @@
   buildCounterReportActiveGrpCriteria++;
   if (buildCounterReportActiveGrpCriteria < 3) {
     o.dateRange = buildDateRange();
-    o.dimensionFilters = buildUnnamed218();
-    o.dimensions = buildUnnamed219();
-    o.metricNames = buildUnnamed220();
+    o.dimensionFilters = buildUnnamed665();
+    o.dimensions = buildUnnamed666();
+    o.metricNames = buildUnnamed667();
   }
   buildCounterReportActiveGrpCriteria--;
   return o;
@@ -817,47 +852,47 @@
   buildCounterReportActiveGrpCriteria++;
   if (buildCounterReportActiveGrpCriteria < 3) {
     checkDateRange(o.dateRange);
-    checkUnnamed218(o.dimensionFilters);
-    checkUnnamed219(o.dimensions);
-    checkUnnamed220(o.metricNames);
+    checkUnnamed665(o.dimensionFilters);
+    checkUnnamed666(o.dimensions);
+    checkUnnamed667(o.metricNames);
   }
   buildCounterReportActiveGrpCriteria--;
 }
 
-buildUnnamed221() {
+buildUnnamed668() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed221(core.List<api.DimensionValue> o) {
+checkUnnamed668(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed222() {
+buildUnnamed669() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed222(core.List<api.SortedDimension> o) {
+checkUnnamed669(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
 }
 
-buildUnnamed223() {
+buildUnnamed670() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed223(core.List<core.String> o) {
+checkUnnamed670(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -871,9 +906,9 @@
     o.activities = buildActivities();
     o.customRichMediaEvents = buildCustomRichMediaEvents();
     o.dateRange = buildDateRange();
-    o.dimensionFilters = buildUnnamed221();
-    o.dimensions = buildUnnamed222();
-    o.metricNames = buildUnnamed223();
+    o.dimensionFilters = buildUnnamed668();
+    o.dimensions = buildUnnamed669();
+    o.metricNames = buildUnnamed670();
   }
   buildCounterReportCriteria--;
   return o;
@@ -885,60 +920,60 @@
     checkActivities(o.activities);
     checkCustomRichMediaEvents(o.customRichMediaEvents);
     checkDateRange(o.dateRange);
-    checkUnnamed221(o.dimensionFilters);
-    checkUnnamed222(o.dimensions);
-    checkUnnamed223(o.metricNames);
+    checkUnnamed668(o.dimensionFilters);
+    checkUnnamed669(o.dimensions);
+    checkUnnamed670(o.metricNames);
   }
   buildCounterReportCriteria--;
 }
 
-buildUnnamed224() {
+buildUnnamed671() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed224(core.List<api.SortedDimension> o) {
+checkUnnamed671(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
 }
 
-buildUnnamed225() {
+buildUnnamed672() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed225(core.List<api.DimensionValue> o) {
+checkUnnamed672(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed226() {
+buildUnnamed673() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed226(core.List<core.String> o) {
+checkUnnamed673(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed227() {
+buildUnnamed674() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed227(core.List<core.String> o) {
+checkUnnamed674(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -949,12 +984,12 @@
   var o = new api.ReportCrossDimensionReachCriteria();
   buildCounterReportCrossDimensionReachCriteria++;
   if (buildCounterReportCrossDimensionReachCriteria < 3) {
-    o.breakdown = buildUnnamed224();
+    o.breakdown = buildUnnamed671();
     o.dateRange = buildDateRange();
     o.dimension = "foo";
-    o.dimensionFilters = buildUnnamed225();
-    o.metricNames = buildUnnamed226();
-    o.overlapMetricNames = buildUnnamed227();
+    o.dimensionFilters = buildUnnamed672();
+    o.metricNames = buildUnnamed673();
+    o.overlapMetricNames = buildUnnamed674();
     o.pivoted = true;
   }
   buildCounterReportCrossDimensionReachCriteria--;
@@ -964,25 +999,25 @@
 checkReportCrossDimensionReachCriteria(api.ReportCrossDimensionReachCriteria o) {
   buildCounterReportCrossDimensionReachCriteria++;
   if (buildCounterReportCrossDimensionReachCriteria < 3) {
-    checkUnnamed224(o.breakdown);
+    checkUnnamed671(o.breakdown);
     checkDateRange(o.dateRange);
     unittest.expect(o.dimension, unittest.equals('foo'));
-    checkUnnamed225(o.dimensionFilters);
-    checkUnnamed226(o.metricNames);
-    checkUnnamed227(o.overlapMetricNames);
+    checkUnnamed672(o.dimensionFilters);
+    checkUnnamed673(o.metricNames);
+    checkUnnamed674(o.overlapMetricNames);
     unittest.expect(o.pivoted, unittest.isTrue);
   }
   buildCounterReportCrossDimensionReachCriteria--;
 }
 
-buildUnnamed228() {
+buildUnnamed675() {
   var o = new core.List<api.Recipient>();
   o.add(buildRecipient());
   o.add(buildRecipient());
   return o;
 }
 
-checkUnnamed228(core.List<api.Recipient> o) {
+checkUnnamed675(core.List<api.Recipient> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRecipient(o[0]);
   checkRecipient(o[1]);
@@ -996,7 +1031,7 @@
     o.emailOwner = true;
     o.emailOwnerDeliveryType = "foo";
     o.message = "foo";
-    o.recipients = buildUnnamed228();
+    o.recipients = buildUnnamed675();
   }
   buildCounterReportDelivery--;
   return o;
@@ -1008,58 +1043,58 @@
     unittest.expect(o.emailOwner, unittest.isTrue);
     unittest.expect(o.emailOwnerDeliveryType, unittest.equals('foo'));
     unittest.expect(o.message, unittest.equals('foo'));
-    checkUnnamed228(o.recipients);
+    checkUnnamed675(o.recipients);
   }
   buildCounterReportDelivery--;
 }
 
-buildUnnamed229() {
+buildUnnamed676() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed229(core.List<api.DimensionValue> o) {
+checkUnnamed676(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed230() {
+buildUnnamed677() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed230(core.List<api.DimensionValue> o) {
+checkUnnamed677(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed231() {
+buildUnnamed678() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed231(core.List<api.SortedDimension> o) {
+checkUnnamed678(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
 }
 
-buildUnnamed232() {
+buildUnnamed679() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed232(core.List<core.String> o) {
+checkUnnamed679(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1093,12 +1128,12 @@
   var o = new api.ReportFloodlightCriteria();
   buildCounterReportFloodlightCriteria++;
   if (buildCounterReportFloodlightCriteria < 3) {
-    o.customRichMediaEvents = buildUnnamed229();
+    o.customRichMediaEvents = buildUnnamed676();
     o.dateRange = buildDateRange();
-    o.dimensionFilters = buildUnnamed230();
-    o.dimensions = buildUnnamed231();
+    o.dimensionFilters = buildUnnamed677();
+    o.dimensions = buildUnnamed678();
     o.floodlightConfigId = buildDimensionValue();
-    o.metricNames = buildUnnamed232();
+    o.metricNames = buildUnnamed679();
     o.reportProperties = buildReportFloodlightCriteriaReportProperties();
   }
   buildCounterReportFloodlightCriteria--;
@@ -1108,90 +1143,90 @@
 checkReportFloodlightCriteria(api.ReportFloodlightCriteria o) {
   buildCounterReportFloodlightCriteria++;
   if (buildCounterReportFloodlightCriteria < 3) {
-    checkUnnamed229(o.customRichMediaEvents);
+    checkUnnamed676(o.customRichMediaEvents);
     checkDateRange(o.dateRange);
-    checkUnnamed230(o.dimensionFilters);
-    checkUnnamed231(o.dimensions);
+    checkUnnamed677(o.dimensionFilters);
+    checkUnnamed678(o.dimensions);
     checkDimensionValue(o.floodlightConfigId);
-    checkUnnamed232(o.metricNames);
+    checkUnnamed679(o.metricNames);
     checkReportFloodlightCriteriaReportProperties(o.reportProperties);
   }
   buildCounterReportFloodlightCriteria--;
 }
 
-buildUnnamed233() {
+buildUnnamed680() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed233(core.List<api.DimensionValue> o) {
+checkUnnamed680(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed234() {
+buildUnnamed681() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed234(core.List<api.SortedDimension> o) {
+checkUnnamed681(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
 }
 
-buildUnnamed235() {
+buildUnnamed682() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed235(core.List<api.SortedDimension> o) {
+checkUnnamed682(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
 }
 
-buildUnnamed236() {
+buildUnnamed683() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed236(core.List<api.DimensionValue> o) {
+checkUnnamed683(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed237() {
+buildUnnamed684() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed237(core.List<core.String> o) {
+checkUnnamed684(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed238() {
+buildUnnamed685() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed238(core.List<api.SortedDimension> o) {
+checkUnnamed685(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
@@ -1237,14 +1272,14 @@
   var o = new api.ReportPathToConversionCriteria();
   buildCounterReportPathToConversionCriteria++;
   if (buildCounterReportPathToConversionCriteria < 3) {
-    o.activityFilters = buildUnnamed233();
-    o.conversionDimensions = buildUnnamed234();
-    o.customFloodlightVariables = buildUnnamed235();
-    o.customRichMediaEvents = buildUnnamed236();
+    o.activityFilters = buildUnnamed680();
+    o.conversionDimensions = buildUnnamed681();
+    o.customFloodlightVariables = buildUnnamed682();
+    o.customRichMediaEvents = buildUnnamed683();
     o.dateRange = buildDateRange();
     o.floodlightConfigId = buildDimensionValue();
-    o.metricNames = buildUnnamed237();
-    o.perInteractionDimensions = buildUnnamed238();
+    o.metricNames = buildUnnamed684();
+    o.perInteractionDimensions = buildUnnamed685();
     o.reportProperties = buildReportPathToConversionCriteriaReportProperties();
   }
   buildCounterReportPathToConversionCriteria--;
@@ -1254,66 +1289,66 @@
 checkReportPathToConversionCriteria(api.ReportPathToConversionCriteria o) {
   buildCounterReportPathToConversionCriteria++;
   if (buildCounterReportPathToConversionCriteria < 3) {
-    checkUnnamed233(o.activityFilters);
-    checkUnnamed234(o.conversionDimensions);
-    checkUnnamed235(o.customFloodlightVariables);
-    checkUnnamed236(o.customRichMediaEvents);
+    checkUnnamed680(o.activityFilters);
+    checkUnnamed681(o.conversionDimensions);
+    checkUnnamed682(o.customFloodlightVariables);
+    checkUnnamed683(o.customRichMediaEvents);
     checkDateRange(o.dateRange);
     checkDimensionValue(o.floodlightConfigId);
-    checkUnnamed237(o.metricNames);
-    checkUnnamed238(o.perInteractionDimensions);
+    checkUnnamed684(o.metricNames);
+    checkUnnamed685(o.perInteractionDimensions);
     checkReportPathToConversionCriteriaReportProperties(o.reportProperties);
   }
   buildCounterReportPathToConversionCriteria--;
 }
 
-buildUnnamed239() {
+buildUnnamed686() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed239(core.List<api.DimensionValue> o) {
+checkUnnamed686(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed240() {
+buildUnnamed687() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed240(core.List<api.SortedDimension> o) {
+checkUnnamed687(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
 }
 
-buildUnnamed241() {
+buildUnnamed688() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed241(core.List<core.String> o) {
+checkUnnamed688(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed242() {
+buildUnnamed689() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed242(core.List<core.String> o) {
+checkUnnamed689(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1327,10 +1362,10 @@
     o.activities = buildActivities();
     o.customRichMediaEvents = buildCustomRichMediaEvents();
     o.dateRange = buildDateRange();
-    o.dimensionFilters = buildUnnamed239();
-    o.dimensions = buildUnnamed240();
-    o.metricNames = buildUnnamed241();
-    o.reachByFrequencyMetricNames = buildUnnamed242();
+    o.dimensionFilters = buildUnnamed686();
+    o.dimensions = buildUnnamed687();
+    o.metricNames = buildUnnamed688();
+    o.reachByFrequencyMetricNames = buildUnnamed689();
   }
   buildCounterReportReachCriteria--;
   return o;
@@ -1342,22 +1377,22 @@
     checkActivities(o.activities);
     checkCustomRichMediaEvents(o.customRichMediaEvents);
     checkDateRange(o.dateRange);
-    checkUnnamed239(o.dimensionFilters);
-    checkUnnamed240(o.dimensions);
-    checkUnnamed241(o.metricNames);
-    checkUnnamed242(o.reachByFrequencyMetricNames);
+    checkUnnamed686(o.dimensionFilters);
+    checkUnnamed687(o.dimensions);
+    checkUnnamed688(o.metricNames);
+    checkUnnamed689(o.reachByFrequencyMetricNames);
   }
   buildCounterReportReachCriteria--;
 }
 
-buildUnnamed243() {
+buildUnnamed690() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed243(core.List<core.String> o) {
+checkUnnamed690(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1372,7 +1407,7 @@
     o.every = 42;
     o.expirationDate = core.DateTime.parse("2002-02-27T14:01:02Z");
     o.repeats = "foo";
-    o.repeatsOnWeekDays = buildUnnamed243();
+    o.repeatsOnWeekDays = buildUnnamed690();
     o.runsOnDayOfMonth = "foo";
     o.startDate = core.DateTime.parse("2002-02-27T14:01:02Z");
   }
@@ -1387,7 +1422,7 @@
     unittest.expect(o.every, unittest.equals(42));
     unittest.expect(o.expirationDate, unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
     unittest.expect(o.repeats, unittest.equals('foo'));
-    checkUnnamed243(o.repeatsOnWeekDays);
+    checkUnnamed690(o.repeatsOnWeekDays);
     unittest.expect(o.runsOnDayOfMonth, unittest.equals('foo'));
     unittest.expect(o.startDate, unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
   }
@@ -1449,53 +1484,53 @@
   buildCounterReport--;
 }
 
-buildUnnamed244() {
+buildUnnamed691() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed244(core.List<api.Dimension> o) {
+checkUnnamed691(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed245() {
+buildUnnamed692() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed245(core.List<api.Dimension> o) {
+checkUnnamed692(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed246() {
+buildUnnamed693() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed246(core.List<api.Metric> o) {
+checkUnnamed693(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
 }
 
-buildUnnamed247() {
+buildUnnamed694() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed247(core.List<api.Metric> o) {
+checkUnnamed694(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
@@ -1506,11 +1541,11 @@
   var o = new api.ReportCompatibleFields();
   buildCounterReportCompatibleFields++;
   if (buildCounterReportCompatibleFields < 3) {
-    o.dimensionFilters = buildUnnamed244();
-    o.dimensions = buildUnnamed245();
+    o.dimensionFilters = buildUnnamed691();
+    o.dimensions = buildUnnamed692();
     o.kind = "foo";
-    o.metrics = buildUnnamed246();
-    o.pivotedActivityMetrics = buildUnnamed247();
+    o.metrics = buildUnnamed693();
+    o.pivotedActivityMetrics = buildUnnamed694();
   }
   buildCounterReportCompatibleFields--;
   return o;
@@ -1519,23 +1554,23 @@
 checkReportCompatibleFields(api.ReportCompatibleFields o) {
   buildCounterReportCompatibleFields++;
   if (buildCounterReportCompatibleFields < 3) {
-    checkUnnamed244(o.dimensionFilters);
-    checkUnnamed245(o.dimensions);
+    checkUnnamed691(o.dimensionFilters);
+    checkUnnamed692(o.dimensions);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed246(o.metrics);
-    checkUnnamed247(o.pivotedActivityMetrics);
+    checkUnnamed693(o.metrics);
+    checkUnnamed694(o.pivotedActivityMetrics);
   }
   buildCounterReportCompatibleFields--;
 }
 
-buildUnnamed248() {
+buildUnnamed695() {
   var o = new core.List<api.Report>();
   o.add(buildReport());
   o.add(buildReport());
   return o;
 }
 
-checkUnnamed248(core.List<api.Report> o) {
+checkUnnamed695(core.List<api.Report> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReport(o[0]);
   checkReport(o[1]);
@@ -1547,7 +1582,7 @@
   buildCounterReportList++;
   if (buildCounterReportList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed248();
+    o.items = buildUnnamed695();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1559,7 +1594,7 @@
   buildCounterReportList++;
   if (buildCounterReportList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed248(o.items);
+    checkUnnamed695(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1622,14 +1657,14 @@
   buildCounterUserProfile--;
 }
 
-buildUnnamed249() {
+buildUnnamed696() {
   var o = new core.List<api.UserProfile>();
   o.add(buildUserProfile());
   o.add(buildUserProfile());
   return o;
 }
 
-checkUnnamed249(core.List<api.UserProfile> o) {
+checkUnnamed696(core.List<api.UserProfile> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserProfile(o[0]);
   checkUserProfile(o[1]);
@@ -1641,7 +1676,7 @@
   buildCounterUserProfileList++;
   if (buildCounterUserProfileList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed249();
+    o.items = buildUnnamed696();
     o.kind = "foo";
   }
   buildCounterUserProfileList--;
@@ -1652,7 +1687,7 @@
   buildCounterUserProfileList++;
   if (buildCounterUserProfileList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed249(o.items);
+    checkUnnamed696(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterUserProfileList--;
@@ -1969,7 +2004,7 @@
   unittest.group("resource-DimensionValuesResourceApi", () {
     unittest.test("method--query", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DimensionValuesResourceApi res = new api.DfareportingApi(mock).dimensionValues;
       var arg_request = buildDimensionValueRequest();
       var arg_profileId = "foo";
@@ -2021,7 +2056,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDimensionValueList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.query(arg_request, arg_profileId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.DimensionValueList response) {
         checkDimensionValueList(response);
@@ -2036,7 +2071,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FilesResourceApi res = new api.DfareportingApi(mock).files;
       var arg_reportId = "foo";
       var arg_fileId = "foo";
@@ -2084,7 +2119,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_reportId, arg_fileId).then(unittest.expectAsync(((api.File response) {
         checkFile(response);
@@ -2093,7 +2128,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FilesResourceApi res = new api.DfareportingApi(mock).files;
       var arg_profileId = "foo";
       var arg_maxResults = 42;
@@ -2147,7 +2182,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFileList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, maxResults: arg_maxResults, pageToken: arg_pageToken, scope: arg_scope, sortField: arg_sortField, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.FileList response) {
         checkFileList(response);
@@ -2160,7 +2195,7 @@
   unittest.group("resource-ReportsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsResourceApi res = new api.DfareportingApi(mock).reports;
       var arg_profileId = "foo";
       var arg_reportId = "foo";
@@ -2208,14 +2243,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_profileId, arg_reportId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsResourceApi res = new api.DfareportingApi(mock).reports;
       var arg_profileId = "foo";
       var arg_reportId = "foo";
@@ -2263,7 +2298,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildReport());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_reportId).then(unittest.expectAsync(((api.Report response) {
         checkReport(response);
@@ -2272,7 +2307,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsResourceApi res = new api.DfareportingApi(mock).reports;
       var arg_request = buildReport();
       var arg_profileId = "foo";
@@ -2320,7 +2355,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildReport());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_profileId).then(unittest.expectAsync(((api.Report response) {
         checkReport(response);
@@ -2329,7 +2364,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsResourceApi res = new api.DfareportingApi(mock).reports;
       var arg_profileId = "foo";
       var arg_maxResults = 42;
@@ -2383,7 +2418,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildReportList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, maxResults: arg_maxResults, pageToken: arg_pageToken, scope: arg_scope, sortField: arg_sortField, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.ReportList response) {
         checkReportList(response);
@@ -2392,7 +2427,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsResourceApi res = new api.DfareportingApi(mock).reports;
       var arg_request = buildReport();
       var arg_profileId = "foo";
@@ -2444,7 +2479,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildReport());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_profileId, arg_reportId).then(unittest.expectAsync(((api.Report response) {
         checkReport(response);
@@ -2453,7 +2488,7 @@
 
     unittest.test("method--run", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsResourceApi res = new api.DfareportingApi(mock).reports;
       var arg_profileId = "foo";
       var arg_reportId = "foo";
@@ -2507,7 +2542,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.run(arg_profileId, arg_reportId, synchronous: arg_synchronous).then(unittest.expectAsync(((api.File response) {
         checkFile(response);
@@ -2516,7 +2551,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsResourceApi res = new api.DfareportingApi(mock).reports;
       var arg_request = buildReport();
       var arg_profileId = "foo";
@@ -2568,7 +2603,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildReport());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_profileId, arg_reportId).then(unittest.expectAsync(((api.Report response) {
         checkReport(response);
@@ -2581,7 +2616,7 @@
   unittest.group("resource-ReportsCompatibleFieldsResourceApi", () {
     unittest.test("method--query", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsCompatibleFieldsResourceApi res = new api.DfareportingApi(mock).reports.compatibleFields;
       var arg_request = buildReport();
       var arg_profileId = "foo";
@@ -2629,7 +2664,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCompatibleFields());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.query(arg_request, arg_profileId).then(unittest.expectAsync(((api.CompatibleFields response) {
         checkCompatibleFields(response);
@@ -2644,7 +2679,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsFilesResourceApi res = new api.DfareportingApi(mock).reports.files;
       var arg_profileId = "foo";
       var arg_reportId = "foo";
@@ -2700,7 +2735,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_reportId, arg_fileId).then(unittest.expectAsync(((api.File response) {
         checkFile(response);
@@ -2709,7 +2744,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsFilesResourceApi res = new api.DfareportingApi(mock).reports.files;
       var arg_profileId = "foo";
       var arg_reportId = "foo";
@@ -2769,7 +2804,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFileList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, arg_reportId, maxResults: arg_maxResults, pageToken: arg_pageToken, sortField: arg_sortField, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.FileList response) {
         checkFileList(response);
@@ -2782,7 +2817,7 @@
   unittest.group("resource-UserProfilesResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UserProfilesResourceApi res = new api.DfareportingApi(mock).userProfiles;
       var arg_profileId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2822,7 +2857,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUserProfile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId).then(unittest.expectAsync(((api.UserProfile response) {
         checkUserProfile(response);
@@ -2831,7 +2866,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UserProfilesResourceApi res = new api.DfareportingApi(mock).userProfiles;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -2867,7 +2902,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUserProfileList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list().then(unittest.expectAsync(((api.UserProfileList response) {
         checkUserProfileList(response);
diff --git a/generated/googleapis/test/dfareporting/v2_0_test.dart b/generated/googleapis/test/dfareporting/v2_0_test.dart
index 853b739..42744e2 100644
--- a/generated/googleapis/test/dfareporting/v2_0_test.dart
+++ b/generated/googleapis/test/dfareporting/v2_0_test.dart
@@ -8,35 +8,70 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/dfareporting/v2_0.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
 
-buildUnnamed284() {
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+buildUnnamed697() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed284(core.List<core.String> o) {
+checkUnnamed697(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed285() {
+buildUnnamed698() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed285(core.List<core.String> o) {
+checkUnnamed698(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -47,12 +82,12 @@
   var o = new api.Account();
   buildCounterAccount++;
   if (buildCounterAccount < 3) {
-    o.accountPermissionIds = buildUnnamed284();
+    o.accountPermissionIds = buildUnnamed697();
     o.accountProfile = "foo";
     o.active = true;
     o.activeAdsLimitTier = "foo";
     o.activeViewOptOut = true;
-    o.availablePermissionIds = buildUnnamed285();
+    o.availablePermissionIds = buildUnnamed698();
     o.comscoreVceEnabled = true;
     o.countryId = "foo";
     o.currencyId = "foo";
@@ -74,12 +109,12 @@
 checkAccount(api.Account o) {
   buildCounterAccount++;
   if (buildCounterAccount < 3) {
-    checkUnnamed284(o.accountPermissionIds);
+    checkUnnamed697(o.accountPermissionIds);
     unittest.expect(o.accountProfile, unittest.equals('foo'));
     unittest.expect(o.active, unittest.isTrue);
     unittest.expect(o.activeAdsLimitTier, unittest.equals('foo'));
     unittest.expect(o.activeViewOptOut, unittest.isTrue);
-    checkUnnamed285(o.availablePermissionIds);
+    checkUnnamed698(o.availablePermissionIds);
     unittest.expect(o.comscoreVceEnabled, unittest.isTrue);
     unittest.expect(o.countryId, unittest.equals('foo'));
     unittest.expect(o.currencyId, unittest.equals('foo'));
@@ -124,14 +159,14 @@
   buildCounterAccountActiveAdSummary--;
 }
 
-buildUnnamed286() {
+buildUnnamed699() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed286(core.List<core.String> o) {
+checkUnnamed699(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -142,7 +177,7 @@
   var o = new api.AccountPermission();
   buildCounterAccountPermission++;
   if (buildCounterAccountPermission < 3) {
-    o.accountProfiles = buildUnnamed286();
+    o.accountProfiles = buildUnnamed699();
     o.id = "foo";
     o.kind = "foo";
     o.level = "foo";
@@ -156,7 +191,7 @@
 checkAccountPermission(api.AccountPermission o) {
   buildCounterAccountPermission++;
   if (buildCounterAccountPermission < 3) {
-    checkUnnamed286(o.accountProfiles);
+    checkUnnamed699(o.accountProfiles);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.level, unittest.equals('foo'));
@@ -189,14 +224,14 @@
   buildCounterAccountPermissionGroup--;
 }
 
-buildUnnamed287() {
+buildUnnamed700() {
   var o = new core.List<api.AccountPermissionGroup>();
   o.add(buildAccountPermissionGroup());
   o.add(buildAccountPermissionGroup());
   return o;
 }
 
-checkUnnamed287(core.List<api.AccountPermissionGroup> o) {
+checkUnnamed700(core.List<api.AccountPermissionGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountPermissionGroup(o[0]);
   checkAccountPermissionGroup(o[1]);
@@ -207,7 +242,7 @@
   var o = new api.AccountPermissionGroupsListResponse();
   buildCounterAccountPermissionGroupsListResponse++;
   if (buildCounterAccountPermissionGroupsListResponse < 3) {
-    o.accountPermissionGroups = buildUnnamed287();
+    o.accountPermissionGroups = buildUnnamed700();
     o.kind = "foo";
   }
   buildCounterAccountPermissionGroupsListResponse--;
@@ -217,20 +252,20 @@
 checkAccountPermissionGroupsListResponse(api.AccountPermissionGroupsListResponse o) {
   buildCounterAccountPermissionGroupsListResponse++;
   if (buildCounterAccountPermissionGroupsListResponse < 3) {
-    checkUnnamed287(o.accountPermissionGroups);
+    checkUnnamed700(o.accountPermissionGroups);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAccountPermissionGroupsListResponse--;
 }
 
-buildUnnamed288() {
+buildUnnamed701() {
   var o = new core.List<api.AccountPermission>();
   o.add(buildAccountPermission());
   o.add(buildAccountPermission());
   return o;
 }
 
-checkUnnamed288(core.List<api.AccountPermission> o) {
+checkUnnamed701(core.List<api.AccountPermission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountPermission(o[0]);
   checkAccountPermission(o[1]);
@@ -241,7 +276,7 @@
   var o = new api.AccountPermissionsListResponse();
   buildCounterAccountPermissionsListResponse++;
   if (buildCounterAccountPermissionsListResponse < 3) {
-    o.accountPermissions = buildUnnamed288();
+    o.accountPermissions = buildUnnamed701();
     o.kind = "foo";
   }
   buildCounterAccountPermissionsListResponse--;
@@ -251,7 +286,7 @@
 checkAccountPermissionsListResponse(api.AccountPermissionsListResponse o) {
   buildCounterAccountPermissionsListResponse++;
   if (buildCounterAccountPermissionsListResponse < 3) {
-    checkUnnamed288(o.accountPermissions);
+    checkUnnamed701(o.accountPermissions);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAccountPermissionsListResponse--;
@@ -306,14 +341,14 @@
   buildCounterAccountUserProfile--;
 }
 
-buildUnnamed289() {
+buildUnnamed702() {
   var o = new core.List<api.AccountUserProfile>();
   o.add(buildAccountUserProfile());
   o.add(buildAccountUserProfile());
   return o;
 }
 
-checkUnnamed289(core.List<api.AccountUserProfile> o) {
+checkUnnamed702(core.List<api.AccountUserProfile> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountUserProfile(o[0]);
   checkAccountUserProfile(o[1]);
@@ -324,7 +359,7 @@
   var o = new api.AccountUserProfilesListResponse();
   buildCounterAccountUserProfilesListResponse++;
   if (buildCounterAccountUserProfilesListResponse < 3) {
-    o.accountUserProfiles = buildUnnamed289();
+    o.accountUserProfiles = buildUnnamed702();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -335,21 +370,21 @@
 checkAccountUserProfilesListResponse(api.AccountUserProfilesListResponse o) {
   buildCounterAccountUserProfilesListResponse++;
   if (buildCounterAccountUserProfilesListResponse < 3) {
-    checkUnnamed289(o.accountUserProfiles);
+    checkUnnamed702(o.accountUserProfiles);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterAccountUserProfilesListResponse--;
 }
 
-buildUnnamed290() {
+buildUnnamed703() {
   var o = new core.List<api.Account>();
   o.add(buildAccount());
   o.add(buildAccount());
   return o;
 }
 
-checkUnnamed290(core.List<api.Account> o) {
+checkUnnamed703(core.List<api.Account> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccount(o[0]);
   checkAccount(o[1]);
@@ -360,7 +395,7 @@
   var o = new api.AccountsListResponse();
   buildCounterAccountsListResponse++;
   if (buildCounterAccountsListResponse < 3) {
-    o.accounts = buildUnnamed290();
+    o.accounts = buildUnnamed703();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -371,34 +406,34 @@
 checkAccountsListResponse(api.AccountsListResponse o) {
   buildCounterAccountsListResponse++;
   if (buildCounterAccountsListResponse < 3) {
-    checkUnnamed290(o.accounts);
+    checkUnnamed703(o.accounts);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterAccountsListResponse--;
 }
 
-buildUnnamed291() {
+buildUnnamed704() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed291(core.List<api.DimensionValue> o) {
+checkUnnamed704(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed292() {
+buildUnnamed705() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed292(core.List<core.String> o) {
+checkUnnamed705(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -409,9 +444,9 @@
   var o = new api.Activities();
   buildCounterActivities++;
   if (buildCounterActivities < 3) {
-    o.filters = buildUnnamed291();
+    o.filters = buildUnnamed704();
     o.kind = "foo";
-    o.metricNames = buildUnnamed292();
+    o.metricNames = buildUnnamed705();
   }
   buildCounterActivities--;
   return o;
@@ -420,47 +455,47 @@
 checkActivities(api.Activities o) {
   buildCounterActivities++;
   if (buildCounterActivities < 3) {
-    checkUnnamed291(o.filters);
+    checkUnnamed704(o.filters);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed292(o.metricNames);
+    checkUnnamed705(o.metricNames);
   }
   buildCounterActivities--;
 }
 
-buildUnnamed293() {
+buildUnnamed706() {
   var o = new core.List<api.CreativeGroupAssignment>();
   o.add(buildCreativeGroupAssignment());
   o.add(buildCreativeGroupAssignment());
   return o;
 }
 
-checkUnnamed293(core.List<api.CreativeGroupAssignment> o) {
+checkUnnamed706(core.List<api.CreativeGroupAssignment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeGroupAssignment(o[0]);
   checkCreativeGroupAssignment(o[1]);
 }
 
-buildUnnamed294() {
+buildUnnamed707() {
   var o = new core.List<api.EventTagOverride>();
   o.add(buildEventTagOverride());
   o.add(buildEventTagOverride());
   return o;
 }
 
-checkUnnamed294(core.List<api.EventTagOverride> o) {
+checkUnnamed707(core.List<api.EventTagOverride> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventTagOverride(o[0]);
   checkEventTagOverride(o[1]);
 }
 
-buildUnnamed295() {
+buildUnnamed708() {
   var o = new core.List<api.PlacementAssignment>();
   o.add(buildPlacementAssignment());
   o.add(buildPlacementAssignment());
   return o;
 }
 
-checkUnnamed295(core.List<api.PlacementAssignment> o) {
+checkUnnamed708(core.List<api.PlacementAssignment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlacementAssignment(o[0]);
   checkPlacementAssignment(o[1]);
@@ -484,14 +519,14 @@
     o.comments = "foo";
     o.compatibility = "foo";
     o.createInfo = buildLastModifiedInfo();
-    o.creativeGroupAssignments = buildUnnamed293();
+    o.creativeGroupAssignments = buildUnnamed706();
     o.creativeRotation = buildCreativeRotation();
     o.dayPartTargeting = buildDayPartTargeting();
     o.defaultClickThroughEventTagProperties = buildDefaultClickThroughEventTagProperties();
     o.deliverySchedule = buildDeliverySchedule();
     o.dynamicClickTracker = true;
     o.endTime = core.DateTime.parse("2002-02-27T14:01:02");
-    o.eventTagOverrides = buildUnnamed294();
+    o.eventTagOverrides = buildUnnamed707();
     o.geoTargeting = buildGeoTargeting();
     o.id = "foo";
     o.idDimensionValue = buildDimensionValue();
@@ -499,7 +534,7 @@
     o.kind = "foo";
     o.lastModifiedInfo = buildLastModifiedInfo();
     o.name = "foo";
-    o.placementAssignments = buildUnnamed295();
+    o.placementAssignments = buildUnnamed708();
     o.remarketingListExpression = buildListTargetingExpression();
     o.size = buildSize();
     o.sslCompliant = true;
@@ -529,14 +564,14 @@
     unittest.expect(o.comments, unittest.equals('foo'));
     unittest.expect(o.compatibility, unittest.equals('foo'));
     checkLastModifiedInfo(o.createInfo);
-    checkUnnamed293(o.creativeGroupAssignments);
+    checkUnnamed706(o.creativeGroupAssignments);
     checkCreativeRotation(o.creativeRotation);
     checkDayPartTargeting(o.dayPartTargeting);
     checkDefaultClickThroughEventTagProperties(o.defaultClickThroughEventTagProperties);
     checkDeliverySchedule(o.deliverySchedule);
     unittest.expect(o.dynamicClickTracker, unittest.isTrue);
     unittest.expect(o.endTime, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
-    checkUnnamed294(o.eventTagOverrides);
+    checkUnnamed707(o.eventTagOverrides);
     checkGeoTargeting(o.geoTargeting);
     unittest.expect(o.id, unittest.equals('foo'));
     checkDimensionValue(o.idDimensionValue);
@@ -544,7 +579,7 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     checkLastModifiedInfo(o.lastModifiedInfo);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed295(o.placementAssignments);
+    checkUnnamed708(o.placementAssignments);
     checkListTargetingExpression(o.remarketingListExpression);
     checkSize(o.size);
     unittest.expect(o.sslCompliant, unittest.isTrue);
@@ -557,14 +592,14 @@
   buildCounterAd--;
 }
 
-buildUnnamed296() {
+buildUnnamed709() {
   var o = new core.List<api.Ad>();
   o.add(buildAd());
   o.add(buildAd());
   return o;
 }
 
-checkUnnamed296(core.List<api.Ad> o) {
+checkUnnamed709(core.List<api.Ad> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAd(o[0]);
   checkAd(o[1]);
@@ -575,7 +610,7 @@
   var o = new api.AdsListResponse();
   buildCounterAdsListResponse++;
   if (buildCounterAdsListResponse < 3) {
-    o.ads = buildUnnamed296();
+    o.ads = buildUnnamed709();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -586,7 +621,7 @@
 checkAdsListResponse(api.AdsListResponse o) {
   buildCounterAdsListResponse++;
   if (buildCounterAdsListResponse < 3) {
-    checkUnnamed296(o.ads);
+    checkUnnamed709(o.ads);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -661,14 +696,14 @@
   buildCounterAdvertiserGroup--;
 }
 
-buildUnnamed297() {
+buildUnnamed710() {
   var o = new core.List<api.AdvertiserGroup>();
   o.add(buildAdvertiserGroup());
   o.add(buildAdvertiserGroup());
   return o;
 }
 
-checkUnnamed297(core.List<api.AdvertiserGroup> o) {
+checkUnnamed710(core.List<api.AdvertiserGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdvertiserGroup(o[0]);
   checkAdvertiserGroup(o[1]);
@@ -679,7 +714,7 @@
   var o = new api.AdvertiserGroupsListResponse();
   buildCounterAdvertiserGroupsListResponse++;
   if (buildCounterAdvertiserGroupsListResponse < 3) {
-    o.advertiserGroups = buildUnnamed297();
+    o.advertiserGroups = buildUnnamed710();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -690,21 +725,21 @@
 checkAdvertiserGroupsListResponse(api.AdvertiserGroupsListResponse o) {
   buildCounterAdvertiserGroupsListResponse++;
   if (buildCounterAdvertiserGroupsListResponse < 3) {
-    checkUnnamed297(o.advertiserGroups);
+    checkUnnamed710(o.advertiserGroups);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterAdvertiserGroupsListResponse--;
 }
 
-buildUnnamed298() {
+buildUnnamed711() {
   var o = new core.List<api.Advertiser>();
   o.add(buildAdvertiser());
   o.add(buildAdvertiser());
   return o;
 }
 
-checkUnnamed298(core.List<api.Advertiser> o) {
+checkUnnamed711(core.List<api.Advertiser> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdvertiser(o[0]);
   checkAdvertiser(o[1]);
@@ -715,7 +750,7 @@
   var o = new api.AdvertisersListResponse();
   buildCounterAdvertisersListResponse++;
   if (buildCounterAdvertisersListResponse < 3) {
-    o.advertisers = buildUnnamed298();
+    o.advertisers = buildUnnamed711();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -726,7 +761,7 @@
 checkAdvertisersListResponse(api.AdvertisersListResponse o) {
   buildCounterAdvertisersListResponse++;
   if (buildCounterAdvertisersListResponse < 3) {
-    checkUnnamed298(o.advertisers);
+    checkUnnamed711(o.advertisers);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -756,14 +791,14 @@
   buildCounterAudienceSegment--;
 }
 
-buildUnnamed299() {
+buildUnnamed712() {
   var o = new core.List<api.AudienceSegment>();
   o.add(buildAudienceSegment());
   o.add(buildAudienceSegment());
   return o;
 }
 
-checkUnnamed299(core.List<api.AudienceSegment> o) {
+checkUnnamed712(core.List<api.AudienceSegment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAudienceSegment(o[0]);
   checkAudienceSegment(o[1]);
@@ -774,7 +809,7 @@
   var o = new api.AudienceSegmentGroup();
   buildCounterAudienceSegmentGroup++;
   if (buildCounterAudienceSegmentGroup < 3) {
-    o.audienceSegments = buildUnnamed299();
+    o.audienceSegments = buildUnnamed712();
     o.id = "foo";
     o.name = "foo";
   }
@@ -785,7 +820,7 @@
 checkAudienceSegmentGroup(api.AudienceSegmentGroup o) {
   buildCounterAudienceSegmentGroup++;
   if (buildCounterAudienceSegmentGroup < 3) {
-    checkUnnamed299(o.audienceSegments);
+    checkUnnamed712(o.audienceSegments);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
   }
@@ -821,14 +856,14 @@
   buildCounterBrowser--;
 }
 
-buildUnnamed300() {
+buildUnnamed713() {
   var o = new core.List<api.Browser>();
   o.add(buildBrowser());
   o.add(buildBrowser());
   return o;
 }
 
-checkUnnamed300(core.List<api.Browser> o) {
+checkUnnamed713(core.List<api.Browser> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBrowser(o[0]);
   checkBrowser(o[1]);
@@ -839,7 +874,7 @@
   var o = new api.BrowsersListResponse();
   buildCounterBrowsersListResponse++;
   if (buildCounterBrowsersListResponse < 3) {
-    o.browsers = buildUnnamed300();
+    o.browsers = buildUnnamed713();
     o.kind = "foo";
   }
   buildCounterBrowsersListResponse--;
@@ -849,72 +884,72 @@
 checkBrowsersListResponse(api.BrowsersListResponse o) {
   buildCounterBrowsersListResponse++;
   if (buildCounterBrowsersListResponse < 3) {
-    checkUnnamed300(o.browsers);
+    checkUnnamed713(o.browsers);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterBrowsersListResponse--;
 }
 
-buildUnnamed301() {
+buildUnnamed714() {
   var o = new core.List<api.CreativeOptimizationConfiguration>();
   o.add(buildCreativeOptimizationConfiguration());
   o.add(buildCreativeOptimizationConfiguration());
   return o;
 }
 
-checkUnnamed301(core.List<api.CreativeOptimizationConfiguration> o) {
+checkUnnamed714(core.List<api.CreativeOptimizationConfiguration> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeOptimizationConfiguration(o[0]);
   checkCreativeOptimizationConfiguration(o[1]);
 }
 
-buildUnnamed302() {
+buildUnnamed715() {
   var o = new core.List<api.AudienceSegmentGroup>();
   o.add(buildAudienceSegmentGroup());
   o.add(buildAudienceSegmentGroup());
   return o;
 }
 
-checkUnnamed302(core.List<api.AudienceSegmentGroup> o) {
+checkUnnamed715(core.List<api.AudienceSegmentGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAudienceSegmentGroup(o[0]);
   checkAudienceSegmentGroup(o[1]);
 }
 
-buildUnnamed303() {
+buildUnnamed716() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed303(core.List<core.String> o) {
+checkUnnamed716(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed304() {
+buildUnnamed717() {
   var o = new core.List<api.EventTagOverride>();
   o.add(buildEventTagOverride());
   o.add(buildEventTagOverride());
   return o;
 }
 
-checkUnnamed304(core.List<api.EventTagOverride> o) {
+checkUnnamed717(core.List<api.EventTagOverride> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventTagOverride(o[0]);
   checkEventTagOverride(o[1]);
 }
 
-buildUnnamed305() {
+buildUnnamed718() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed305(core.List<core.String> o) {
+checkUnnamed718(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -926,22 +961,22 @@
   buildCounterCampaign++;
   if (buildCounterCampaign < 3) {
     o.accountId = "foo";
-    o.additionalCreativeOptimizationConfigurations = buildUnnamed301();
+    o.additionalCreativeOptimizationConfigurations = buildUnnamed714();
     o.advertiserGroupId = "foo";
     o.advertiserId = "foo";
     o.advertiserIdDimensionValue = buildDimensionValue();
     o.archived = true;
-    o.audienceSegmentGroups = buildUnnamed302();
+    o.audienceSegmentGroups = buildUnnamed715();
     o.billingInvoiceCode = "foo";
     o.clickThroughUrlSuffixProperties = buildClickThroughUrlSuffixProperties();
     o.comment = "foo";
     o.comscoreVceEnabled = true;
     o.createInfo = buildLastModifiedInfo();
-    o.creativeGroupIds = buildUnnamed303();
+    o.creativeGroupIds = buildUnnamed716();
     o.creativeOptimizationConfiguration = buildCreativeOptimizationConfiguration();
     o.defaultClickThroughEventTagProperties = buildDefaultClickThroughEventTagProperties();
     o.endDate = core.DateTime.parse("2002-02-27T14:01:02Z");
-    o.eventTagOverrides = buildUnnamed304();
+    o.eventTagOverrides = buildUnnamed717();
     o.externalId = "foo";
     o.id = "foo";
     o.idDimensionValue = buildDimensionValue();
@@ -952,7 +987,7 @@
     o.nielsenOcrEnabled = true;
     o.startDate = core.DateTime.parse("2002-02-27T14:01:02Z");
     o.subaccountId = "foo";
-    o.traffickerEmails = buildUnnamed305();
+    o.traffickerEmails = buildUnnamed718();
   }
   buildCounterCampaign--;
   return o;
@@ -962,22 +997,22 @@
   buildCounterCampaign++;
   if (buildCounterCampaign < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
-    checkUnnamed301(o.additionalCreativeOptimizationConfigurations);
+    checkUnnamed714(o.additionalCreativeOptimizationConfigurations);
     unittest.expect(o.advertiserGroupId, unittest.equals('foo'));
     unittest.expect(o.advertiserId, unittest.equals('foo'));
     checkDimensionValue(o.advertiserIdDimensionValue);
     unittest.expect(o.archived, unittest.isTrue);
-    checkUnnamed302(o.audienceSegmentGroups);
+    checkUnnamed715(o.audienceSegmentGroups);
     unittest.expect(o.billingInvoiceCode, unittest.equals('foo'));
     checkClickThroughUrlSuffixProperties(o.clickThroughUrlSuffixProperties);
     unittest.expect(o.comment, unittest.equals('foo'));
     unittest.expect(o.comscoreVceEnabled, unittest.isTrue);
     checkLastModifiedInfo(o.createInfo);
-    checkUnnamed303(o.creativeGroupIds);
+    checkUnnamed716(o.creativeGroupIds);
     checkCreativeOptimizationConfiguration(o.creativeOptimizationConfiguration);
     checkDefaultClickThroughEventTagProperties(o.defaultClickThroughEventTagProperties);
     unittest.expect(o.endDate, unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
-    checkUnnamed304(o.eventTagOverrides);
+    checkUnnamed717(o.eventTagOverrides);
     unittest.expect(o.externalId, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     checkDimensionValue(o.idDimensionValue);
@@ -988,7 +1023,7 @@
     unittest.expect(o.nielsenOcrEnabled, unittest.isTrue);
     unittest.expect(o.startDate, unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
     unittest.expect(o.subaccountId, unittest.equals('foo'));
-    checkUnnamed305(o.traffickerEmails);
+    checkUnnamed718(o.traffickerEmails);
   }
   buildCounterCampaign--;
 }
@@ -1014,14 +1049,14 @@
   buildCounterCampaignCreativeAssociation--;
 }
 
-buildUnnamed306() {
+buildUnnamed719() {
   var o = new core.List<api.CampaignCreativeAssociation>();
   o.add(buildCampaignCreativeAssociation());
   o.add(buildCampaignCreativeAssociation());
   return o;
 }
 
-checkUnnamed306(core.List<api.CampaignCreativeAssociation> o) {
+checkUnnamed719(core.List<api.CampaignCreativeAssociation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCampaignCreativeAssociation(o[0]);
   checkCampaignCreativeAssociation(o[1]);
@@ -1032,7 +1067,7 @@
   var o = new api.CampaignCreativeAssociationsListResponse();
   buildCounterCampaignCreativeAssociationsListResponse++;
   if (buildCounterCampaignCreativeAssociationsListResponse < 3) {
-    o.campaignCreativeAssociations = buildUnnamed306();
+    o.campaignCreativeAssociations = buildUnnamed719();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1043,21 +1078,21 @@
 checkCampaignCreativeAssociationsListResponse(api.CampaignCreativeAssociationsListResponse o) {
   buildCounterCampaignCreativeAssociationsListResponse++;
   if (buildCounterCampaignCreativeAssociationsListResponse < 3) {
-    checkUnnamed306(o.campaignCreativeAssociations);
+    checkUnnamed719(o.campaignCreativeAssociations);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterCampaignCreativeAssociationsListResponse--;
 }
 
-buildUnnamed307() {
+buildUnnamed720() {
   var o = new core.List<api.Campaign>();
   o.add(buildCampaign());
   o.add(buildCampaign());
   return o;
 }
 
-checkUnnamed307(core.List<api.Campaign> o) {
+checkUnnamed720(core.List<api.Campaign> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCampaign(o[0]);
   checkCampaign(o[1]);
@@ -1068,7 +1103,7 @@
   var o = new api.CampaignsListResponse();
   buildCounterCampaignsListResponse++;
   if (buildCounterCampaignsListResponse < 3) {
-    o.campaigns = buildUnnamed307();
+    o.campaigns = buildUnnamed720();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1079,7 +1114,7 @@
 checkCampaignsListResponse(api.CampaignsListResponse o) {
   buildCounterCampaignsListResponse++;
   if (buildCounterCampaignsListResponse < 3) {
-    checkUnnamed307(o.campaigns);
+    checkUnnamed720(o.campaigns);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1131,14 +1166,14 @@
   buildCounterChangeLog--;
 }
 
-buildUnnamed308() {
+buildUnnamed721() {
   var o = new core.List<api.ChangeLog>();
   o.add(buildChangeLog());
   o.add(buildChangeLog());
   return o;
 }
 
-checkUnnamed308(core.List<api.ChangeLog> o) {
+checkUnnamed721(core.List<api.ChangeLog> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChangeLog(o[0]);
   checkChangeLog(o[1]);
@@ -1149,7 +1184,7 @@
   var o = new api.ChangeLogsListResponse();
   buildCounterChangeLogsListResponse++;
   if (buildCounterChangeLogsListResponse < 3) {
-    o.changeLogs = buildUnnamed308();
+    o.changeLogs = buildUnnamed721();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1160,21 +1195,21 @@
 checkChangeLogsListResponse(api.ChangeLogsListResponse o) {
   buildCounterChangeLogsListResponse++;
   if (buildCounterChangeLogsListResponse < 3) {
-    checkUnnamed308(o.changeLogs);
+    checkUnnamed721(o.changeLogs);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterChangeLogsListResponse--;
 }
 
-buildUnnamed309() {
+buildUnnamed722() {
   var o = new core.List<api.City>();
   o.add(buildCity());
   o.add(buildCity());
   return o;
 }
 
-checkUnnamed309(core.List<api.City> o) {
+checkUnnamed722(core.List<api.City> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCity(o[0]);
   checkCity(o[1]);
@@ -1185,7 +1220,7 @@
   var o = new api.CitiesListResponse();
   buildCounterCitiesListResponse++;
   if (buildCounterCitiesListResponse < 3) {
-    o.cities = buildUnnamed309();
+    o.cities = buildUnnamed722();
     o.kind = "foo";
   }
   buildCounterCitiesListResponse--;
@@ -1195,7 +1230,7 @@
 checkCitiesListResponse(api.CitiesListResponse o) {
   buildCounterCitiesListResponse++;
   if (buildCounterCitiesListResponse < 3) {
-    checkUnnamed309(o.cities);
+    checkUnnamed722(o.cities);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterCitiesListResponse--;
@@ -1376,14 +1411,14 @@
   buildCounterConnectionType--;
 }
 
-buildUnnamed310() {
+buildUnnamed723() {
   var o = new core.List<api.ConnectionType>();
   o.add(buildConnectionType());
   o.add(buildConnectionType());
   return o;
 }
 
-checkUnnamed310(core.List<api.ConnectionType> o) {
+checkUnnamed723(core.List<api.ConnectionType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConnectionType(o[0]);
   checkConnectionType(o[1]);
@@ -1394,7 +1429,7 @@
   var o = new api.ConnectionTypesListResponse();
   buildCounterConnectionTypesListResponse++;
   if (buildCounterConnectionTypesListResponse < 3) {
-    o.connectionTypes = buildUnnamed310();
+    o.connectionTypes = buildUnnamed723();
     o.kind = "foo";
   }
   buildCounterConnectionTypesListResponse--;
@@ -1404,20 +1439,20 @@
 checkConnectionTypesListResponse(api.ConnectionTypesListResponse o) {
   buildCounterConnectionTypesListResponse++;
   if (buildCounterConnectionTypesListResponse < 3) {
-    checkUnnamed310(o.connectionTypes);
+    checkUnnamed723(o.connectionTypes);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterConnectionTypesListResponse--;
 }
 
-buildUnnamed311() {
+buildUnnamed724() {
   var o = new core.List<api.ContentCategory>();
   o.add(buildContentCategory());
   o.add(buildContentCategory());
   return o;
 }
 
-checkUnnamed311(core.List<api.ContentCategory> o) {
+checkUnnamed724(core.List<api.ContentCategory> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContentCategory(o[0]);
   checkContentCategory(o[1]);
@@ -1428,7 +1463,7 @@
   var o = new api.ContentCategoriesListResponse();
   buildCounterContentCategoriesListResponse++;
   if (buildCounterContentCategoriesListResponse < 3) {
-    o.contentCategories = buildUnnamed311();
+    o.contentCategories = buildUnnamed724();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1439,7 +1474,7 @@
 checkContentCategoriesListResponse(api.ContentCategoriesListResponse o) {
   buildCounterContentCategoriesListResponse++;
   if (buildCounterContentCategoriesListResponse < 3) {
-    checkUnnamed311(o.contentCategories);
+    checkUnnamed724(o.contentCategories);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1473,14 +1508,14 @@
   buildCounterContentCategory--;
 }
 
-buildUnnamed312() {
+buildUnnamed725() {
   var o = new core.List<api.Country>();
   o.add(buildCountry());
   o.add(buildCountry());
   return o;
 }
 
-checkUnnamed312(core.List<api.Country> o) {
+checkUnnamed725(core.List<api.Country> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCountry(o[0]);
   checkCountry(o[1]);
@@ -1491,7 +1526,7 @@
   var o = new api.CountriesListResponse();
   buildCounterCountriesListResponse++;
   if (buildCounterCountriesListResponse < 3) {
-    o.countries = buildUnnamed312();
+    o.countries = buildUnnamed725();
     o.kind = "foo";
   }
   buildCounterCountriesListResponse--;
@@ -1501,7 +1536,7 @@
 checkCountriesListResponse(api.CountriesListResponse o) {
   buildCounterCountriesListResponse++;
   if (buildCounterCountriesListResponse < 3) {
-    checkUnnamed312(o.countries);
+    checkUnnamed725(o.countries);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterCountriesListResponse--;
@@ -1534,157 +1569,157 @@
   buildCounterCountry--;
 }
 
-buildUnnamed313() {
+buildUnnamed726() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed313(core.List<core.String> o) {
+checkUnnamed726(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed314() {
+buildUnnamed727() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed314(core.List<core.String> o) {
+checkUnnamed727(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed315() {
+buildUnnamed728() {
   var o = new core.List<api.ClickTag>();
   o.add(buildClickTag());
   o.add(buildClickTag());
   return o;
 }
 
-checkUnnamed315(core.List<api.ClickTag> o) {
+checkUnnamed728(core.List<api.ClickTag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkClickTag(o[0]);
   checkClickTag(o[1]);
 }
 
-buildUnnamed316() {
+buildUnnamed729() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed316(core.List<core.String> o) {
+checkUnnamed729(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed317() {
+buildUnnamed730() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed317(core.List<core.String> o) {
+checkUnnamed730(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed318() {
+buildUnnamed731() {
   var o = new core.List<api.CreativeCustomEvent>();
   o.add(buildCreativeCustomEvent());
   o.add(buildCreativeCustomEvent());
   return o;
 }
 
-checkUnnamed318(core.List<api.CreativeCustomEvent> o) {
+checkUnnamed731(core.List<api.CreativeCustomEvent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeCustomEvent(o[0]);
   checkCreativeCustomEvent(o[1]);
 }
 
-buildUnnamed319() {
+buildUnnamed732() {
   var o = new core.List<api.CreativeAsset>();
   o.add(buildCreativeAsset());
   o.add(buildCreativeAsset());
   return o;
 }
 
-checkUnnamed319(core.List<api.CreativeAsset> o) {
+checkUnnamed732(core.List<api.CreativeAsset> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeAsset(o[0]);
   checkCreativeAsset(o[1]);
 }
 
-buildUnnamed320() {
+buildUnnamed733() {
   var o = new core.List<api.CreativeFieldAssignment>();
   o.add(buildCreativeFieldAssignment());
   o.add(buildCreativeFieldAssignment());
   return o;
 }
 
-checkUnnamed320(core.List<api.CreativeFieldAssignment> o) {
+checkUnnamed733(core.List<api.CreativeFieldAssignment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeFieldAssignment(o[0]);
   checkCreativeFieldAssignment(o[1]);
 }
 
-buildUnnamed321() {
+buildUnnamed734() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed321(core.List<core.String> o) {
+checkUnnamed734(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed322() {
+buildUnnamed735() {
   var o = new core.List<api.CreativeCustomEvent>();
   o.add(buildCreativeCustomEvent());
   o.add(buildCreativeCustomEvent());
   return o;
 }
 
-checkUnnamed322(core.List<api.CreativeCustomEvent> o) {
+checkUnnamed735(core.List<api.CreativeCustomEvent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeCustomEvent(o[0]);
   checkCreativeCustomEvent(o[1]);
 }
 
-buildUnnamed323() {
+buildUnnamed736() {
   var o = new core.List<api.ThirdPartyTrackingUrl>();
   o.add(buildThirdPartyTrackingUrl());
   o.add(buildThirdPartyTrackingUrl());
   return o;
 }
 
-checkUnnamed323(core.List<api.ThirdPartyTrackingUrl> o) {
+checkUnnamed736(core.List<api.ThirdPartyTrackingUrl> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkThirdPartyTrackingUrl(o[0]);
   checkThirdPartyTrackingUrl(o[1]);
 }
 
-buildUnnamed324() {
+buildUnnamed737() {
   var o = new core.List<api.CreativeCustomEvent>();
   o.add(buildCreativeCustomEvent());
   o.add(buildCreativeCustomEvent());
   return o;
 }
 
-checkUnnamed324(core.List<api.CreativeCustomEvent> o) {
+checkUnnamed737(core.List<api.CreativeCustomEvent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeCustomEvent(o[0]);
   checkCreativeCustomEvent(o[1]);
@@ -1698,7 +1733,7 @@
     o.accountId = "foo";
     o.active = true;
     o.adParameters = "foo";
-    o.adTagKeys = buildUnnamed313();
+    o.adTagKeys = buildUnnamed726();
     o.advertiserId = "foo";
     o.allowScriptAccess = true;
     o.archived = true;
@@ -1707,18 +1742,18 @@
     o.autoAdvanceImages = true;
     o.backgroundColor = "foo";
     o.backupImageClickThroughUrl = "foo";
-    o.backupImageFeatures = buildUnnamed314();
+    o.backupImageFeatures = buildUnnamed727();
     o.backupImageReportingLabel = "foo";
     o.backupImageTargetWindow = buildTargetWindow();
-    o.clickTags = buildUnnamed315();
+    o.clickTags = buildUnnamed728();
     o.commercialId = "foo";
-    o.companionCreatives = buildUnnamed316();
-    o.compatibility = buildUnnamed317();
-    o.counterCustomEvents = buildUnnamed318();
-    o.creativeAssets = buildUnnamed319();
-    o.creativeFieldAssignments = buildUnnamed320();
-    o.customKeyValues = buildUnnamed321();
-    o.exitCustomEvents = buildUnnamed322();
+    o.companionCreatives = buildUnnamed729();
+    o.compatibility = buildUnnamed730();
+    o.counterCustomEvents = buildUnnamed731();
+    o.creativeAssets = buildUnnamed732();
+    o.creativeFieldAssignments = buildUnnamed733();
+    o.customKeyValues = buildUnnamed734();
+    o.exitCustomEvents = buildUnnamed735();
     o.fsCommand = buildFsCommand();
     o.htmlCode = "foo";
     o.htmlCodeLocked = true;
@@ -1743,8 +1778,8 @@
     o.subaccountId = "foo";
     o.thirdPartyBackupImageImpressionsUrl = "foo";
     o.thirdPartyRichMediaImpressionsUrl = "foo";
-    o.thirdPartyUrls = buildUnnamed323();
-    o.timerCustomEvents = buildUnnamed324();
+    o.thirdPartyUrls = buildUnnamed736();
+    o.timerCustomEvents = buildUnnamed737();
     o.totalFileSize = "foo";
     o.type = "foo";
     o.version = 42;
@@ -1761,7 +1796,7 @@
     unittest.expect(o.accountId, unittest.equals('foo'));
     unittest.expect(o.active, unittest.isTrue);
     unittest.expect(o.adParameters, unittest.equals('foo'));
-    checkUnnamed313(o.adTagKeys);
+    checkUnnamed726(o.adTagKeys);
     unittest.expect(o.advertiserId, unittest.equals('foo'));
     unittest.expect(o.allowScriptAccess, unittest.isTrue);
     unittest.expect(o.archived, unittest.isTrue);
@@ -1770,18 +1805,18 @@
     unittest.expect(o.autoAdvanceImages, unittest.isTrue);
     unittest.expect(o.backgroundColor, unittest.equals('foo'));
     unittest.expect(o.backupImageClickThroughUrl, unittest.equals('foo'));
-    checkUnnamed314(o.backupImageFeatures);
+    checkUnnamed727(o.backupImageFeatures);
     unittest.expect(o.backupImageReportingLabel, unittest.equals('foo'));
     checkTargetWindow(o.backupImageTargetWindow);
-    checkUnnamed315(o.clickTags);
+    checkUnnamed728(o.clickTags);
     unittest.expect(o.commercialId, unittest.equals('foo'));
-    checkUnnamed316(o.companionCreatives);
-    checkUnnamed317(o.compatibility);
-    checkUnnamed318(o.counterCustomEvents);
-    checkUnnamed319(o.creativeAssets);
-    checkUnnamed320(o.creativeFieldAssignments);
-    checkUnnamed321(o.customKeyValues);
-    checkUnnamed322(o.exitCustomEvents);
+    checkUnnamed729(o.companionCreatives);
+    checkUnnamed730(o.compatibility);
+    checkUnnamed731(o.counterCustomEvents);
+    checkUnnamed732(o.creativeAssets);
+    checkUnnamed733(o.creativeFieldAssignments);
+    checkUnnamed734(o.customKeyValues);
+    checkUnnamed735(o.exitCustomEvents);
     checkFsCommand(o.fsCommand);
     unittest.expect(o.htmlCode, unittest.equals('foo'));
     unittest.expect(o.htmlCodeLocked, unittest.isTrue);
@@ -1806,8 +1841,8 @@
     unittest.expect(o.subaccountId, unittest.equals('foo'));
     unittest.expect(o.thirdPartyBackupImageImpressionsUrl, unittest.equals('foo'));
     unittest.expect(o.thirdPartyRichMediaImpressionsUrl, unittest.equals('foo'));
-    checkUnnamed323(o.thirdPartyUrls);
-    checkUnnamed324(o.timerCustomEvents);
+    checkUnnamed736(o.thirdPartyUrls);
+    checkUnnamed737(o.timerCustomEvents);
     unittest.expect(o.totalFileSize, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(o.version, unittest.equals(42));
@@ -1817,14 +1852,14 @@
   buildCounterCreative--;
 }
 
-buildUnnamed325() {
+buildUnnamed738() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed325(core.List<core.String> o) {
+checkUnnamed738(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1845,7 +1880,7 @@
     o.childAssetType = "foo";
     o.collapsedSize = buildSize();
     o.customStartTimeValue = 42;
-    o.detectedFeatures = buildUnnamed325();
+    o.detectedFeatures = buildUnnamed738();
     o.displayType = "foo";
     o.duration = 42;
     o.durationType = "foo";
@@ -1895,7 +1930,7 @@
     unittest.expect(o.childAssetType, unittest.equals('foo'));
     checkSize(o.collapsedSize);
     unittest.expect(o.customStartTimeValue, unittest.equals(42));
-    checkUnnamed325(o.detectedFeatures);
+    checkUnnamed738(o.detectedFeatures);
     unittest.expect(o.displayType, unittest.equals('foo'));
     unittest.expect(o.duration, unittest.equals(42));
     unittest.expect(o.durationType, unittest.equals('foo'));
@@ -1952,40 +1987,40 @@
   buildCounterCreativeAssetId--;
 }
 
-buildUnnamed326() {
+buildUnnamed739() {
   var o = new core.List<api.ClickTag>();
   o.add(buildClickTag());
   o.add(buildClickTag());
   return o;
 }
 
-checkUnnamed326(core.List<api.ClickTag> o) {
+checkUnnamed739(core.List<api.ClickTag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkClickTag(o[0]);
   checkClickTag(o[1]);
 }
 
-buildUnnamed327() {
+buildUnnamed740() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed327(core.List<core.String> o) {
+checkUnnamed740(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed328() {
+buildUnnamed741() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed328(core.List<core.String> o) {
+checkUnnamed741(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1997,10 +2032,10 @@
   buildCounterCreativeAssetMetadata++;
   if (buildCounterCreativeAssetMetadata < 3) {
     o.assetIdentifier = buildCreativeAssetId();
-    o.clickTags = buildUnnamed326();
-    o.detectedFeatures = buildUnnamed327();
+    o.clickTags = buildUnnamed739();
+    o.detectedFeatures = buildUnnamed740();
     o.kind = "foo";
-    o.warnedValidationRules = buildUnnamed328();
+    o.warnedValidationRules = buildUnnamed741();
   }
   buildCounterCreativeAssetMetadata--;
   return o;
@@ -2010,48 +2045,48 @@
   buildCounterCreativeAssetMetadata++;
   if (buildCounterCreativeAssetMetadata < 3) {
     checkCreativeAssetId(o.assetIdentifier);
-    checkUnnamed326(o.clickTags);
-    checkUnnamed327(o.detectedFeatures);
+    checkUnnamed739(o.clickTags);
+    checkUnnamed740(o.detectedFeatures);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed328(o.warnedValidationRules);
+    checkUnnamed741(o.warnedValidationRules);
   }
   buildCounterCreativeAssetMetadata--;
 }
 
-buildUnnamed329() {
+buildUnnamed742() {
   var o = new core.List<api.CompanionClickThroughOverride>();
   o.add(buildCompanionClickThroughOverride());
   o.add(buildCompanionClickThroughOverride());
   return o;
 }
 
-checkUnnamed329(core.List<api.CompanionClickThroughOverride> o) {
+checkUnnamed742(core.List<api.CompanionClickThroughOverride> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCompanionClickThroughOverride(o[0]);
   checkCompanionClickThroughOverride(o[1]);
 }
 
-buildUnnamed330() {
+buildUnnamed743() {
   var o = new core.List<api.CreativeGroupAssignment>();
   o.add(buildCreativeGroupAssignment());
   o.add(buildCreativeGroupAssignment());
   return o;
 }
 
-checkUnnamed330(core.List<api.CreativeGroupAssignment> o) {
+checkUnnamed743(core.List<api.CreativeGroupAssignment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeGroupAssignment(o[0]);
   checkCreativeGroupAssignment(o[1]);
 }
 
-buildUnnamed331() {
+buildUnnamed744() {
   var o = new core.List<api.RichMediaExitOverride>();
   o.add(buildRichMediaExitOverride());
   o.add(buildRichMediaExitOverride());
   return o;
 }
 
-checkUnnamed331(core.List<api.RichMediaExitOverride> o) {
+checkUnnamed744(core.List<api.RichMediaExitOverride> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRichMediaExitOverride(o[0]);
   checkRichMediaExitOverride(o[1]);
@@ -2065,12 +2100,12 @@
     o.active = true;
     o.applyEventTags = true;
     o.clickThroughUrl = buildClickThroughUrl();
-    o.companionCreativeOverrides = buildUnnamed329();
-    o.creativeGroupAssignments = buildUnnamed330();
+    o.companionCreativeOverrides = buildUnnamed742();
+    o.creativeGroupAssignments = buildUnnamed743();
     o.creativeId = "foo";
     o.creativeIdDimensionValue = buildDimensionValue();
     o.endTime = core.DateTime.parse("2002-02-27T14:01:02");
-    o.richMediaExitOverrides = buildUnnamed331();
+    o.richMediaExitOverrides = buildUnnamed744();
     o.sequence = 42;
     o.sslCompliant = true;
     o.startTime = core.DateTime.parse("2002-02-27T14:01:02");
@@ -2086,12 +2121,12 @@
     unittest.expect(o.active, unittest.isTrue);
     unittest.expect(o.applyEventTags, unittest.isTrue);
     checkClickThroughUrl(o.clickThroughUrl);
-    checkUnnamed329(o.companionCreativeOverrides);
-    checkUnnamed330(o.creativeGroupAssignments);
+    checkUnnamed742(o.companionCreativeOverrides);
+    checkUnnamed743(o.creativeGroupAssignments);
     unittest.expect(o.creativeId, unittest.equals('foo'));
     checkDimensionValue(o.creativeIdDimensionValue);
     unittest.expect(o.endTime, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
-    checkUnnamed331(o.richMediaExitOverrides);
+    checkUnnamed744(o.richMediaExitOverrides);
     unittest.expect(o.sequence, unittest.equals(42));
     unittest.expect(o.sslCompliant, unittest.isTrue);
     unittest.expect(o.startTime, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
@@ -2212,14 +2247,14 @@
   buildCounterCreativeFieldValue--;
 }
 
-buildUnnamed332() {
+buildUnnamed745() {
   var o = new core.List<api.CreativeFieldValue>();
   o.add(buildCreativeFieldValue());
   o.add(buildCreativeFieldValue());
   return o;
 }
 
-checkUnnamed332(core.List<api.CreativeFieldValue> o) {
+checkUnnamed745(core.List<api.CreativeFieldValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeFieldValue(o[0]);
   checkCreativeFieldValue(o[1]);
@@ -2230,7 +2265,7 @@
   var o = new api.CreativeFieldValuesListResponse();
   buildCounterCreativeFieldValuesListResponse++;
   if (buildCounterCreativeFieldValuesListResponse < 3) {
-    o.creativeFieldValues = buildUnnamed332();
+    o.creativeFieldValues = buildUnnamed745();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -2241,21 +2276,21 @@
 checkCreativeFieldValuesListResponse(api.CreativeFieldValuesListResponse o) {
   buildCounterCreativeFieldValuesListResponse++;
   if (buildCounterCreativeFieldValuesListResponse < 3) {
-    checkUnnamed332(o.creativeFieldValues);
+    checkUnnamed745(o.creativeFieldValues);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterCreativeFieldValuesListResponse--;
 }
 
-buildUnnamed333() {
+buildUnnamed746() {
   var o = new core.List<api.CreativeField>();
   o.add(buildCreativeField());
   o.add(buildCreativeField());
   return o;
 }
 
-checkUnnamed333(core.List<api.CreativeField> o) {
+checkUnnamed746(core.List<api.CreativeField> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeField(o[0]);
   checkCreativeField(o[1]);
@@ -2266,7 +2301,7 @@
   var o = new api.CreativeFieldsListResponse();
   buildCounterCreativeFieldsListResponse++;
   if (buildCounterCreativeFieldsListResponse < 3) {
-    o.creativeFields = buildUnnamed333();
+    o.creativeFields = buildUnnamed746();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -2277,7 +2312,7 @@
 checkCreativeFieldsListResponse(api.CreativeFieldsListResponse o) {
   buildCounterCreativeFieldsListResponse++;
   if (buildCounterCreativeFieldsListResponse < 3) {
-    checkUnnamed333(o.creativeFields);
+    checkUnnamed746(o.creativeFields);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -2338,14 +2373,14 @@
   buildCounterCreativeGroupAssignment--;
 }
 
-buildUnnamed334() {
+buildUnnamed747() {
   var o = new core.List<api.CreativeGroup>();
   o.add(buildCreativeGroup());
   o.add(buildCreativeGroup());
   return o;
 }
 
-checkUnnamed334(core.List<api.CreativeGroup> o) {
+checkUnnamed747(core.List<api.CreativeGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeGroup(o[0]);
   checkCreativeGroup(o[1]);
@@ -2356,7 +2391,7 @@
   var o = new api.CreativeGroupsListResponse();
   buildCounterCreativeGroupsListResponse++;
   if (buildCounterCreativeGroupsListResponse < 3) {
-    o.creativeGroups = buildUnnamed334();
+    o.creativeGroups = buildUnnamed747();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -2367,21 +2402,21 @@
 checkCreativeGroupsListResponse(api.CreativeGroupsListResponse o) {
   buildCounterCreativeGroupsListResponse++;
   if (buildCounterCreativeGroupsListResponse < 3) {
-    checkUnnamed334(o.creativeGroups);
+    checkUnnamed747(o.creativeGroups);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterCreativeGroupsListResponse--;
 }
 
-buildUnnamed335() {
+buildUnnamed748() {
   var o = new core.List<api.OptimizationActivity>();
   o.add(buildOptimizationActivity());
   o.add(buildOptimizationActivity());
   return o;
 }
 
-checkUnnamed335(core.List<api.OptimizationActivity> o) {
+checkUnnamed748(core.List<api.OptimizationActivity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOptimizationActivity(o[0]);
   checkOptimizationActivity(o[1]);
@@ -2394,7 +2429,7 @@
   if (buildCounterCreativeOptimizationConfiguration < 3) {
     o.id = "foo";
     o.name = "foo";
-    o.optimizationActivitys = buildUnnamed335();
+    o.optimizationActivitys = buildUnnamed748();
     o.optimizationModel = "foo";
   }
   buildCounterCreativeOptimizationConfiguration--;
@@ -2406,20 +2441,20 @@
   if (buildCounterCreativeOptimizationConfiguration < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed335(o.optimizationActivitys);
+    checkUnnamed748(o.optimizationActivitys);
     unittest.expect(o.optimizationModel, unittest.equals('foo'));
   }
   buildCounterCreativeOptimizationConfiguration--;
 }
 
-buildUnnamed336() {
+buildUnnamed749() {
   var o = new core.List<api.CreativeAssignment>();
   o.add(buildCreativeAssignment());
   o.add(buildCreativeAssignment());
   return o;
 }
 
-checkUnnamed336(core.List<api.CreativeAssignment> o) {
+checkUnnamed749(core.List<api.CreativeAssignment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeAssignment(o[0]);
   checkCreativeAssignment(o[1]);
@@ -2430,7 +2465,7 @@
   var o = new api.CreativeRotation();
   buildCounterCreativeRotation++;
   if (buildCounterCreativeRotation < 3) {
-    o.creativeAssignments = buildUnnamed336();
+    o.creativeAssignments = buildUnnamed749();
     o.creativeOptimizationConfigurationId = "foo";
     o.type = "foo";
     o.weightCalculationStrategy = "foo";
@@ -2442,7 +2477,7 @@
 checkCreativeRotation(api.CreativeRotation o) {
   buildCounterCreativeRotation++;
   if (buildCounterCreativeRotation < 3) {
-    checkUnnamed336(o.creativeAssignments);
+    checkUnnamed749(o.creativeAssignments);
     unittest.expect(o.creativeOptimizationConfigurationId, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(o.weightCalculationStrategy, unittest.equals('foo'));
@@ -2471,14 +2506,14 @@
   buildCounterCreativeSettings--;
 }
 
-buildUnnamed337() {
+buildUnnamed750() {
   var o = new core.List<api.Creative>();
   o.add(buildCreative());
   o.add(buildCreative());
   return o;
 }
 
-checkUnnamed337(core.List<api.Creative> o) {
+checkUnnamed750(core.List<api.Creative> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreative(o[0]);
   checkCreative(o[1]);
@@ -2489,7 +2524,7 @@
   var o = new api.CreativesListResponse();
   buildCounterCreativesListResponse++;
   if (buildCounterCreativesListResponse < 3) {
-    o.creatives = buildUnnamed337();
+    o.creatives = buildUnnamed750();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -2500,60 +2535,60 @@
 checkCreativesListResponse(api.CreativesListResponse o) {
   buildCounterCreativesListResponse++;
   if (buildCounterCreativesListResponse < 3) {
-    checkUnnamed337(o.creatives);
+    checkUnnamed750(o.creatives);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterCreativesListResponse--;
 }
 
-buildUnnamed338() {
+buildUnnamed751() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed338(core.List<api.Dimension> o) {
+checkUnnamed751(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed339() {
+buildUnnamed752() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed339(core.List<api.Dimension> o) {
+checkUnnamed752(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed340() {
+buildUnnamed753() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed340(core.List<api.Metric> o) {
+checkUnnamed753(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
 }
 
-buildUnnamed341() {
+buildUnnamed754() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed341(core.List<api.Metric> o) {
+checkUnnamed754(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
@@ -2564,11 +2599,11 @@
   var o = new api.CrossDimensionReachReportCompatibleFields();
   buildCounterCrossDimensionReachReportCompatibleFields++;
   if (buildCounterCrossDimensionReachReportCompatibleFields < 3) {
-    o.breakdown = buildUnnamed338();
-    o.dimensionFilters = buildUnnamed339();
+    o.breakdown = buildUnnamed751();
+    o.dimensionFilters = buildUnnamed752();
     o.kind = "foo";
-    o.metrics = buildUnnamed340();
-    o.overlapMetrics = buildUnnamed341();
+    o.metrics = buildUnnamed753();
+    o.overlapMetrics = buildUnnamed754();
   }
   buildCounterCrossDimensionReachReportCompatibleFields--;
   return o;
@@ -2577,23 +2612,23 @@
 checkCrossDimensionReachReportCompatibleFields(api.CrossDimensionReachReportCompatibleFields o) {
   buildCounterCrossDimensionReachReportCompatibleFields++;
   if (buildCounterCrossDimensionReachReportCompatibleFields < 3) {
-    checkUnnamed338(o.breakdown);
-    checkUnnamed339(o.dimensionFilters);
+    checkUnnamed751(o.breakdown);
+    checkUnnamed752(o.dimensionFilters);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed340(o.metrics);
-    checkUnnamed341(o.overlapMetrics);
+    checkUnnamed753(o.metrics);
+    checkUnnamed754(o.overlapMetrics);
   }
   buildCounterCrossDimensionReachReportCompatibleFields--;
 }
 
-buildUnnamed342() {
+buildUnnamed755() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed342(core.List<api.DimensionValue> o) {
+checkUnnamed755(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
@@ -2604,7 +2639,7 @@
   var o = new api.CustomRichMediaEvents();
   buildCounterCustomRichMediaEvents++;
   if (buildCounterCustomRichMediaEvents < 3) {
-    o.filteredEventIds = buildUnnamed342();
+    o.filteredEventIds = buildUnnamed755();
     o.kind = "foo";
   }
   buildCounterCustomRichMediaEvents--;
@@ -2614,7 +2649,7 @@
 checkCustomRichMediaEvents(api.CustomRichMediaEvents o) {
   buildCounterCustomRichMediaEvents++;
   if (buildCounterCustomRichMediaEvents < 3) {
-    checkUnnamed342(o.filteredEventIds);
+    checkUnnamed755(o.filteredEventIds);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterCustomRichMediaEvents--;
@@ -2645,27 +2680,27 @@
   buildCounterDateRange--;
 }
 
-buildUnnamed343() {
+buildUnnamed756() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed343(core.List<core.String> o) {
+checkUnnamed756(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed344() {
+buildUnnamed757() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed344(core.List<core.int> o) {
+checkUnnamed757(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
@@ -2676,8 +2711,8 @@
   var o = new api.DayPartTargeting();
   buildCounterDayPartTargeting++;
   if (buildCounterDayPartTargeting < 3) {
-    o.daysOfWeek = buildUnnamed343();
-    o.hoursOfDay = buildUnnamed344();
+    o.daysOfWeek = buildUnnamed756();
+    o.hoursOfDay = buildUnnamed757();
     o.userLocalTime = true;
   }
   buildCounterDayPartTargeting--;
@@ -2687,8 +2722,8 @@
 checkDayPartTargeting(api.DayPartTargeting o) {
   buildCounterDayPartTargeting++;
   if (buildCounterDayPartTargeting < 3) {
-    checkUnnamed343(o.daysOfWeek);
-    checkUnnamed344(o.hoursOfDay);
+    checkUnnamed756(o.daysOfWeek);
+    checkUnnamed757(o.hoursOfDay);
     unittest.expect(o.userLocalTime, unittest.isTrue);
   }
   buildCounterDayPartTargeting--;
@@ -2840,14 +2875,14 @@
   buildCounterDimensionValue--;
 }
 
-buildUnnamed345() {
+buildUnnamed758() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed345(core.List<api.DimensionValue> o) {
+checkUnnamed758(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
@@ -2859,7 +2894,7 @@
   buildCounterDimensionValueList++;
   if (buildCounterDimensionValueList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed345();
+    o.items = buildUnnamed758();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -2871,21 +2906,21 @@
   buildCounterDimensionValueList++;
   if (buildCounterDimensionValueList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed345(o.items);
+    checkUnnamed758(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterDimensionValueList--;
 }
 
-buildUnnamed346() {
+buildUnnamed759() {
   var o = new core.List<api.DimensionFilter>();
   o.add(buildDimensionFilter());
   o.add(buildDimensionFilter());
   return o;
 }
 
-checkUnnamed346(core.List<api.DimensionFilter> o) {
+checkUnnamed759(core.List<api.DimensionFilter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionFilter(o[0]);
   checkDimensionFilter(o[1]);
@@ -2898,7 +2933,7 @@
   if (buildCounterDimensionValueRequest < 3) {
     o.dimensionName = "foo";
     o.endDate = core.DateTime.parse("2002-02-27T14:01:02Z");
-    o.filters = buildUnnamed346();
+    o.filters = buildUnnamed759();
     o.kind = "foo";
     o.startDate = core.DateTime.parse("2002-02-27T14:01:02Z");
   }
@@ -2911,47 +2946,47 @@
   if (buildCounterDimensionValueRequest < 3) {
     unittest.expect(o.dimensionName, unittest.equals('foo'));
     unittest.expect(o.endDate, unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
-    checkUnnamed346(o.filters);
+    checkUnnamed759(o.filters);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.startDate, unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
   }
   buildCounterDimensionValueRequest--;
 }
 
-buildUnnamed347() {
+buildUnnamed760() {
   var o = new core.List<api.DirectorySiteContactAssignment>();
   o.add(buildDirectorySiteContactAssignment());
   o.add(buildDirectorySiteContactAssignment());
   return o;
 }
 
-checkUnnamed347(core.List<api.DirectorySiteContactAssignment> o) {
+checkUnnamed760(core.List<api.DirectorySiteContactAssignment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDirectorySiteContactAssignment(o[0]);
   checkDirectorySiteContactAssignment(o[1]);
 }
 
-buildUnnamed348() {
+buildUnnamed761() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed348(core.List<core.String> o) {
+checkUnnamed761(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed349() {
+buildUnnamed762() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed349(core.List<core.String> o) {
+checkUnnamed762(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2963,14 +2998,14 @@
   buildCounterDirectorySite++;
   if (buildCounterDirectorySite < 3) {
     o.active = true;
-    o.contactAssignments = buildUnnamed347();
+    o.contactAssignments = buildUnnamed760();
     o.countryId = "foo";
     o.currencyId = "foo";
     o.description = "foo";
     o.id = "foo";
     o.idDimensionValue = buildDimensionValue();
-    o.inpageTagFormats = buildUnnamed348();
-    o.interstitialTagFormats = buildUnnamed349();
+    o.inpageTagFormats = buildUnnamed761();
+    o.interstitialTagFormats = buildUnnamed762();
     o.kind = "foo";
     o.name = "foo";
     o.parentId = "foo";
@@ -2985,14 +3020,14 @@
   buildCounterDirectorySite++;
   if (buildCounterDirectorySite < 3) {
     unittest.expect(o.active, unittest.isTrue);
-    checkUnnamed347(o.contactAssignments);
+    checkUnnamed760(o.contactAssignments);
     unittest.expect(o.countryId, unittest.equals('foo'));
     unittest.expect(o.currencyId, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     checkDimensionValue(o.idDimensionValue);
-    checkUnnamed348(o.inpageTagFormats);
-    checkUnnamed349(o.interstitialTagFormats);
+    checkUnnamed761(o.inpageTagFormats);
+    checkUnnamed762(o.interstitialTagFormats);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.parentId, unittest.equals('foo'));
@@ -3054,14 +3089,14 @@
   buildCounterDirectorySiteContactAssignment--;
 }
 
-buildUnnamed350() {
+buildUnnamed763() {
   var o = new core.List<api.DirectorySiteContact>();
   o.add(buildDirectorySiteContact());
   o.add(buildDirectorySiteContact());
   return o;
 }
 
-checkUnnamed350(core.List<api.DirectorySiteContact> o) {
+checkUnnamed763(core.List<api.DirectorySiteContact> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDirectorySiteContact(o[0]);
   checkDirectorySiteContact(o[1]);
@@ -3072,7 +3107,7 @@
   var o = new api.DirectorySiteContactsListResponse();
   buildCounterDirectorySiteContactsListResponse++;
   if (buildCounterDirectorySiteContactsListResponse < 3) {
-    o.directorySiteContacts = buildUnnamed350();
+    o.directorySiteContacts = buildUnnamed763();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -3083,7 +3118,7 @@
 checkDirectorySiteContactsListResponse(api.DirectorySiteContactsListResponse o) {
   buildCounterDirectorySiteContactsListResponse++;
   if (buildCounterDirectorySiteContactsListResponse < 3) {
-    checkUnnamed350(o.directorySiteContacts);
+    checkUnnamed763(o.directorySiteContacts);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -3121,14 +3156,14 @@
   buildCounterDirectorySiteSettings--;
 }
 
-buildUnnamed351() {
+buildUnnamed764() {
   var o = new core.List<api.DirectorySite>();
   o.add(buildDirectorySite());
   o.add(buildDirectorySite());
   return o;
 }
 
-checkUnnamed351(core.List<api.DirectorySite> o) {
+checkUnnamed764(core.List<api.DirectorySite> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDirectorySite(o[0]);
   checkDirectorySite(o[1]);
@@ -3139,7 +3174,7 @@
   var o = new api.DirectorySitesListResponse();
   buildCounterDirectorySitesListResponse++;
   if (buildCounterDirectorySitesListResponse < 3) {
-    o.directorySites = buildUnnamed351();
+    o.directorySites = buildUnnamed764();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -3150,21 +3185,21 @@
 checkDirectorySitesListResponse(api.DirectorySitesListResponse o) {
   buildCounterDirectorySitesListResponse++;
   if (buildCounterDirectorySitesListResponse < 3) {
-    checkUnnamed351(o.directorySites);
+    checkUnnamed764(o.directorySites);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterDirectorySitesListResponse--;
 }
 
-buildUnnamed352() {
+buildUnnamed765() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed352(core.List<core.String> o) {
+checkUnnamed765(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3185,7 +3220,7 @@
     o.kind = "foo";
     o.name = "foo";
     o.siteFilterType = "foo";
-    o.siteIds = buildUnnamed352();
+    o.siteIds = buildUnnamed765();
     o.sslCompliant = true;
     o.status = "foo";
     o.subaccountId = "foo";
@@ -3210,7 +3245,7 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.siteFilterType, unittest.equals('foo'));
-    checkUnnamed352(o.siteIds);
+    checkUnnamed765(o.siteIds);
     unittest.expect(o.sslCompliant, unittest.isTrue);
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.subaccountId, unittest.equals('foo'));
@@ -3242,14 +3277,14 @@
   buildCounterEventTagOverride--;
 }
 
-buildUnnamed353() {
+buildUnnamed766() {
   var o = new core.List<api.EventTag>();
   o.add(buildEventTag());
   o.add(buildEventTag());
   return o;
 }
 
-checkUnnamed353(core.List<api.EventTag> o) {
+checkUnnamed766(core.List<api.EventTag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventTag(o[0]);
   checkEventTag(o[1]);
@@ -3260,7 +3295,7 @@
   var o = new api.EventTagsListResponse();
   buildCounterEventTagsListResponse++;
   if (buildCounterEventTagsListResponse < 3) {
-    o.eventTags = buildUnnamed353();
+    o.eventTags = buildUnnamed766();
     o.kind = "foo";
   }
   buildCounterEventTagsListResponse--;
@@ -3270,7 +3305,7 @@
 checkEventTagsListResponse(api.EventTagsListResponse o) {
   buildCounterEventTagsListResponse++;
   if (buildCounterEventTagsListResponse < 3) {
-    checkUnnamed353(o.eventTags);
+    checkUnnamed766(o.eventTags);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterEventTagsListResponse--;
@@ -3334,14 +3369,14 @@
   buildCounterFile--;
 }
 
-buildUnnamed354() {
+buildUnnamed767() {
   var o = new core.List<api.File>();
   o.add(buildFile());
   o.add(buildFile());
   return o;
 }
 
-checkUnnamed354(core.List<api.File> o) {
+checkUnnamed767(core.List<api.File> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFile(o[0]);
   checkFile(o[1]);
@@ -3353,7 +3388,7 @@
   buildCounterFileList++;
   if (buildCounterFileList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed354();
+    o.items = buildUnnamed767();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -3365,7 +3400,7 @@
   buildCounterFileList++;
   if (buildCounterFileList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed354(o.items);
+    checkUnnamed767(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -3393,14 +3428,14 @@
   buildCounterFloodlightActivitiesGenerateTagResponse--;
 }
 
-buildUnnamed355() {
+buildUnnamed768() {
   var o = new core.List<api.FloodlightActivity>();
   o.add(buildFloodlightActivity());
   o.add(buildFloodlightActivity());
   return o;
 }
 
-checkUnnamed355(core.List<api.FloodlightActivity> o) {
+checkUnnamed768(core.List<api.FloodlightActivity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFloodlightActivity(o[0]);
   checkFloodlightActivity(o[1]);
@@ -3411,7 +3446,7 @@
   var o = new api.FloodlightActivitiesListResponse();
   buildCounterFloodlightActivitiesListResponse++;
   if (buildCounterFloodlightActivitiesListResponse < 3) {
-    o.floodlightActivities = buildUnnamed355();
+    o.floodlightActivities = buildUnnamed768();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -3422,47 +3457,47 @@
 checkFloodlightActivitiesListResponse(api.FloodlightActivitiesListResponse o) {
   buildCounterFloodlightActivitiesListResponse++;
   if (buildCounterFloodlightActivitiesListResponse < 3) {
-    checkUnnamed355(o.floodlightActivities);
+    checkUnnamed768(o.floodlightActivities);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterFloodlightActivitiesListResponse--;
 }
 
-buildUnnamed356() {
+buildUnnamed769() {
   var o = new core.List<api.FloodlightActivityDynamicTag>();
   o.add(buildFloodlightActivityDynamicTag());
   o.add(buildFloodlightActivityDynamicTag());
   return o;
 }
 
-checkUnnamed356(core.List<api.FloodlightActivityDynamicTag> o) {
+checkUnnamed769(core.List<api.FloodlightActivityDynamicTag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFloodlightActivityDynamicTag(o[0]);
   checkFloodlightActivityDynamicTag(o[1]);
 }
 
-buildUnnamed357() {
+buildUnnamed770() {
   var o = new core.List<api.FloodlightActivityPublisherDynamicTag>();
   o.add(buildFloodlightActivityPublisherDynamicTag());
   o.add(buildFloodlightActivityPublisherDynamicTag());
   return o;
 }
 
-checkUnnamed357(core.List<api.FloodlightActivityPublisherDynamicTag> o) {
+checkUnnamed770(core.List<api.FloodlightActivityPublisherDynamicTag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFloodlightActivityPublisherDynamicTag(o[0]);
   checkFloodlightActivityPublisherDynamicTag(o[1]);
 }
 
-buildUnnamed358() {
+buildUnnamed771() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed358(core.List<core.String> o) {
+checkUnnamed771(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3478,7 +3513,7 @@
     o.advertiserIdDimensionValue = buildDimensionValue();
     o.cacheBustingType = "foo";
     o.countingMethod = "foo";
-    o.defaultTags = buildUnnamed356();
+    o.defaultTags = buildUnnamed769();
     o.expectedUrl = "foo";
     o.floodlightActivityGroupId = "foo";
     o.floodlightActivityGroupName = "foo";
@@ -3493,14 +3528,14 @@
     o.kind = "foo";
     o.name = "foo";
     o.notes = "foo";
-    o.publisherTags = buildUnnamed357();
+    o.publisherTags = buildUnnamed770();
     o.secure = true;
     o.sslCompliant = true;
     o.sslRequired = true;
     o.subaccountId = "foo";
     o.tagFormat = "foo";
     o.tagString = "foo";
-    o.userDefinedVariableTypes = buildUnnamed358();
+    o.userDefinedVariableTypes = buildUnnamed771();
   }
   buildCounterFloodlightActivity--;
   return o;
@@ -3514,7 +3549,7 @@
     checkDimensionValue(o.advertiserIdDimensionValue);
     unittest.expect(o.cacheBustingType, unittest.equals('foo'));
     unittest.expect(o.countingMethod, unittest.equals('foo'));
-    checkUnnamed356(o.defaultTags);
+    checkUnnamed769(o.defaultTags);
     unittest.expect(o.expectedUrl, unittest.equals('foo'));
     unittest.expect(o.floodlightActivityGroupId, unittest.equals('foo'));
     unittest.expect(o.floodlightActivityGroupName, unittest.equals('foo'));
@@ -3529,14 +3564,14 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.notes, unittest.equals('foo'));
-    checkUnnamed357(o.publisherTags);
+    checkUnnamed770(o.publisherTags);
     unittest.expect(o.secure, unittest.isTrue);
     unittest.expect(o.sslCompliant, unittest.isTrue);
     unittest.expect(o.sslRequired, unittest.isTrue);
     unittest.expect(o.subaccountId, unittest.equals('foo'));
     unittest.expect(o.tagFormat, unittest.equals('foo'));
     unittest.expect(o.tagString, unittest.equals('foo'));
-    checkUnnamed358(o.userDefinedVariableTypes);
+    checkUnnamed771(o.userDefinedVariableTypes);
   }
   buildCounterFloodlightActivity--;
 }
@@ -3605,14 +3640,14 @@
   buildCounterFloodlightActivityGroup--;
 }
 
-buildUnnamed359() {
+buildUnnamed772() {
   var o = new core.List<api.FloodlightActivityGroup>();
   o.add(buildFloodlightActivityGroup());
   o.add(buildFloodlightActivityGroup());
   return o;
 }
 
-checkUnnamed359(core.List<api.FloodlightActivityGroup> o) {
+checkUnnamed772(core.List<api.FloodlightActivityGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFloodlightActivityGroup(o[0]);
   checkFloodlightActivityGroup(o[1]);
@@ -3623,7 +3658,7 @@
   var o = new api.FloodlightActivityGroupsListResponse();
   buildCounterFloodlightActivityGroupsListResponse++;
   if (buildCounterFloodlightActivityGroupsListResponse < 3) {
-    o.floodlightActivityGroups = buildUnnamed359();
+    o.floodlightActivityGroups = buildUnnamed772();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -3634,7 +3669,7 @@
 checkFloodlightActivityGroupsListResponse(api.FloodlightActivityGroupsListResponse o) {
   buildCounterFloodlightActivityGroupsListResponse++;
   if (buildCounterFloodlightActivityGroupsListResponse < 3) {
-    checkUnnamed359(o.floodlightActivityGroups);
+    checkUnnamed772(o.floodlightActivityGroups);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -3670,27 +3705,27 @@
   buildCounterFloodlightActivityPublisherDynamicTag--;
 }
 
-buildUnnamed360() {
+buildUnnamed773() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed360(core.List<core.String> o) {
+checkUnnamed773(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed361() {
+buildUnnamed774() {
   var o = new core.List<api.UserDefinedVariableConfiguration>();
   o.add(buildUserDefinedVariableConfiguration());
   o.add(buildUserDefinedVariableConfiguration());
   return o;
 }
 
-checkUnnamed361(core.List<api.UserDefinedVariableConfiguration> o) {
+checkUnnamed774(core.List<api.UserDefinedVariableConfiguration> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserDefinedVariableConfiguration(o[0]);
   checkUserDefinedVariableConfiguration(o[1]);
@@ -3714,10 +3749,10 @@
     o.naturalSearchConversionAttributionOption = "foo";
     o.omnitureSettings = buildOmnitureSettings();
     o.sslRequired = true;
-    o.standardVariableTypes = buildUnnamed360();
+    o.standardVariableTypes = buildUnnamed773();
     o.subaccountId = "foo";
     o.tagSettings = buildTagSettings();
-    o.userDefinedVariableConfigurations = buildUnnamed361();
+    o.userDefinedVariableConfigurations = buildUnnamed774();
   }
   buildCounterFloodlightConfiguration--;
   return o;
@@ -3739,22 +3774,22 @@
     unittest.expect(o.naturalSearchConversionAttributionOption, unittest.equals('foo'));
     checkOmnitureSettings(o.omnitureSettings);
     unittest.expect(o.sslRequired, unittest.isTrue);
-    checkUnnamed360(o.standardVariableTypes);
+    checkUnnamed773(o.standardVariableTypes);
     unittest.expect(o.subaccountId, unittest.equals('foo'));
     checkTagSettings(o.tagSettings);
-    checkUnnamed361(o.userDefinedVariableConfigurations);
+    checkUnnamed774(o.userDefinedVariableConfigurations);
   }
   buildCounterFloodlightConfiguration--;
 }
 
-buildUnnamed362() {
+buildUnnamed775() {
   var o = new core.List<api.FloodlightConfiguration>();
   o.add(buildFloodlightConfiguration());
   o.add(buildFloodlightConfiguration());
   return o;
 }
 
-checkUnnamed362(core.List<api.FloodlightConfiguration> o) {
+checkUnnamed775(core.List<api.FloodlightConfiguration> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFloodlightConfiguration(o[0]);
   checkFloodlightConfiguration(o[1]);
@@ -3765,7 +3800,7 @@
   var o = new api.FloodlightConfigurationsListResponse();
   buildCounterFloodlightConfigurationsListResponse++;
   if (buildCounterFloodlightConfigurationsListResponse < 3) {
-    o.floodlightConfigurations = buildUnnamed362();
+    o.floodlightConfigurations = buildUnnamed775();
     o.kind = "foo";
   }
   buildCounterFloodlightConfigurationsListResponse--;
@@ -3775,46 +3810,46 @@
 checkFloodlightConfigurationsListResponse(api.FloodlightConfigurationsListResponse o) {
   buildCounterFloodlightConfigurationsListResponse++;
   if (buildCounterFloodlightConfigurationsListResponse < 3) {
-    checkUnnamed362(o.floodlightConfigurations);
+    checkUnnamed775(o.floodlightConfigurations);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterFloodlightConfigurationsListResponse--;
 }
 
-buildUnnamed363() {
+buildUnnamed776() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed363(core.List<api.Dimension> o) {
+checkUnnamed776(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed364() {
+buildUnnamed777() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed364(core.List<api.Dimension> o) {
+checkUnnamed777(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed365() {
+buildUnnamed778() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed365(core.List<api.Metric> o) {
+checkUnnamed778(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
@@ -3825,10 +3860,10 @@
   var o = new api.FloodlightReportCompatibleFields();
   buildCounterFloodlightReportCompatibleFields++;
   if (buildCounterFloodlightReportCompatibleFields < 3) {
-    o.dimensionFilters = buildUnnamed363();
-    o.dimensions = buildUnnamed364();
+    o.dimensionFilters = buildUnnamed776();
+    o.dimensions = buildUnnamed777();
     o.kind = "foo";
-    o.metrics = buildUnnamed365();
+    o.metrics = buildUnnamed778();
   }
   buildCounterFloodlightReportCompatibleFields--;
   return o;
@@ -3837,10 +3872,10 @@
 checkFloodlightReportCompatibleFields(api.FloodlightReportCompatibleFields o) {
   buildCounterFloodlightReportCompatibleFields++;
   if (buildCounterFloodlightReportCompatibleFields < 3) {
-    checkUnnamed363(o.dimensionFilters);
-    checkUnnamed364(o.dimensions);
+    checkUnnamed776(o.dimensionFilters);
+    checkUnnamed777(o.dimensions);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed365(o.metrics);
+    checkUnnamed778(o.metrics);
   }
   buildCounterFloodlightReportCompatibleFields--;
 }
@@ -3893,66 +3928,66 @@
   buildCounterFsCommand--;
 }
 
-buildUnnamed366() {
+buildUnnamed779() {
   var o = new core.List<api.City>();
   o.add(buildCity());
   o.add(buildCity());
   return o;
 }
 
-checkUnnamed366(core.List<api.City> o) {
+checkUnnamed779(core.List<api.City> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCity(o[0]);
   checkCity(o[1]);
 }
 
-buildUnnamed367() {
+buildUnnamed780() {
   var o = new core.List<api.Country>();
   o.add(buildCountry());
   o.add(buildCountry());
   return o;
 }
 
-checkUnnamed367(core.List<api.Country> o) {
+checkUnnamed780(core.List<api.Country> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCountry(o[0]);
   checkCountry(o[1]);
 }
 
-buildUnnamed368() {
+buildUnnamed781() {
   var o = new core.List<api.Metro>();
   o.add(buildMetro());
   o.add(buildMetro());
   return o;
 }
 
-checkUnnamed368(core.List<api.Metro> o) {
+checkUnnamed781(core.List<api.Metro> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetro(o[0]);
   checkMetro(o[1]);
 }
 
-buildUnnamed369() {
+buildUnnamed782() {
   var o = new core.List<api.PostalCode>();
   o.add(buildPostalCode());
   o.add(buildPostalCode());
   return o;
 }
 
-checkUnnamed369(core.List<api.PostalCode> o) {
+checkUnnamed782(core.List<api.PostalCode> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPostalCode(o[0]);
   checkPostalCode(o[1]);
 }
 
-buildUnnamed370() {
+buildUnnamed783() {
   var o = new core.List<api.Region>();
   o.add(buildRegion());
   o.add(buildRegion());
   return o;
 }
 
-checkUnnamed370(core.List<api.Region> o) {
+checkUnnamed783(core.List<api.Region> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRegion(o[0]);
   checkRegion(o[1]);
@@ -3963,12 +3998,12 @@
   var o = new api.GeoTargeting();
   buildCounterGeoTargeting++;
   if (buildCounterGeoTargeting < 3) {
-    o.cities = buildUnnamed366();
-    o.countries = buildUnnamed367();
+    o.cities = buildUnnamed779();
+    o.countries = buildUnnamed780();
     o.excludeCountries = true;
-    o.metros = buildUnnamed368();
-    o.postalCodes = buildUnnamed369();
-    o.regions = buildUnnamed370();
+    o.metros = buildUnnamed781();
+    o.postalCodes = buildUnnamed782();
+    o.regions = buildUnnamed783();
   }
   buildCounterGeoTargeting--;
   return o;
@@ -3977,12 +4012,12 @@
 checkGeoTargeting(api.GeoTargeting o) {
   buildCounterGeoTargeting++;
   if (buildCounterGeoTargeting < 3) {
-    checkUnnamed366(o.cities);
-    checkUnnamed367(o.countries);
+    checkUnnamed779(o.cities);
+    checkUnnamed780(o.countries);
     unittest.expect(o.excludeCountries, unittest.isTrue);
-    checkUnnamed368(o.metros);
-    checkUnnamed369(o.postalCodes);
-    checkUnnamed370(o.regions);
+    checkUnnamed781(o.metros);
+    checkUnnamed782(o.postalCodes);
+    checkUnnamed783(o.regions);
   }
   buildCounterGeoTargeting--;
 }
@@ -4033,14 +4068,14 @@
   buildCounterLandingPage--;
 }
 
-buildUnnamed371() {
+buildUnnamed784() {
   var o = new core.List<api.LandingPage>();
   o.add(buildLandingPage());
   o.add(buildLandingPage());
   return o;
 }
 
-checkUnnamed371(core.List<api.LandingPage> o) {
+checkUnnamed784(core.List<api.LandingPage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLandingPage(o[0]);
   checkLandingPage(o[1]);
@@ -4052,7 +4087,7 @@
   buildCounterLandingPagesListResponse++;
   if (buildCounterLandingPagesListResponse < 3) {
     o.kind = "foo";
-    o.landingPages = buildUnnamed371();
+    o.landingPages = buildUnnamed784();
   }
   buildCounterLandingPagesListResponse--;
   return o;
@@ -4062,7 +4097,7 @@
   buildCounterLandingPagesListResponse++;
   if (buildCounterLandingPagesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed371(o.landingPages);
+    checkUnnamed784(o.landingPages);
   }
   buildCounterLandingPagesListResponse--;
 }
@@ -4178,14 +4213,14 @@
   buildCounterMetro--;
 }
 
-buildUnnamed372() {
+buildUnnamed785() {
   var o = new core.List<api.Metro>();
   o.add(buildMetro());
   o.add(buildMetro());
   return o;
 }
 
-checkUnnamed372(core.List<api.Metro> o) {
+checkUnnamed785(core.List<api.Metro> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetro(o[0]);
   checkMetro(o[1]);
@@ -4197,7 +4232,7 @@
   buildCounterMetrosListResponse++;
   if (buildCounterMetrosListResponse < 3) {
     o.kind = "foo";
-    o.metros = buildUnnamed372();
+    o.metros = buildUnnamed785();
   }
   buildCounterMetrosListResponse--;
   return o;
@@ -4207,7 +4242,7 @@
   buildCounterMetrosListResponse++;
   if (buildCounterMetrosListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed372(o.metros);
+    checkUnnamed785(o.metros);
   }
   buildCounterMetrosListResponse--;
 }
@@ -4239,14 +4274,14 @@
   buildCounterMobileCarrier--;
 }
 
-buildUnnamed373() {
+buildUnnamed786() {
   var o = new core.List<api.MobileCarrier>();
   o.add(buildMobileCarrier());
   o.add(buildMobileCarrier());
   return o;
 }
 
-checkUnnamed373(core.List<api.MobileCarrier> o) {
+checkUnnamed786(core.List<api.MobileCarrier> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMobileCarrier(o[0]);
   checkMobileCarrier(o[1]);
@@ -4258,7 +4293,7 @@
   buildCounterMobileCarriersListResponse++;
   if (buildCounterMobileCarriersListResponse < 3) {
     o.kind = "foo";
-    o.mobileCarriers = buildUnnamed373();
+    o.mobileCarriers = buildUnnamed786();
   }
   buildCounterMobileCarriersListResponse--;
   return o;
@@ -4268,19 +4303,19 @@
   buildCounterMobileCarriersListResponse++;
   if (buildCounterMobileCarriersListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed373(o.mobileCarriers);
+    checkUnnamed786(o.mobileCarriers);
   }
   buildCounterMobileCarriersListResponse--;
 }
 
-buildUnnamed374() {
+buildUnnamed787() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed374(core.List<core.String> o) {
+checkUnnamed787(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -4292,7 +4327,7 @@
   buildCounterObjectFilter++;
   if (buildCounterObjectFilter < 3) {
     o.kind = "foo";
-    o.objectIds = buildUnnamed374();
+    o.objectIds = buildUnnamed787();
     o.status = "foo";
   }
   buildCounterObjectFilter--;
@@ -4303,7 +4338,7 @@
   buildCounterObjectFilter++;
   if (buildCounterObjectFilter < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed374(o.objectIds);
+    checkUnnamed787(o.objectIds);
     unittest.expect(o.status, unittest.equals('foo'));
   }
   buildCounterObjectFilter--;
@@ -4407,14 +4442,14 @@
   buildCounterOperatingSystemVersion--;
 }
 
-buildUnnamed375() {
+buildUnnamed788() {
   var o = new core.List<api.OperatingSystemVersion>();
   o.add(buildOperatingSystemVersion());
   o.add(buildOperatingSystemVersion());
   return o;
 }
 
-checkUnnamed375(core.List<api.OperatingSystemVersion> o) {
+checkUnnamed788(core.List<api.OperatingSystemVersion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperatingSystemVersion(o[0]);
   checkOperatingSystemVersion(o[1]);
@@ -4426,7 +4461,7 @@
   buildCounterOperatingSystemVersionsListResponse++;
   if (buildCounterOperatingSystemVersionsListResponse < 3) {
     o.kind = "foo";
-    o.operatingSystemVersions = buildUnnamed375();
+    o.operatingSystemVersions = buildUnnamed788();
   }
   buildCounterOperatingSystemVersionsListResponse--;
   return o;
@@ -4436,19 +4471,19 @@
   buildCounterOperatingSystemVersionsListResponse++;
   if (buildCounterOperatingSystemVersionsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed375(o.operatingSystemVersions);
+    checkUnnamed788(o.operatingSystemVersions);
   }
   buildCounterOperatingSystemVersionsListResponse--;
 }
 
-buildUnnamed376() {
+buildUnnamed789() {
   var o = new core.List<api.OperatingSystem>();
   o.add(buildOperatingSystem());
   o.add(buildOperatingSystem());
   return o;
 }
 
-checkUnnamed376(core.List<api.OperatingSystem> o) {
+checkUnnamed789(core.List<api.OperatingSystem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperatingSystem(o[0]);
   checkOperatingSystem(o[1]);
@@ -4460,7 +4495,7 @@
   buildCounterOperatingSystemsListResponse++;
   if (buildCounterOperatingSystemsListResponse < 3) {
     o.kind = "foo";
-    o.operatingSystems = buildUnnamed376();
+    o.operatingSystems = buildUnnamed789();
   }
   buildCounterOperatingSystemsListResponse--;
   return o;
@@ -4470,7 +4505,7 @@
   buildCounterOperatingSystemsListResponse++;
   if (buildCounterOperatingSystemsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed376(o.operatingSystems);
+    checkUnnamed789(o.operatingSystems);
   }
   buildCounterOperatingSystemsListResponse--;
 }
@@ -4498,53 +4533,53 @@
   buildCounterOptimizationActivity--;
 }
 
-buildUnnamed377() {
+buildUnnamed790() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed377(core.List<api.Dimension> o) {
+checkUnnamed790(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed378() {
+buildUnnamed791() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed378(core.List<api.Dimension> o) {
+checkUnnamed791(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed379() {
+buildUnnamed792() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed379(core.List<api.Metric> o) {
+checkUnnamed792(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
 }
 
-buildUnnamed380() {
+buildUnnamed793() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed380(core.List<api.Dimension> o) {
+checkUnnamed793(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
@@ -4555,11 +4590,11 @@
   var o = new api.PathToConversionReportCompatibleFields();
   buildCounterPathToConversionReportCompatibleFields++;
   if (buildCounterPathToConversionReportCompatibleFields < 3) {
-    o.conversionDimensions = buildUnnamed377();
-    o.customFloodlightVariables = buildUnnamed378();
+    o.conversionDimensions = buildUnnamed790();
+    o.customFloodlightVariables = buildUnnamed791();
     o.kind = "foo";
-    o.metrics = buildUnnamed379();
-    o.perInteractionDimensions = buildUnnamed380();
+    o.metrics = buildUnnamed792();
+    o.perInteractionDimensions = buildUnnamed793();
   }
   buildCounterPathToConversionReportCompatibleFields--;
   return o;
@@ -4568,23 +4603,23 @@
 checkPathToConversionReportCompatibleFields(api.PathToConversionReportCompatibleFields o) {
   buildCounterPathToConversionReportCompatibleFields++;
   if (buildCounterPathToConversionReportCompatibleFields < 3) {
-    checkUnnamed377(o.conversionDimensions);
-    checkUnnamed378(o.customFloodlightVariables);
+    checkUnnamed790(o.conversionDimensions);
+    checkUnnamed791(o.customFloodlightVariables);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed379(o.metrics);
-    checkUnnamed380(o.perInteractionDimensions);
+    checkUnnamed792(o.metrics);
+    checkUnnamed793(o.perInteractionDimensions);
   }
   buildCounterPathToConversionReportCompatibleFields--;
 }
 
-buildUnnamed381() {
+buildUnnamed794() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed381(core.List<core.String> o) {
+checkUnnamed794(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -4629,7 +4664,7 @@
     o.sslRequired = true;
     o.status = "foo";
     o.subaccountId = "foo";
-    o.tagFormats = buildUnnamed381();
+    o.tagFormats = buildUnnamed794();
     o.tagSetting = buildTagSetting();
   }
   buildCounterPlacement--;
@@ -4673,7 +4708,7 @@
     unittest.expect(o.sslRequired, unittest.isTrue);
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.subaccountId, unittest.equals('foo'));
-    checkUnnamed381(o.tagFormats);
+    checkUnnamed794(o.tagFormats);
     checkTagSetting(o.tagSetting);
   }
   buildCounterPlacement--;
@@ -4704,14 +4739,14 @@
   buildCounterPlacementAssignment--;
 }
 
-buildUnnamed382() {
+buildUnnamed795() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed382(core.List<core.String> o) {
+checkUnnamed795(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -4728,7 +4763,7 @@
     o.archived = true;
     o.campaignId = "foo";
     o.campaignIdDimensionValue = buildDimensionValue();
-    o.childPlacementIds = buildUnnamed382();
+    o.childPlacementIds = buildUnnamed795();
     o.comment = "foo";
     o.contentCategoryId = "foo";
     o.createInfo = buildLastModifiedInfo();
@@ -4763,7 +4798,7 @@
     unittest.expect(o.archived, unittest.isTrue);
     unittest.expect(o.campaignId, unittest.equals('foo'));
     checkDimensionValue(o.campaignIdDimensionValue);
-    checkUnnamed382(o.childPlacementIds);
+    checkUnnamed795(o.childPlacementIds);
     unittest.expect(o.comment, unittest.equals('foo'));
     unittest.expect(o.contentCategoryId, unittest.equals('foo'));
     checkLastModifiedInfo(o.createInfo);
@@ -4788,14 +4823,14 @@
   buildCounterPlacementGroup--;
 }
 
-buildUnnamed383() {
+buildUnnamed796() {
   var o = new core.List<api.PlacementGroup>();
   o.add(buildPlacementGroup());
   o.add(buildPlacementGroup());
   return o;
 }
 
-checkUnnamed383(core.List<api.PlacementGroup> o) {
+checkUnnamed796(core.List<api.PlacementGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlacementGroup(o[0]);
   checkPlacementGroup(o[1]);
@@ -4808,7 +4843,7 @@
   if (buildCounterPlacementGroupsListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.placementGroups = buildUnnamed383();
+    o.placementGroups = buildUnnamed796();
   }
   buildCounterPlacementGroupsListResponse--;
   return o;
@@ -4819,19 +4854,19 @@
   if (buildCounterPlacementGroupsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed383(o.placementGroups);
+    checkUnnamed796(o.placementGroups);
   }
   buildCounterPlacementGroupsListResponse--;
 }
 
-buildUnnamed384() {
+buildUnnamed797() {
   var o = new core.List<api.PlacementStrategy>();
   o.add(buildPlacementStrategy());
   o.add(buildPlacementStrategy());
   return o;
 }
 
-checkUnnamed384(core.List<api.PlacementStrategy> o) {
+checkUnnamed797(core.List<api.PlacementStrategy> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlacementStrategy(o[0]);
   checkPlacementStrategy(o[1]);
@@ -4844,7 +4879,7 @@
   if (buildCounterPlacementStrategiesListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.placementStrategies = buildUnnamed384();
+    o.placementStrategies = buildUnnamed797();
   }
   buildCounterPlacementStrategiesListResponse--;
   return o;
@@ -4855,7 +4890,7 @@
   if (buildCounterPlacementStrategiesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed384(o.placementStrategies);
+    checkUnnamed797(o.placementStrategies);
   }
   buildCounterPlacementStrategiesListResponse--;
 }
@@ -4885,14 +4920,14 @@
   buildCounterPlacementStrategy--;
 }
 
-buildUnnamed385() {
+buildUnnamed798() {
   var o = new core.List<api.TagData>();
   o.add(buildTagData());
   o.add(buildTagData());
   return o;
 }
 
-checkUnnamed385(core.List<api.TagData> o) {
+checkUnnamed798(core.List<api.TagData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTagData(o[0]);
   checkTagData(o[1]);
@@ -4904,7 +4939,7 @@
   buildCounterPlacementTag++;
   if (buildCounterPlacementTag < 3) {
     o.placementId = "foo";
-    o.tagDatas = buildUnnamed385();
+    o.tagDatas = buildUnnamed798();
   }
   buildCounterPlacementTag--;
   return o;
@@ -4914,19 +4949,19 @@
   buildCounterPlacementTag++;
   if (buildCounterPlacementTag < 3) {
     unittest.expect(o.placementId, unittest.equals('foo'));
-    checkUnnamed385(o.tagDatas);
+    checkUnnamed798(o.tagDatas);
   }
   buildCounterPlacementTag--;
 }
 
-buildUnnamed386() {
+buildUnnamed799() {
   var o = new core.List<api.PlacementTag>();
   o.add(buildPlacementTag());
   o.add(buildPlacementTag());
   return o;
 }
 
-checkUnnamed386(core.List<api.PlacementTag> o) {
+checkUnnamed799(core.List<api.PlacementTag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlacementTag(o[0]);
   checkPlacementTag(o[1]);
@@ -4938,7 +4973,7 @@
   buildCounterPlacementsGenerateTagsResponse++;
   if (buildCounterPlacementsGenerateTagsResponse < 3) {
     o.kind = "foo";
-    o.placementTags = buildUnnamed386();
+    o.placementTags = buildUnnamed799();
   }
   buildCounterPlacementsGenerateTagsResponse--;
   return o;
@@ -4948,19 +4983,19 @@
   buildCounterPlacementsGenerateTagsResponse++;
   if (buildCounterPlacementsGenerateTagsResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed386(o.placementTags);
+    checkUnnamed799(o.placementTags);
   }
   buildCounterPlacementsGenerateTagsResponse--;
 }
 
-buildUnnamed387() {
+buildUnnamed800() {
   var o = new core.List<api.Placement>();
   o.add(buildPlacement());
   o.add(buildPlacement());
   return o;
 }
 
-checkUnnamed387(core.List<api.Placement> o) {
+checkUnnamed800(core.List<api.Placement> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlacement(o[0]);
   checkPlacement(o[1]);
@@ -4973,7 +5008,7 @@
   if (buildCounterPlacementsListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.placements = buildUnnamed387();
+    o.placements = buildUnnamed800();
   }
   buildCounterPlacementsListResponse--;
   return o;
@@ -4984,7 +5019,7 @@
   if (buildCounterPlacementsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed387(o.placements);
+    checkUnnamed800(o.placements);
   }
   buildCounterPlacementsListResponse--;
 }
@@ -5012,14 +5047,14 @@
   buildCounterPlatformType--;
 }
 
-buildUnnamed388() {
+buildUnnamed801() {
   var o = new core.List<api.PlatformType>();
   o.add(buildPlatformType());
   o.add(buildPlatformType());
   return o;
 }
 
-checkUnnamed388(core.List<api.PlatformType> o) {
+checkUnnamed801(core.List<api.PlatformType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlatformType(o[0]);
   checkPlatformType(o[1]);
@@ -5031,7 +5066,7 @@
   buildCounterPlatformTypesListResponse++;
   if (buildCounterPlatformTypesListResponse < 3) {
     o.kind = "foo";
-    o.platformTypes = buildUnnamed388();
+    o.platformTypes = buildUnnamed801();
   }
   buildCounterPlatformTypesListResponse--;
   return o;
@@ -5041,7 +5076,7 @@
   buildCounterPlatformTypesListResponse++;
   if (buildCounterPlatformTypesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed388(o.platformTypes);
+    checkUnnamed801(o.platformTypes);
   }
   buildCounterPlatformTypesListResponse--;
 }
@@ -5106,14 +5141,14 @@
   buildCounterPostalCode--;
 }
 
-buildUnnamed389() {
+buildUnnamed802() {
   var o = new core.List<api.PostalCode>();
   o.add(buildPostalCode());
   o.add(buildPostalCode());
   return o;
 }
 
-checkUnnamed389(core.List<api.PostalCode> o) {
+checkUnnamed802(core.List<api.PostalCode> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPostalCode(o[0]);
   checkPostalCode(o[1]);
@@ -5125,7 +5160,7 @@
   buildCounterPostalCodesListResponse++;
   if (buildCounterPostalCodesListResponse < 3) {
     o.kind = "foo";
-    o.postalCodes = buildUnnamed389();
+    o.postalCodes = buildUnnamed802();
   }
   buildCounterPostalCodesListResponse--;
   return o;
@@ -5135,19 +5170,19 @@
   buildCounterPostalCodesListResponse++;
   if (buildCounterPostalCodesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed389(o.postalCodes);
+    checkUnnamed802(o.postalCodes);
   }
   buildCounterPostalCodesListResponse--;
 }
 
-buildUnnamed390() {
+buildUnnamed803() {
   var o = new core.List<api.PricingSchedulePricingPeriod>();
   o.add(buildPricingSchedulePricingPeriod());
   o.add(buildPricingSchedulePricingPeriod());
   return o;
 }
 
-checkUnnamed390(core.List<api.PricingSchedulePricingPeriod> o) {
+checkUnnamed803(core.List<api.PricingSchedulePricingPeriod> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPricingSchedulePricingPeriod(o[0]);
   checkPricingSchedulePricingPeriod(o[1]);
@@ -5163,7 +5198,7 @@
     o.endDate = core.DateTime.parse("2002-02-27T14:01:02Z");
     o.flighted = true;
     o.floodlightActivityId = "foo";
-    o.pricingPeriods = buildUnnamed390();
+    o.pricingPeriods = buildUnnamed803();
     o.pricingType = "foo";
     o.startDate = core.DateTime.parse("2002-02-27T14:01:02Z");
     o.testingStartDate = core.DateTime.parse("2002-02-27T14:01:02Z");
@@ -5180,7 +5215,7 @@
     unittest.expect(o.endDate, unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
     unittest.expect(o.flighted, unittest.isTrue);
     unittest.expect(o.floodlightActivityId, unittest.equals('foo'));
-    checkUnnamed390(o.pricingPeriods);
+    checkUnnamed803(o.pricingPeriods);
     unittest.expect(o.pricingType, unittest.equals('foo'));
     unittest.expect(o.startDate, unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
     unittest.expect(o.testingStartDate, unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
@@ -5215,27 +5250,27 @@
   buildCounterPricingSchedulePricingPeriod--;
 }
 
-buildUnnamed391() {
+buildUnnamed804() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed391(core.List<core.String> o) {
+checkUnnamed804(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed392() {
+buildUnnamed805() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed392(core.List<core.String> o) {
+checkUnnamed805(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -5246,12 +5281,12 @@
   var o = new api.ProgrammaticSetting();
   buildCounterProgrammaticSetting++;
   if (buildCounterProgrammaticSetting < 3) {
-    o.adxDealIds = buildUnnamed391();
+    o.adxDealIds = buildUnnamed804();
     o.insertionOrderId = "foo";
     o.insertionOrderIdStatus = true;
     o.mediaCostNanos = "foo";
     o.programmatic = true;
-    o.traffickerEmails = buildUnnamed392();
+    o.traffickerEmails = buildUnnamed805();
   }
   buildCounterProgrammaticSetting--;
   return o;
@@ -5260,76 +5295,76 @@
 checkProgrammaticSetting(api.ProgrammaticSetting o) {
   buildCounterProgrammaticSetting++;
   if (buildCounterProgrammaticSetting < 3) {
-    checkUnnamed391(o.adxDealIds);
+    checkUnnamed804(o.adxDealIds);
     unittest.expect(o.insertionOrderId, unittest.equals('foo'));
     unittest.expect(o.insertionOrderIdStatus, unittest.isTrue);
     unittest.expect(o.mediaCostNanos, unittest.equals('foo'));
     unittest.expect(o.programmatic, unittest.isTrue);
-    checkUnnamed392(o.traffickerEmails);
+    checkUnnamed805(o.traffickerEmails);
   }
   buildCounterProgrammaticSetting--;
 }
 
-buildUnnamed393() {
+buildUnnamed806() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed393(core.List<api.Dimension> o) {
+checkUnnamed806(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed394() {
+buildUnnamed807() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed394(core.List<api.Dimension> o) {
+checkUnnamed807(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed395() {
+buildUnnamed808() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed395(core.List<api.Metric> o) {
+checkUnnamed808(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
 }
 
-buildUnnamed396() {
+buildUnnamed809() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed396(core.List<api.Metric> o) {
+checkUnnamed809(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
 }
 
-buildUnnamed397() {
+buildUnnamed810() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed397(core.List<api.Metric> o) {
+checkUnnamed810(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
@@ -5340,12 +5375,12 @@
   var o = new api.ReachReportCompatibleFields();
   buildCounterReachReportCompatibleFields++;
   if (buildCounterReachReportCompatibleFields < 3) {
-    o.dimensionFilters = buildUnnamed393();
-    o.dimensions = buildUnnamed394();
+    o.dimensionFilters = buildUnnamed806();
+    o.dimensions = buildUnnamed807();
     o.kind = "foo";
-    o.metrics = buildUnnamed395();
-    o.pivotedActivityMetrics = buildUnnamed396();
-    o.reachByFrequencyMetrics = buildUnnamed397();
+    o.metrics = buildUnnamed808();
+    o.pivotedActivityMetrics = buildUnnamed809();
+    o.reachByFrequencyMetrics = buildUnnamed810();
   }
   buildCounterReachReportCompatibleFields--;
   return o;
@@ -5354,12 +5389,12 @@
 checkReachReportCompatibleFields(api.ReachReportCompatibleFields o) {
   buildCounterReachReportCompatibleFields++;
   if (buildCounterReachReportCompatibleFields < 3) {
-    checkUnnamed393(o.dimensionFilters);
-    checkUnnamed394(o.dimensions);
+    checkUnnamed806(o.dimensionFilters);
+    checkUnnamed807(o.dimensions);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed395(o.metrics);
-    checkUnnamed396(o.pivotedActivityMetrics);
-    checkUnnamed397(o.reachByFrequencyMetrics);
+    checkUnnamed808(o.metrics);
+    checkUnnamed809(o.pivotedActivityMetrics);
+    checkUnnamed810(o.reachByFrequencyMetrics);
   }
   buildCounterReachReportCompatibleFields--;
 }
@@ -5416,14 +5451,14 @@
   buildCounterRegion--;
 }
 
-buildUnnamed398() {
+buildUnnamed811() {
   var o = new core.List<api.Region>();
   o.add(buildRegion());
   o.add(buildRegion());
   return o;
 }
 
-checkUnnamed398(core.List<api.Region> o) {
+checkUnnamed811(core.List<api.Region> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRegion(o[0]);
   checkRegion(o[1]);
@@ -5435,7 +5470,7 @@
   buildCounterRegionsListResponse++;
   if (buildCounterRegionsListResponse < 3) {
     o.kind = "foo";
-    o.regions = buildUnnamed398();
+    o.regions = buildUnnamed811();
   }
   buildCounterRegionsListResponse--;
   return o;
@@ -5445,45 +5480,45 @@
   buildCounterRegionsListResponse++;
   if (buildCounterRegionsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed398(o.regions);
+    checkUnnamed811(o.regions);
   }
   buildCounterRegionsListResponse--;
 }
 
-buildUnnamed399() {
+buildUnnamed812() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed399(core.List<api.DimensionValue> o) {
+checkUnnamed812(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed400() {
+buildUnnamed813() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed400(core.List<api.SortedDimension> o) {
+checkUnnamed813(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
 }
 
-buildUnnamed401() {
+buildUnnamed814() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed401(core.List<core.String> o) {
+checkUnnamed814(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -5497,9 +5532,9 @@
     o.activities = buildActivities();
     o.customRichMediaEvents = buildCustomRichMediaEvents();
     o.dateRange = buildDateRange();
-    o.dimensionFilters = buildUnnamed399();
-    o.dimensions = buildUnnamed400();
-    o.metricNames = buildUnnamed401();
+    o.dimensionFilters = buildUnnamed812();
+    o.dimensions = buildUnnamed813();
+    o.metricNames = buildUnnamed814();
   }
   buildCounterReportCriteria--;
   return o;
@@ -5511,60 +5546,60 @@
     checkActivities(o.activities);
     checkCustomRichMediaEvents(o.customRichMediaEvents);
     checkDateRange(o.dateRange);
-    checkUnnamed399(o.dimensionFilters);
-    checkUnnamed400(o.dimensions);
-    checkUnnamed401(o.metricNames);
+    checkUnnamed812(o.dimensionFilters);
+    checkUnnamed813(o.dimensions);
+    checkUnnamed814(o.metricNames);
   }
   buildCounterReportCriteria--;
 }
 
-buildUnnamed402() {
+buildUnnamed815() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed402(core.List<api.SortedDimension> o) {
+checkUnnamed815(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
 }
 
-buildUnnamed403() {
+buildUnnamed816() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed403(core.List<api.DimensionValue> o) {
+checkUnnamed816(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed404() {
+buildUnnamed817() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed404(core.List<core.String> o) {
+checkUnnamed817(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed405() {
+buildUnnamed818() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed405(core.List<core.String> o) {
+checkUnnamed818(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -5575,12 +5610,12 @@
   var o = new api.ReportCrossDimensionReachCriteria();
   buildCounterReportCrossDimensionReachCriteria++;
   if (buildCounterReportCrossDimensionReachCriteria < 3) {
-    o.breakdown = buildUnnamed402();
+    o.breakdown = buildUnnamed815();
     o.dateRange = buildDateRange();
     o.dimension = "foo";
-    o.dimensionFilters = buildUnnamed403();
-    o.metricNames = buildUnnamed404();
-    o.overlapMetricNames = buildUnnamed405();
+    o.dimensionFilters = buildUnnamed816();
+    o.metricNames = buildUnnamed817();
+    o.overlapMetricNames = buildUnnamed818();
     o.pivoted = true;
   }
   buildCounterReportCrossDimensionReachCriteria--;
@@ -5590,25 +5625,25 @@
 checkReportCrossDimensionReachCriteria(api.ReportCrossDimensionReachCriteria o) {
   buildCounterReportCrossDimensionReachCriteria++;
   if (buildCounterReportCrossDimensionReachCriteria < 3) {
-    checkUnnamed402(o.breakdown);
+    checkUnnamed815(o.breakdown);
     checkDateRange(o.dateRange);
     unittest.expect(o.dimension, unittest.equals('foo'));
-    checkUnnamed403(o.dimensionFilters);
-    checkUnnamed404(o.metricNames);
-    checkUnnamed405(o.overlapMetricNames);
+    checkUnnamed816(o.dimensionFilters);
+    checkUnnamed817(o.metricNames);
+    checkUnnamed818(o.overlapMetricNames);
     unittest.expect(o.pivoted, unittest.isTrue);
   }
   buildCounterReportCrossDimensionReachCriteria--;
 }
 
-buildUnnamed406() {
+buildUnnamed819() {
   var o = new core.List<api.Recipient>();
   o.add(buildRecipient());
   o.add(buildRecipient());
   return o;
 }
 
-checkUnnamed406(core.List<api.Recipient> o) {
+checkUnnamed819(core.List<api.Recipient> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRecipient(o[0]);
   checkRecipient(o[1]);
@@ -5622,7 +5657,7 @@
     o.emailOwner = true;
     o.emailOwnerDeliveryType = "foo";
     o.message = "foo";
-    o.recipients = buildUnnamed406();
+    o.recipients = buildUnnamed819();
   }
   buildCounterReportDelivery--;
   return o;
@@ -5634,58 +5669,58 @@
     unittest.expect(o.emailOwner, unittest.isTrue);
     unittest.expect(o.emailOwnerDeliveryType, unittest.equals('foo'));
     unittest.expect(o.message, unittest.equals('foo'));
-    checkUnnamed406(o.recipients);
+    checkUnnamed819(o.recipients);
   }
   buildCounterReportDelivery--;
 }
 
-buildUnnamed407() {
+buildUnnamed820() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed407(core.List<api.DimensionValue> o) {
+checkUnnamed820(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed408() {
+buildUnnamed821() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed408(core.List<api.DimensionValue> o) {
+checkUnnamed821(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed409() {
+buildUnnamed822() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed409(core.List<api.SortedDimension> o) {
+checkUnnamed822(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
 }
 
-buildUnnamed410() {
+buildUnnamed823() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed410(core.List<core.String> o) {
+checkUnnamed823(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -5719,12 +5754,12 @@
   var o = new api.ReportFloodlightCriteria();
   buildCounterReportFloodlightCriteria++;
   if (buildCounterReportFloodlightCriteria < 3) {
-    o.customRichMediaEvents = buildUnnamed407();
+    o.customRichMediaEvents = buildUnnamed820();
     o.dateRange = buildDateRange();
-    o.dimensionFilters = buildUnnamed408();
-    o.dimensions = buildUnnamed409();
+    o.dimensionFilters = buildUnnamed821();
+    o.dimensions = buildUnnamed822();
     o.floodlightConfigId = buildDimensionValue();
-    o.metricNames = buildUnnamed410();
+    o.metricNames = buildUnnamed823();
     o.reportProperties = buildReportFloodlightCriteriaReportProperties();
   }
   buildCounterReportFloodlightCriteria--;
@@ -5734,90 +5769,90 @@
 checkReportFloodlightCriteria(api.ReportFloodlightCriteria o) {
   buildCounterReportFloodlightCriteria++;
   if (buildCounterReportFloodlightCriteria < 3) {
-    checkUnnamed407(o.customRichMediaEvents);
+    checkUnnamed820(o.customRichMediaEvents);
     checkDateRange(o.dateRange);
-    checkUnnamed408(o.dimensionFilters);
-    checkUnnamed409(o.dimensions);
+    checkUnnamed821(o.dimensionFilters);
+    checkUnnamed822(o.dimensions);
     checkDimensionValue(o.floodlightConfigId);
-    checkUnnamed410(o.metricNames);
+    checkUnnamed823(o.metricNames);
     checkReportFloodlightCriteriaReportProperties(o.reportProperties);
   }
   buildCounterReportFloodlightCriteria--;
 }
 
-buildUnnamed411() {
+buildUnnamed824() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed411(core.List<api.DimensionValue> o) {
+checkUnnamed824(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed412() {
+buildUnnamed825() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed412(core.List<api.SortedDimension> o) {
+checkUnnamed825(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
 }
 
-buildUnnamed413() {
+buildUnnamed826() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed413(core.List<api.SortedDimension> o) {
+checkUnnamed826(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
 }
 
-buildUnnamed414() {
+buildUnnamed827() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed414(core.List<api.DimensionValue> o) {
+checkUnnamed827(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed415() {
+buildUnnamed828() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed415(core.List<core.String> o) {
+checkUnnamed828(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed416() {
+buildUnnamed829() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed416(core.List<api.SortedDimension> o) {
+checkUnnamed829(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
@@ -5863,14 +5898,14 @@
   var o = new api.ReportPathToConversionCriteria();
   buildCounterReportPathToConversionCriteria++;
   if (buildCounterReportPathToConversionCriteria < 3) {
-    o.activityFilters = buildUnnamed411();
-    o.conversionDimensions = buildUnnamed412();
-    o.customFloodlightVariables = buildUnnamed413();
-    o.customRichMediaEvents = buildUnnamed414();
+    o.activityFilters = buildUnnamed824();
+    o.conversionDimensions = buildUnnamed825();
+    o.customFloodlightVariables = buildUnnamed826();
+    o.customRichMediaEvents = buildUnnamed827();
     o.dateRange = buildDateRange();
     o.floodlightConfigId = buildDimensionValue();
-    o.metricNames = buildUnnamed415();
-    o.perInteractionDimensions = buildUnnamed416();
+    o.metricNames = buildUnnamed828();
+    o.perInteractionDimensions = buildUnnamed829();
     o.reportProperties = buildReportPathToConversionCriteriaReportProperties();
   }
   buildCounterReportPathToConversionCriteria--;
@@ -5880,66 +5915,66 @@
 checkReportPathToConversionCriteria(api.ReportPathToConversionCriteria o) {
   buildCounterReportPathToConversionCriteria++;
   if (buildCounterReportPathToConversionCriteria < 3) {
-    checkUnnamed411(o.activityFilters);
-    checkUnnamed412(o.conversionDimensions);
-    checkUnnamed413(o.customFloodlightVariables);
-    checkUnnamed414(o.customRichMediaEvents);
+    checkUnnamed824(o.activityFilters);
+    checkUnnamed825(o.conversionDimensions);
+    checkUnnamed826(o.customFloodlightVariables);
+    checkUnnamed827(o.customRichMediaEvents);
     checkDateRange(o.dateRange);
     checkDimensionValue(o.floodlightConfigId);
-    checkUnnamed415(o.metricNames);
-    checkUnnamed416(o.perInteractionDimensions);
+    checkUnnamed828(o.metricNames);
+    checkUnnamed829(o.perInteractionDimensions);
     checkReportPathToConversionCriteriaReportProperties(o.reportProperties);
   }
   buildCounterReportPathToConversionCriteria--;
 }
 
-buildUnnamed417() {
+buildUnnamed830() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed417(core.List<api.DimensionValue> o) {
+checkUnnamed830(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed418() {
+buildUnnamed831() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed418(core.List<api.SortedDimension> o) {
+checkUnnamed831(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
 }
 
-buildUnnamed419() {
+buildUnnamed832() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed419(core.List<core.String> o) {
+checkUnnamed832(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed420() {
+buildUnnamed833() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed420(core.List<core.String> o) {
+checkUnnamed833(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -5953,11 +5988,11 @@
     o.activities = buildActivities();
     o.customRichMediaEvents = buildCustomRichMediaEvents();
     o.dateRange = buildDateRange();
-    o.dimensionFilters = buildUnnamed417();
-    o.dimensions = buildUnnamed418();
+    o.dimensionFilters = buildUnnamed830();
+    o.dimensions = buildUnnamed831();
     o.enableAllDimensionCombinations = true;
-    o.metricNames = buildUnnamed419();
-    o.reachByFrequencyMetricNames = buildUnnamed420();
+    o.metricNames = buildUnnamed832();
+    o.reachByFrequencyMetricNames = buildUnnamed833();
   }
   buildCounterReportReachCriteria--;
   return o;
@@ -5969,23 +6004,23 @@
     checkActivities(o.activities);
     checkCustomRichMediaEvents(o.customRichMediaEvents);
     checkDateRange(o.dateRange);
-    checkUnnamed417(o.dimensionFilters);
-    checkUnnamed418(o.dimensions);
+    checkUnnamed830(o.dimensionFilters);
+    checkUnnamed831(o.dimensions);
     unittest.expect(o.enableAllDimensionCombinations, unittest.isTrue);
-    checkUnnamed419(o.metricNames);
-    checkUnnamed420(o.reachByFrequencyMetricNames);
+    checkUnnamed832(o.metricNames);
+    checkUnnamed833(o.reachByFrequencyMetricNames);
   }
   buildCounterReportReachCriteria--;
 }
 
-buildUnnamed421() {
+buildUnnamed834() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed421(core.List<core.String> o) {
+checkUnnamed834(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -6000,7 +6035,7 @@
     o.every = 42;
     o.expirationDate = core.DateTime.parse("2002-02-27T14:01:02Z");
     o.repeats = "foo";
-    o.repeatsOnWeekDays = buildUnnamed421();
+    o.repeatsOnWeekDays = buildUnnamed834();
     o.runsOnDayOfMonth = "foo";
     o.startDate = core.DateTime.parse("2002-02-27T14:01:02Z");
   }
@@ -6015,7 +6050,7 @@
     unittest.expect(o.every, unittest.equals(42));
     unittest.expect(o.expirationDate, unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
     unittest.expect(o.repeats, unittest.equals('foo'));
-    checkUnnamed421(o.repeatsOnWeekDays);
+    checkUnnamed834(o.repeatsOnWeekDays);
     unittest.expect(o.runsOnDayOfMonth, unittest.equals('foo'));
     unittest.expect(o.startDate, unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
   }
@@ -6075,53 +6110,53 @@
   buildCounterReport--;
 }
 
-buildUnnamed422() {
+buildUnnamed835() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed422(core.List<api.Dimension> o) {
+checkUnnamed835(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed423() {
+buildUnnamed836() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed423(core.List<api.Dimension> o) {
+checkUnnamed836(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed424() {
+buildUnnamed837() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed424(core.List<api.Metric> o) {
+checkUnnamed837(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
 }
 
-buildUnnamed425() {
+buildUnnamed838() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed425(core.List<api.Metric> o) {
+checkUnnamed838(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
@@ -6132,11 +6167,11 @@
   var o = new api.ReportCompatibleFields();
   buildCounterReportCompatibleFields++;
   if (buildCounterReportCompatibleFields < 3) {
-    o.dimensionFilters = buildUnnamed422();
-    o.dimensions = buildUnnamed423();
+    o.dimensionFilters = buildUnnamed835();
+    o.dimensions = buildUnnamed836();
     o.kind = "foo";
-    o.metrics = buildUnnamed424();
-    o.pivotedActivityMetrics = buildUnnamed425();
+    o.metrics = buildUnnamed837();
+    o.pivotedActivityMetrics = buildUnnamed838();
   }
   buildCounterReportCompatibleFields--;
   return o;
@@ -6145,23 +6180,23 @@
 checkReportCompatibleFields(api.ReportCompatibleFields o) {
   buildCounterReportCompatibleFields++;
   if (buildCounterReportCompatibleFields < 3) {
-    checkUnnamed422(o.dimensionFilters);
-    checkUnnamed423(o.dimensions);
+    checkUnnamed835(o.dimensionFilters);
+    checkUnnamed836(o.dimensions);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed424(o.metrics);
-    checkUnnamed425(o.pivotedActivityMetrics);
+    checkUnnamed837(o.metrics);
+    checkUnnamed838(o.pivotedActivityMetrics);
   }
   buildCounterReportCompatibleFields--;
 }
 
-buildUnnamed426() {
+buildUnnamed839() {
   var o = new core.List<api.Report>();
   o.add(buildReport());
   o.add(buildReport());
   return o;
 }
 
-checkUnnamed426(core.List<api.Report> o) {
+checkUnnamed839(core.List<api.Report> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReport(o[0]);
   checkReport(o[1]);
@@ -6173,7 +6208,7 @@
   buildCounterReportList++;
   if (buildCounterReportList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed426();
+    o.items = buildUnnamed839();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -6185,7 +6220,7 @@
   buildCounterReportList++;
   if (buildCounterReportList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed426(o.items);
+    checkUnnamed839(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -6238,14 +6273,14 @@
   buildCounterRichMediaExitOverride--;
 }
 
-buildUnnamed427() {
+buildUnnamed840() {
   var o = new core.List<api.SiteContact>();
   o.add(buildSiteContact());
   o.add(buildSiteContact());
   return o;
 }
 
-checkUnnamed427(core.List<api.SiteContact> o) {
+checkUnnamed840(core.List<api.SiteContact> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSiteContact(o[0]);
   checkSiteContact(o[1]);
@@ -6265,7 +6300,7 @@
     o.keyName = "foo";
     o.kind = "foo";
     o.name = "foo";
-    o.siteContacts = buildUnnamed427();
+    o.siteContacts = buildUnnamed840();
     o.siteSettings = buildSiteSettings();
     o.subaccountId = "foo";
   }
@@ -6285,7 +6320,7 @@
     unittest.expect(o.keyName, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed427(o.siteContacts);
+    checkUnnamed840(o.siteContacts);
     checkSiteSettings(o.siteSettings);
     unittest.expect(o.subaccountId, unittest.equals('foo'));
   }
@@ -6348,14 +6383,14 @@
   buildCounterSiteSettings--;
 }
 
-buildUnnamed428() {
+buildUnnamed841() {
   var o = new core.List<api.Site>();
   o.add(buildSite());
   o.add(buildSite());
   return o;
 }
 
-checkUnnamed428(core.List<api.Site> o) {
+checkUnnamed841(core.List<api.Site> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSite(o[0]);
   checkSite(o[1]);
@@ -6368,7 +6403,7 @@
   if (buildCounterSitesListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.sites = buildUnnamed428();
+    o.sites = buildUnnamed841();
   }
   buildCounterSitesListResponse--;
   return o;
@@ -6379,7 +6414,7 @@
   if (buildCounterSitesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed428(o.sites);
+    checkUnnamed841(o.sites);
   }
   buildCounterSitesListResponse--;
 }
@@ -6411,14 +6446,14 @@
   buildCounterSize--;
 }
 
-buildUnnamed429() {
+buildUnnamed842() {
   var o = new core.List<api.Size>();
   o.add(buildSize());
   o.add(buildSize());
   return o;
 }
 
-checkUnnamed429(core.List<api.Size> o) {
+checkUnnamed842(core.List<api.Size> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSize(o[0]);
   checkSize(o[1]);
@@ -6430,7 +6465,7 @@
   buildCounterSizesListResponse++;
   if (buildCounterSizesListResponse < 3) {
     o.kind = "foo";
-    o.sizes = buildUnnamed429();
+    o.sizes = buildUnnamed842();
   }
   buildCounterSizesListResponse--;
   return o;
@@ -6440,7 +6475,7 @@
   buildCounterSizesListResponse++;
   if (buildCounterSizesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed429(o.sizes);
+    checkUnnamed842(o.sizes);
   }
   buildCounterSizesListResponse--;
 }
@@ -6468,14 +6503,14 @@
   buildCounterSortedDimension--;
 }
 
-buildUnnamed430() {
+buildUnnamed843() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed430(core.List<core.String> o) {
+checkUnnamed843(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -6487,7 +6522,7 @@
   buildCounterSubaccount++;
   if (buildCounterSubaccount < 3) {
     o.accountId = "foo";
-    o.availablePermissionIds = buildUnnamed430();
+    o.availablePermissionIds = buildUnnamed843();
     o.id = "foo";
     o.kind = "foo";
     o.name = "foo";
@@ -6500,7 +6535,7 @@
   buildCounterSubaccount++;
   if (buildCounterSubaccount < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
-    checkUnnamed430(o.availablePermissionIds);
+    checkUnnamed843(o.availablePermissionIds);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
@@ -6508,14 +6543,14 @@
   buildCounterSubaccount--;
 }
 
-buildUnnamed431() {
+buildUnnamed844() {
   var o = new core.List<api.Subaccount>();
   o.add(buildSubaccount());
   o.add(buildSubaccount());
   return o;
 }
 
-checkUnnamed431(core.List<api.Subaccount> o) {
+checkUnnamed844(core.List<api.Subaccount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSubaccount(o[0]);
   checkSubaccount(o[1]);
@@ -6528,7 +6563,7 @@
   if (buildCounterSubaccountsListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.subaccounts = buildUnnamed431();
+    o.subaccounts = buildUnnamed844();
   }
   buildCounterSubaccountsListResponse--;
   return o;
@@ -6539,7 +6574,7 @@
   if (buildCounterSubaccountsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed431(o.subaccounts);
+    checkUnnamed844(o.subaccounts);
   }
   buildCounterSubaccountsListResponse--;
 }
@@ -6638,79 +6673,79 @@
   buildCounterTargetWindow--;
 }
 
-buildUnnamed432() {
+buildUnnamed845() {
   var o = new core.List<api.Browser>();
   o.add(buildBrowser());
   o.add(buildBrowser());
   return o;
 }
 
-checkUnnamed432(core.List<api.Browser> o) {
+checkUnnamed845(core.List<api.Browser> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBrowser(o[0]);
   checkBrowser(o[1]);
 }
 
-buildUnnamed433() {
+buildUnnamed846() {
   var o = new core.List<api.ConnectionType>();
   o.add(buildConnectionType());
   o.add(buildConnectionType());
   return o;
 }
 
-checkUnnamed433(core.List<api.ConnectionType> o) {
+checkUnnamed846(core.List<api.ConnectionType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConnectionType(o[0]);
   checkConnectionType(o[1]);
 }
 
-buildUnnamed434() {
+buildUnnamed847() {
   var o = new core.List<api.MobileCarrier>();
   o.add(buildMobileCarrier());
   o.add(buildMobileCarrier());
   return o;
 }
 
-checkUnnamed434(core.List<api.MobileCarrier> o) {
+checkUnnamed847(core.List<api.MobileCarrier> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMobileCarrier(o[0]);
   checkMobileCarrier(o[1]);
 }
 
-buildUnnamed435() {
+buildUnnamed848() {
   var o = new core.List<api.OperatingSystemVersion>();
   o.add(buildOperatingSystemVersion());
   o.add(buildOperatingSystemVersion());
   return o;
 }
 
-checkUnnamed435(core.List<api.OperatingSystemVersion> o) {
+checkUnnamed848(core.List<api.OperatingSystemVersion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperatingSystemVersion(o[0]);
   checkOperatingSystemVersion(o[1]);
 }
 
-buildUnnamed436() {
+buildUnnamed849() {
   var o = new core.List<api.OperatingSystem>();
   o.add(buildOperatingSystem());
   o.add(buildOperatingSystem());
   return o;
 }
 
-checkUnnamed436(core.List<api.OperatingSystem> o) {
+checkUnnamed849(core.List<api.OperatingSystem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperatingSystem(o[0]);
   checkOperatingSystem(o[1]);
 }
 
-buildUnnamed437() {
+buildUnnamed850() {
   var o = new core.List<api.PlatformType>();
   o.add(buildPlatformType());
   o.add(buildPlatformType());
   return o;
 }
 
-checkUnnamed437(core.List<api.PlatformType> o) {
+checkUnnamed850(core.List<api.PlatformType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlatformType(o[0]);
   checkPlatformType(o[1]);
@@ -6721,12 +6756,12 @@
   var o = new api.TechnologyTargeting();
   buildCounterTechnologyTargeting++;
   if (buildCounterTechnologyTargeting < 3) {
-    o.browsers = buildUnnamed432();
-    o.connectionTypes = buildUnnamed433();
-    o.mobileCarriers = buildUnnamed434();
-    o.operatingSystemVersions = buildUnnamed435();
-    o.operatingSystems = buildUnnamed436();
-    o.platformTypes = buildUnnamed437();
+    o.browsers = buildUnnamed845();
+    o.connectionTypes = buildUnnamed846();
+    o.mobileCarriers = buildUnnamed847();
+    o.operatingSystemVersions = buildUnnamed848();
+    o.operatingSystems = buildUnnamed849();
+    o.platformTypes = buildUnnamed850();
   }
   buildCounterTechnologyTargeting--;
   return o;
@@ -6735,12 +6770,12 @@
 checkTechnologyTargeting(api.TechnologyTargeting o) {
   buildCounterTechnologyTargeting++;
   if (buildCounterTechnologyTargeting < 3) {
-    checkUnnamed432(o.browsers);
-    checkUnnamed433(o.connectionTypes);
-    checkUnnamed434(o.mobileCarriers);
-    checkUnnamed435(o.operatingSystemVersions);
-    checkUnnamed436(o.operatingSystems);
-    checkUnnamed437(o.platformTypes);
+    checkUnnamed845(o.browsers);
+    checkUnnamed846(o.connectionTypes);
+    checkUnnamed847(o.mobileCarriers);
+    checkUnnamed848(o.operatingSystemVersions);
+    checkUnnamed849(o.operatingSystems);
+    checkUnnamed850(o.platformTypes);
   }
   buildCounterTechnologyTargeting--;
 }
@@ -6822,14 +6857,14 @@
   buildCounterUserProfile--;
 }
 
-buildUnnamed438() {
+buildUnnamed851() {
   var o = new core.List<api.UserProfile>();
   o.add(buildUserProfile());
   o.add(buildUserProfile());
   return o;
 }
 
-checkUnnamed438(core.List<api.UserProfile> o) {
+checkUnnamed851(core.List<api.UserProfile> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserProfile(o[0]);
   checkUserProfile(o[1]);
@@ -6841,7 +6876,7 @@
   buildCounterUserProfileList++;
   if (buildCounterUserProfileList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed438();
+    o.items = buildUnnamed851();
     o.kind = "foo";
   }
   buildCounterUserProfileList--;
@@ -6852,20 +6887,20 @@
   buildCounterUserProfileList++;
   if (buildCounterUserProfileList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed438(o.items);
+    checkUnnamed851(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterUserProfileList--;
 }
 
-buildUnnamed439() {
+buildUnnamed852() {
   var o = new core.List<api.UserRolePermission>();
   o.add(buildUserRolePermission());
   o.add(buildUserRolePermission());
   return o;
 }
 
-checkUnnamed439(core.List<api.UserRolePermission> o) {
+checkUnnamed852(core.List<api.UserRolePermission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserRolePermission(o[0]);
   checkUserRolePermission(o[1]);
@@ -6882,7 +6917,7 @@
     o.kind = "foo";
     o.name = "foo";
     o.parentUserRoleId = "foo";
-    o.permissions = buildUnnamed439();
+    o.permissions = buildUnnamed852();
     o.subaccountId = "foo";
   }
   buildCounterUserRole--;
@@ -6898,7 +6933,7 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.parentUserRoleId, unittest.equals('foo'));
-    checkUnnamed439(o.permissions);
+    checkUnnamed852(o.permissions);
     unittest.expect(o.subaccountId, unittest.equals('foo'));
   }
   buildCounterUserRole--;
@@ -6954,14 +6989,14 @@
   buildCounterUserRolePermissionGroup--;
 }
 
-buildUnnamed440() {
+buildUnnamed853() {
   var o = new core.List<api.UserRolePermissionGroup>();
   o.add(buildUserRolePermissionGroup());
   o.add(buildUserRolePermissionGroup());
   return o;
 }
 
-checkUnnamed440(core.List<api.UserRolePermissionGroup> o) {
+checkUnnamed853(core.List<api.UserRolePermissionGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserRolePermissionGroup(o[0]);
   checkUserRolePermissionGroup(o[1]);
@@ -6973,7 +7008,7 @@
   buildCounterUserRolePermissionGroupsListResponse++;
   if (buildCounterUserRolePermissionGroupsListResponse < 3) {
     o.kind = "foo";
-    o.userRolePermissionGroups = buildUnnamed440();
+    o.userRolePermissionGroups = buildUnnamed853();
   }
   buildCounterUserRolePermissionGroupsListResponse--;
   return o;
@@ -6983,19 +7018,19 @@
   buildCounterUserRolePermissionGroupsListResponse++;
   if (buildCounterUserRolePermissionGroupsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed440(o.userRolePermissionGroups);
+    checkUnnamed853(o.userRolePermissionGroups);
   }
   buildCounterUserRolePermissionGroupsListResponse--;
 }
 
-buildUnnamed441() {
+buildUnnamed854() {
   var o = new core.List<api.UserRolePermission>();
   o.add(buildUserRolePermission());
   o.add(buildUserRolePermission());
   return o;
 }
 
-checkUnnamed441(core.List<api.UserRolePermission> o) {
+checkUnnamed854(core.List<api.UserRolePermission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserRolePermission(o[0]);
   checkUserRolePermission(o[1]);
@@ -7007,7 +7042,7 @@
   buildCounterUserRolePermissionsListResponse++;
   if (buildCounterUserRolePermissionsListResponse < 3) {
     o.kind = "foo";
-    o.userRolePermissions = buildUnnamed441();
+    o.userRolePermissions = buildUnnamed854();
   }
   buildCounterUserRolePermissionsListResponse--;
   return o;
@@ -7017,19 +7052,19 @@
   buildCounterUserRolePermissionsListResponse++;
   if (buildCounterUserRolePermissionsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed441(o.userRolePermissions);
+    checkUnnamed854(o.userRolePermissions);
   }
   buildCounterUserRolePermissionsListResponse--;
 }
 
-buildUnnamed442() {
+buildUnnamed855() {
   var o = new core.List<api.UserRole>();
   o.add(buildUserRole());
   o.add(buildUserRole());
   return o;
 }
 
-checkUnnamed442(core.List<api.UserRole> o) {
+checkUnnamed855(core.List<api.UserRole> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserRole(o[0]);
   checkUserRole(o[1]);
@@ -7042,7 +7077,7 @@
   if (buildCounterUserRolesListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.userRoles = buildUnnamed442();
+    o.userRoles = buildUnnamed855();
   }
   buildCounterUserRolesListResponse--;
   return o;
@@ -7053,994 +7088,994 @@
   if (buildCounterUserRolesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed442(o.userRoles);
+    checkUnnamed855(o.userRoles);
   }
   buildCounterUserRolesListResponse--;
 }
 
-buildUnnamed443() {
+buildUnnamed856() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed443(core.List<core.String> o) {
+checkUnnamed856(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed444() {
+buildUnnamed857() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed444(core.List<core.String> o) {
+checkUnnamed857(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed445() {
+buildUnnamed858() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed445(core.List<core.String> o) {
+checkUnnamed858(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed446() {
+buildUnnamed859() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed446(core.List<core.String> o) {
+checkUnnamed859(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed447() {
+buildUnnamed860() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed447(core.List<core.String> o) {
+checkUnnamed860(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed448() {
+buildUnnamed861() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed448(core.List<core.String> o) {
+checkUnnamed861(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed449() {
+buildUnnamed862() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed449(core.List<core.String> o) {
+checkUnnamed862(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed450() {
+buildUnnamed863() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed450(core.List<core.String> o) {
+checkUnnamed863(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed451() {
+buildUnnamed864() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed451(core.List<core.String> o) {
+checkUnnamed864(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed452() {
+buildUnnamed865() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed452(core.List<core.String> o) {
+checkUnnamed865(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed453() {
+buildUnnamed866() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed453(core.List<core.String> o) {
+checkUnnamed866(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed454() {
+buildUnnamed867() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed454(core.List<core.String> o) {
+checkUnnamed867(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed455() {
+buildUnnamed868() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed455(core.List<core.String> o) {
+checkUnnamed868(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed456() {
+buildUnnamed869() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed456(core.List<core.String> o) {
+checkUnnamed869(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed457() {
+buildUnnamed870() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed457(core.List<core.String> o) {
+checkUnnamed870(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed458() {
+buildUnnamed871() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed458(core.List<core.String> o) {
+checkUnnamed871(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed459() {
+buildUnnamed872() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed459(core.List<core.String> o) {
+checkUnnamed872(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed460() {
+buildUnnamed873() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed460(core.List<core.String> o) {
+checkUnnamed873(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed461() {
+buildUnnamed874() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed461(core.List<core.String> o) {
+checkUnnamed874(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed462() {
+buildUnnamed875() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed462(core.List<core.String> o) {
+checkUnnamed875(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed463() {
+buildUnnamed876() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed463(core.List<core.String> o) {
+checkUnnamed876(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed464() {
+buildUnnamed877() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed464(core.List<core.String> o) {
+checkUnnamed877(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed465() {
+buildUnnamed878() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed465(core.List<core.String> o) {
+checkUnnamed878(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed466() {
+buildUnnamed879() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed466(core.List<core.String> o) {
+checkUnnamed879(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed467() {
+buildUnnamed880() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed467(core.List<core.String> o) {
+checkUnnamed880(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed468() {
+buildUnnamed881() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed468(core.List<core.String> o) {
+checkUnnamed881(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed469() {
+buildUnnamed882() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed469(core.List<core.String> o) {
+checkUnnamed882(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed470() {
+buildUnnamed883() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed470(core.List<core.String> o) {
+checkUnnamed883(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed471() {
+buildUnnamed884() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed471(core.List<core.String> o) {
+checkUnnamed884(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed472() {
+buildUnnamed885() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed472(core.List<core.String> o) {
+checkUnnamed885(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed473() {
+buildUnnamed886() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed473(core.List<core.String> o) {
+checkUnnamed886(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed474() {
+buildUnnamed887() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed474(core.List<core.String> o) {
+checkUnnamed887(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed475() {
+buildUnnamed888() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed475(core.List<core.String> o) {
+checkUnnamed888(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed476() {
+buildUnnamed889() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed476(core.List<core.String> o) {
+checkUnnamed889(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed477() {
+buildUnnamed890() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed477(core.List<core.String> o) {
+checkUnnamed890(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed478() {
+buildUnnamed891() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed478(core.List<core.String> o) {
+checkUnnamed891(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed479() {
+buildUnnamed892() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed479(core.List<core.String> o) {
+checkUnnamed892(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed480() {
+buildUnnamed893() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed480(core.List<core.String> o) {
+checkUnnamed893(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed481() {
+buildUnnamed894() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed481(core.List<core.String> o) {
+checkUnnamed894(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed482() {
+buildUnnamed895() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed482(core.List<core.String> o) {
+checkUnnamed895(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed483() {
+buildUnnamed896() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed483(core.List<core.String> o) {
+checkUnnamed896(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed484() {
+buildUnnamed897() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed484(core.List<core.String> o) {
+checkUnnamed897(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed485() {
+buildUnnamed898() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed485(core.List<core.String> o) {
+checkUnnamed898(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed486() {
+buildUnnamed899() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed486(core.List<core.String> o) {
+checkUnnamed899(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed487() {
+buildUnnamed900() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed487(core.List<core.String> o) {
+checkUnnamed900(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed488() {
+buildUnnamed901() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed488(core.List<core.String> o) {
+checkUnnamed901(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed489() {
+buildUnnamed902() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed489(core.List<core.String> o) {
+checkUnnamed902(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed490() {
+buildUnnamed903() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed490(core.List<core.String> o) {
+checkUnnamed903(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed491() {
+buildUnnamed904() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed491(core.List<core.String> o) {
+checkUnnamed904(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed492() {
+buildUnnamed905() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed492(core.List<core.String> o) {
+checkUnnamed905(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed493() {
+buildUnnamed906() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed493(core.List<core.String> o) {
+checkUnnamed906(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed494() {
+buildUnnamed907() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed494(core.List<core.String> o) {
+checkUnnamed907(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed495() {
+buildUnnamed908() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed495(core.List<core.String> o) {
+checkUnnamed908(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed496() {
+buildUnnamed909() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed496(core.List<core.String> o) {
+checkUnnamed909(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed497() {
+buildUnnamed910() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed497(core.List<core.String> o) {
+checkUnnamed910(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed498() {
+buildUnnamed911() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed498(core.List<core.String> o) {
+checkUnnamed911(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed499() {
+buildUnnamed912() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed499(core.List<core.String> o) {
+checkUnnamed912(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed500() {
+buildUnnamed913() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed500(core.List<core.String> o) {
+checkUnnamed913(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed501() {
+buildUnnamed914() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed501(core.List<core.String> o) {
+checkUnnamed914(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed502() {
+buildUnnamed915() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed502(core.List<core.String> o) {
+checkUnnamed915(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed503() {
+buildUnnamed916() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed503(core.List<core.String> o) {
+checkUnnamed916(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed504() {
+buildUnnamed917() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed504(core.List<core.String> o) {
+checkUnnamed917(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed505() {
+buildUnnamed918() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed505(core.List<core.String> o) {
+checkUnnamed918(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed506() {
+buildUnnamed919() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed506(core.List<core.String> o) {
+checkUnnamed919(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed507() {
+buildUnnamed920() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed507(core.List<core.String> o) {
+checkUnnamed920(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed508() {
+buildUnnamed921() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed508(core.List<core.String> o) {
+checkUnnamed921(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed509() {
+buildUnnamed922() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed509(core.List<core.String> o) {
+checkUnnamed922(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed510() {
+buildUnnamed923() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed510(core.List<core.String> o) {
+checkUnnamed923(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed511() {
+buildUnnamed924() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed511(core.List<core.String> o) {
+checkUnnamed924(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed512() {
+buildUnnamed925() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed512(core.List<core.String> o) {
+checkUnnamed925(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed513() {
+buildUnnamed926() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed513(core.List<core.String> o) {
+checkUnnamed926(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed514() {
+buildUnnamed927() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed514(core.List<core.String> o) {
+checkUnnamed927(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed515() {
+buildUnnamed928() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed515(core.List<core.String> o) {
+checkUnnamed928(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed516() {
+buildUnnamed929() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed516(core.List<core.String> o) {
+checkUnnamed929(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed517() {
+buildUnnamed930() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed517(core.List<core.String> o) {
+checkUnnamed930(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed518() {
+buildUnnamed931() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed518(core.List<core.String> o) {
+checkUnnamed931(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -9608,7 +9643,7 @@
   unittest.group("resource-AccountActiveAdSummariesResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountActiveAdSummariesResourceApi res = new api.DfareportingApi(mock).accountActiveAdSummaries;
       var arg_profileId = "foo";
       var arg_summaryAccountId = "foo";
@@ -9656,7 +9691,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountActiveAdSummary());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_summaryAccountId).then(unittest.expectAsync(((api.AccountActiveAdSummary response) {
         checkAccountActiveAdSummary(response);
@@ -9669,7 +9704,7 @@
   unittest.group("resource-AccountPermissionGroupsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountPermissionGroupsResourceApi res = new api.DfareportingApi(mock).accountPermissionGroups;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -9717,7 +9752,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountPermissionGroup());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.AccountPermissionGroup response) {
         checkAccountPermissionGroup(response);
@@ -9726,7 +9761,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountPermissionGroupsResourceApi res = new api.DfareportingApi(mock).accountPermissionGroups;
       var arg_profileId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -9770,7 +9805,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountPermissionGroupsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId).then(unittest.expectAsync(((api.AccountPermissionGroupsListResponse response) {
         checkAccountPermissionGroupsListResponse(response);
@@ -9783,7 +9818,7 @@
   unittest.group("resource-AccountPermissionsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountPermissionsResourceApi res = new api.DfareportingApi(mock).accountPermissions;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -9831,7 +9866,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountPermission());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.AccountPermission response) {
         checkAccountPermission(response);
@@ -9840,7 +9875,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountPermissionsResourceApi res = new api.DfareportingApi(mock).accountPermissions;
       var arg_profileId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -9884,7 +9919,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountPermissionsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId).then(unittest.expectAsync(((api.AccountPermissionsListResponse response) {
         checkAccountPermissionsListResponse(response);
@@ -9897,7 +9932,7 @@
   unittest.group("resource-AccountUserProfilesResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountUserProfilesResourceApi res = new api.DfareportingApi(mock).accountUserProfiles;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -9945,7 +9980,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountUserProfile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.AccountUserProfile response) {
         checkAccountUserProfile(response);
@@ -9954,11 +9989,11 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountUserProfilesResourceApi res = new api.DfareportingApi(mock).accountUserProfiles;
       var arg_profileId = "foo";
       var arg_active = true;
-      var arg_ids = buildUnnamed443();
+      var arg_ids = buildUnnamed856();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -10016,7 +10051,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountUserProfilesListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, active: arg_active, ids: arg_ids, maxResults: arg_maxResults, pageToken: arg_pageToken, searchString: arg_searchString, sortField: arg_sortField, sortOrder: arg_sortOrder, subaccountId: arg_subaccountId, userRoleId: arg_userRoleId).then(unittest.expectAsync(((api.AccountUserProfilesListResponse response) {
         checkAccountUserProfilesListResponse(response);
@@ -10025,7 +10060,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountUserProfilesResourceApi res = new api.DfareportingApi(mock).accountUserProfiles;
       var arg_request = buildAccountUserProfile();
       var arg_profileId = "foo";
@@ -10075,7 +10110,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountUserProfile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_profileId, arg_id).then(unittest.expectAsync(((api.AccountUserProfile response) {
         checkAccountUserProfile(response);
@@ -10084,7 +10119,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountUserProfilesResourceApi res = new api.DfareportingApi(mock).accountUserProfiles;
       var arg_request = buildAccountUserProfile();
       var arg_profileId = "foo";
@@ -10132,7 +10167,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountUserProfile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_profileId).then(unittest.expectAsync(((api.AccountUserProfile response) {
         checkAccountUserProfile(response);
@@ -10145,7 +10180,7 @@
   unittest.group("resource-AccountsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.DfareportingApi(mock).accounts;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -10193,7 +10228,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccount());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.Account response) {
         checkAccount(response);
@@ -10202,11 +10237,11 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.DfareportingApi(mock).accounts;
       var arg_profileId = "foo";
       var arg_active = true;
-      var arg_ids = buildUnnamed444();
+      var arg_ids = buildUnnamed857();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -10260,7 +10295,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccountsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, active: arg_active, ids: arg_ids, maxResults: arg_maxResults, pageToken: arg_pageToken, searchString: arg_searchString, sortField: arg_sortField, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.AccountsListResponse response) {
         checkAccountsListResponse(response);
@@ -10269,7 +10304,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.DfareportingApi(mock).accounts;
       var arg_request = buildAccount();
       var arg_profileId = "foo";
@@ -10319,7 +10354,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccount());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_profileId, arg_id).then(unittest.expectAsync(((api.Account response) {
         checkAccount(response);
@@ -10328,7 +10363,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.DfareportingApi(mock).accounts;
       var arg_request = buildAccount();
       var arg_profileId = "foo";
@@ -10376,7 +10411,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccount());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_profileId).then(unittest.expectAsync(((api.Account response) {
         checkAccount(response);
@@ -10389,7 +10424,7 @@
   unittest.group("resource-AdsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdsResourceApi res = new api.DfareportingApi(mock).ads;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -10437,7 +10472,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAd());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.Ad response) {
         checkAd(response);
@@ -10446,7 +10481,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdsResourceApi res = new api.DfareportingApi(mock).ads;
       var arg_request = buildAd();
       var arg_profileId = "foo";
@@ -10494,7 +10529,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAd());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_profileId).then(unittest.expectAsync(((api.Ad response) {
         checkAd(response);
@@ -10503,33 +10538,33 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdsResourceApi res = new api.DfareportingApi(mock).ads;
       var arg_profileId = "foo";
       var arg_active = true;
       var arg_advertiserId = "foo";
       var arg_archived = true;
-      var arg_audienceSegmentIds = buildUnnamed445();
-      var arg_campaignIds = buildUnnamed446();
+      var arg_audienceSegmentIds = buildUnnamed858();
+      var arg_campaignIds = buildUnnamed859();
       var arg_compatibility = "foo";
-      var arg_creativeIds = buildUnnamed447();
-      var arg_creativeOptimizationConfigurationIds = buildUnnamed448();
+      var arg_creativeIds = buildUnnamed860();
+      var arg_creativeOptimizationConfigurationIds = buildUnnamed861();
       var arg_creativeType = "foo";
       var arg_dynamicClickTracker = true;
-      var arg_ids = buildUnnamed449();
-      var arg_landingPageIds = buildUnnamed450();
+      var arg_ids = buildUnnamed862();
+      var arg_landingPageIds = buildUnnamed863();
       var arg_maxResults = 42;
       var arg_overriddenEventTagId = "foo";
       var arg_pageToken = "foo";
-      var arg_placementIds = buildUnnamed451();
-      var arg_remarketingListIds = buildUnnamed452();
+      var arg_placementIds = buildUnnamed864();
+      var arg_remarketingListIds = buildUnnamed865();
       var arg_searchString = "foo";
-      var arg_sizeIds = buildUnnamed453();
+      var arg_sizeIds = buildUnnamed866();
       var arg_sortField = "foo";
       var arg_sortOrder = "foo";
       var arg_sslCompliant = true;
       var arg_sslRequired = true;
-      var arg_type = buildUnnamed454();
+      var arg_type = buildUnnamed867();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -10595,7 +10630,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, active: arg_active, advertiserId: arg_advertiserId, archived: arg_archived, audienceSegmentIds: arg_audienceSegmentIds, campaignIds: arg_campaignIds, compatibility: arg_compatibility, creativeIds: arg_creativeIds, creativeOptimizationConfigurationIds: arg_creativeOptimizationConfigurationIds, creativeType: arg_creativeType, dynamicClickTracker: arg_dynamicClickTracker, ids: arg_ids, landingPageIds: arg_landingPageIds, maxResults: arg_maxResults, overriddenEventTagId: arg_overriddenEventTagId, pageToken: arg_pageToken, placementIds: arg_placementIds, remarketingListIds: arg_remarketingListIds, searchString: arg_searchString, sizeIds: arg_sizeIds, sortField: arg_sortField, sortOrder: arg_sortOrder, sslCompliant: arg_sslCompliant, sslRequired: arg_sslRequired, type: arg_type).then(unittest.expectAsync(((api.AdsListResponse response) {
         checkAdsListResponse(response);
@@ -10604,7 +10639,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdsResourceApi res = new api.DfareportingApi(mock).ads;
       var arg_request = buildAd();
       var arg_profileId = "foo";
@@ -10654,7 +10689,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAd());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_profileId, arg_id).then(unittest.expectAsync(((api.Ad response) {
         checkAd(response);
@@ -10663,7 +10698,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdsResourceApi res = new api.DfareportingApi(mock).ads;
       var arg_request = buildAd();
       var arg_profileId = "foo";
@@ -10711,7 +10746,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAd());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_profileId).then(unittest.expectAsync(((api.Ad response) {
         checkAd(response);
@@ -10724,7 +10759,7 @@
   unittest.group("resource-AdvertiserGroupsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdvertiserGroupsResourceApi res = new api.DfareportingApi(mock).advertiserGroups;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -10772,14 +10807,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_profileId, arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdvertiserGroupsResourceApi res = new api.DfareportingApi(mock).advertiserGroups;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -10827,7 +10862,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdvertiserGroup());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.AdvertiserGroup response) {
         checkAdvertiserGroup(response);
@@ -10836,7 +10871,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdvertiserGroupsResourceApi res = new api.DfareportingApi(mock).advertiserGroups;
       var arg_request = buildAdvertiserGroup();
       var arg_profileId = "foo";
@@ -10884,7 +10919,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdvertiserGroup());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_profileId).then(unittest.expectAsync(((api.AdvertiserGroup response) {
         checkAdvertiserGroup(response);
@@ -10893,10 +10928,10 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdvertiserGroupsResourceApi res = new api.DfareportingApi(mock).advertiserGroups;
       var arg_profileId = "foo";
-      var arg_ids = buildUnnamed455();
+      var arg_ids = buildUnnamed868();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -10949,7 +10984,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdvertiserGroupsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, ids: arg_ids, maxResults: arg_maxResults, pageToken: arg_pageToken, searchString: arg_searchString, sortField: arg_sortField, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.AdvertiserGroupsListResponse response) {
         checkAdvertiserGroupsListResponse(response);
@@ -10958,7 +10993,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdvertiserGroupsResourceApi res = new api.DfareportingApi(mock).advertiserGroups;
       var arg_request = buildAdvertiserGroup();
       var arg_profileId = "foo";
@@ -11008,7 +11043,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdvertiserGroup());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_profileId, arg_id).then(unittest.expectAsync(((api.AdvertiserGroup response) {
         checkAdvertiserGroup(response);
@@ -11017,7 +11052,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdvertiserGroupsResourceApi res = new api.DfareportingApi(mock).advertiserGroups;
       var arg_request = buildAdvertiserGroup();
       var arg_profileId = "foo";
@@ -11065,7 +11100,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdvertiserGroup());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_profileId).then(unittest.expectAsync(((api.AdvertiserGroup response) {
         checkAdvertiserGroup(response);
@@ -11078,7 +11113,7 @@
   unittest.group("resource-AdvertisersResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdvertisersResourceApi res = new api.DfareportingApi(mock).advertisers;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -11126,7 +11161,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdvertiser());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.Advertiser response) {
         checkAdvertiser(response);
@@ -11135,7 +11170,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdvertisersResourceApi res = new api.DfareportingApi(mock).advertisers;
       var arg_request = buildAdvertiser();
       var arg_profileId = "foo";
@@ -11183,7 +11218,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdvertiser());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_profileId).then(unittest.expectAsync(((api.Advertiser response) {
         checkAdvertiser(response);
@@ -11192,12 +11227,12 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdvertisersResourceApi res = new api.DfareportingApi(mock).advertisers;
       var arg_profileId = "foo";
-      var arg_advertiserGroupIds = buildUnnamed456();
-      var arg_floodlightConfigurationIds = buildUnnamed457();
-      var arg_ids = buildUnnamed458();
+      var arg_advertiserGroupIds = buildUnnamed869();
+      var arg_floodlightConfigurationIds = buildUnnamed870();
+      var arg_ids = buildUnnamed871();
       var arg_includeAdvertisersWithoutGroupsOnly = true;
       var arg_maxResults = 42;
       var arg_onlyParent = true;
@@ -11260,7 +11295,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdvertisersListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, advertiserGroupIds: arg_advertiserGroupIds, floodlightConfigurationIds: arg_floodlightConfigurationIds, ids: arg_ids, includeAdvertisersWithoutGroupsOnly: arg_includeAdvertisersWithoutGroupsOnly, maxResults: arg_maxResults, onlyParent: arg_onlyParent, pageToken: arg_pageToken, searchString: arg_searchString, sortField: arg_sortField, sortOrder: arg_sortOrder, status: arg_status, subaccountId: arg_subaccountId).then(unittest.expectAsync(((api.AdvertisersListResponse response) {
         checkAdvertisersListResponse(response);
@@ -11269,7 +11304,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdvertisersResourceApi res = new api.DfareportingApi(mock).advertisers;
       var arg_request = buildAdvertiser();
       var arg_profileId = "foo";
@@ -11319,7 +11354,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdvertiser());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_profileId, arg_id).then(unittest.expectAsync(((api.Advertiser response) {
         checkAdvertiser(response);
@@ -11328,7 +11363,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AdvertisersResourceApi res = new api.DfareportingApi(mock).advertisers;
       var arg_request = buildAdvertiser();
       var arg_profileId = "foo";
@@ -11376,7 +11411,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAdvertiser());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_profileId).then(unittest.expectAsync(((api.Advertiser response) {
         checkAdvertiser(response);
@@ -11389,7 +11424,7 @@
   unittest.group("resource-BrowsersResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BrowsersResourceApi res = new api.DfareportingApi(mock).browsers;
       var arg_profileId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -11433,7 +11468,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBrowsersListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId).then(unittest.expectAsync(((api.BrowsersListResponse response) {
         checkBrowsersListResponse(response);
@@ -11446,7 +11481,7 @@
   unittest.group("resource-CampaignCreativeAssociationsResourceApi", () {
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CampaignCreativeAssociationsResourceApi res = new api.DfareportingApi(mock).campaignCreativeAssociations;
       var arg_request = buildCampaignCreativeAssociation();
       var arg_profileId = "foo";
@@ -11502,7 +11537,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCampaignCreativeAssociation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_profileId, arg_campaignId).then(unittest.expectAsync(((api.CampaignCreativeAssociation response) {
         checkCampaignCreativeAssociation(response);
@@ -11511,7 +11546,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CampaignCreativeAssociationsResourceApi res = new api.DfareportingApi(mock).campaignCreativeAssociations;
       var arg_profileId = "foo";
       var arg_campaignId = "foo";
@@ -11569,7 +11604,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCampaignCreativeAssociationsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, arg_campaignId, maxResults: arg_maxResults, pageToken: arg_pageToken, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.CampaignCreativeAssociationsListResponse response) {
         checkCampaignCreativeAssociationsListResponse(response);
@@ -11582,7 +11617,7 @@
   unittest.group("resource-CampaignsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CampaignsResourceApi res = new api.DfareportingApi(mock).campaigns;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -11630,7 +11665,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCampaign());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.Campaign response) {
         checkCampaign(response);
@@ -11639,7 +11674,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CampaignsResourceApi res = new api.DfareportingApi(mock).campaigns;
       var arg_request = buildCampaign();
       var arg_profileId = "foo";
@@ -11691,7 +11726,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCampaign());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_profileId, arg_defaultLandingPageName, arg_defaultLandingPageUrl).then(unittest.expectAsync(((api.Campaign response) {
         checkCampaign(response);
@@ -11700,15 +11735,15 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CampaignsResourceApi res = new api.DfareportingApi(mock).campaigns;
       var arg_profileId = "foo";
-      var arg_advertiserGroupIds = buildUnnamed459();
-      var arg_advertiserIds = buildUnnamed460();
+      var arg_advertiserGroupIds = buildUnnamed872();
+      var arg_advertiserIds = buildUnnamed873();
       var arg_archived = true;
       var arg_atLeastOneOptimizationActivity = true;
-      var arg_excludedIds = buildUnnamed461();
-      var arg_ids = buildUnnamed462();
+      var arg_excludedIds = buildUnnamed874();
+      var arg_ids = buildUnnamed875();
       var arg_maxResults = 42;
       var arg_overriddenEventTagId = "foo";
       var arg_pageToken = "foo";
@@ -11770,7 +11805,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCampaignsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, advertiserGroupIds: arg_advertiserGroupIds, advertiserIds: arg_advertiserIds, archived: arg_archived, atLeastOneOptimizationActivity: arg_atLeastOneOptimizationActivity, excludedIds: arg_excludedIds, ids: arg_ids, maxResults: arg_maxResults, overriddenEventTagId: arg_overriddenEventTagId, pageToken: arg_pageToken, searchString: arg_searchString, sortField: arg_sortField, sortOrder: arg_sortOrder, subaccountId: arg_subaccountId).then(unittest.expectAsync(((api.CampaignsListResponse response) {
         checkCampaignsListResponse(response);
@@ -11779,7 +11814,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CampaignsResourceApi res = new api.DfareportingApi(mock).campaigns;
       var arg_request = buildCampaign();
       var arg_profileId = "foo";
@@ -11829,7 +11864,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCampaign());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_profileId, arg_id).then(unittest.expectAsync(((api.Campaign response) {
         checkCampaign(response);
@@ -11838,7 +11873,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CampaignsResourceApi res = new api.DfareportingApi(mock).campaigns;
       var arg_request = buildCampaign();
       var arg_profileId = "foo";
@@ -11886,7 +11921,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCampaign());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_profileId).then(unittest.expectAsync(((api.Campaign response) {
         checkCampaign(response);
@@ -11899,7 +11934,7 @@
   unittest.group("resource-ChangeLogsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ChangeLogsResourceApi res = new api.DfareportingApi(mock).changeLogs;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -11947,7 +11982,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChangeLog());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.ChangeLog response) {
         checkChangeLog(response);
@@ -11956,19 +11991,19 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ChangeLogsResourceApi res = new api.DfareportingApi(mock).changeLogs;
       var arg_profileId = "foo";
       var arg_action = "foo";
-      var arg_ids = buildUnnamed463();
+      var arg_ids = buildUnnamed876();
       var arg_maxChangeTime = "foo";
       var arg_maxResults = 42;
       var arg_minChangeTime = "foo";
-      var arg_objectIds = buildUnnamed464();
+      var arg_objectIds = buildUnnamed877();
       var arg_objectType = "foo";
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
-      var arg_userProfileIds = buildUnnamed465();
+      var arg_userProfileIds = buildUnnamed878();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -12020,7 +12055,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChangeLogsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, action: arg_action, ids: arg_ids, maxChangeTime: arg_maxChangeTime, maxResults: arg_maxResults, minChangeTime: arg_minChangeTime, objectIds: arg_objectIds, objectType: arg_objectType, pageToken: arg_pageToken, searchString: arg_searchString, userProfileIds: arg_userProfileIds).then(unittest.expectAsync(((api.ChangeLogsListResponse response) {
         checkChangeLogsListResponse(response);
@@ -12033,13 +12068,13 @@
   unittest.group("resource-CitiesResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CitiesResourceApi res = new api.DfareportingApi(mock).cities;
       var arg_profileId = "foo";
-      var arg_countryDartIds = buildUnnamed466();
-      var arg_dartIds = buildUnnamed467();
+      var arg_countryDartIds = buildUnnamed879();
+      var arg_dartIds = buildUnnamed880();
       var arg_namePrefix = "foo";
-      var arg_regionDartIds = buildUnnamed468();
+      var arg_regionDartIds = buildUnnamed881();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -12085,7 +12120,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCitiesListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, countryDartIds: arg_countryDartIds, dartIds: arg_dartIds, namePrefix: arg_namePrefix, regionDartIds: arg_regionDartIds).then(unittest.expectAsync(((api.CitiesListResponse response) {
         checkCitiesListResponse(response);
@@ -12098,7 +12133,7 @@
   unittest.group("resource-ConnectionTypesResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ConnectionTypesResourceApi res = new api.DfareportingApi(mock).connectionTypes;
       var arg_profileId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -12142,7 +12177,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildConnectionTypesListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId).then(unittest.expectAsync(((api.ConnectionTypesListResponse response) {
         checkConnectionTypesListResponse(response);
@@ -12155,7 +12190,7 @@
   unittest.group("resource-ContentCategoriesResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ContentCategoriesResourceApi res = new api.DfareportingApi(mock).contentCategories;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -12203,14 +12238,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_profileId, arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ContentCategoriesResourceApi res = new api.DfareportingApi(mock).contentCategories;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -12258,7 +12293,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildContentCategory());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.ContentCategory response) {
         checkContentCategory(response);
@@ -12267,7 +12302,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ContentCategoriesResourceApi res = new api.DfareportingApi(mock).contentCategories;
       var arg_request = buildContentCategory();
       var arg_profileId = "foo";
@@ -12315,7 +12350,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildContentCategory());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_profileId).then(unittest.expectAsync(((api.ContentCategory response) {
         checkContentCategory(response);
@@ -12324,10 +12359,10 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ContentCategoriesResourceApi res = new api.DfareportingApi(mock).contentCategories;
       var arg_profileId = "foo";
-      var arg_ids = buildUnnamed469();
+      var arg_ids = buildUnnamed882();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -12380,7 +12415,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildContentCategoriesListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, ids: arg_ids, maxResults: arg_maxResults, pageToken: arg_pageToken, searchString: arg_searchString, sortField: arg_sortField, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.ContentCategoriesListResponse response) {
         checkContentCategoriesListResponse(response);
@@ -12389,7 +12424,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ContentCategoriesResourceApi res = new api.DfareportingApi(mock).contentCategories;
       var arg_request = buildContentCategory();
       var arg_profileId = "foo";
@@ -12439,7 +12474,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildContentCategory());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_profileId, arg_id).then(unittest.expectAsync(((api.ContentCategory response) {
         checkContentCategory(response);
@@ -12448,7 +12483,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ContentCategoriesResourceApi res = new api.DfareportingApi(mock).contentCategories;
       var arg_request = buildContentCategory();
       var arg_profileId = "foo";
@@ -12496,7 +12531,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildContentCategory());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_profileId).then(unittest.expectAsync(((api.ContentCategory response) {
         checkContentCategory(response);
@@ -12509,7 +12544,7 @@
   unittest.group("resource-CountriesResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CountriesResourceApi res = new api.DfareportingApi(mock).countries;
       var arg_profileId = "foo";
       var arg_dartId = "foo";
@@ -12557,7 +12592,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCountry());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_dartId).then(unittest.expectAsync(((api.Country response) {
         checkCountry(response);
@@ -12566,7 +12601,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CountriesResourceApi res = new api.DfareportingApi(mock).countries;
       var arg_profileId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -12610,7 +12645,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCountriesListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId).then(unittest.expectAsync(((api.CountriesListResponse response) {
         checkCountriesListResponse(response);
@@ -12625,7 +12660,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativeAssetsResourceApi res = new api.DfareportingApi(mock).creativeAssets;
       var arg_request = buildCreativeAssetMetadata();
       var arg_profileId = "foo";
@@ -12681,7 +12716,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreativeAssetMetadata());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_profileId, arg_advertiserId).then(unittest.expectAsync(((api.CreativeAssetMetadata response) {
         checkCreativeAssetMetadata(response);
@@ -12694,7 +12729,7 @@
   unittest.group("resource-CreativeFieldValuesResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativeFieldValuesResourceApi res = new api.DfareportingApi(mock).creativeFieldValues;
       var arg_profileId = "foo";
       var arg_creativeFieldId = "foo";
@@ -12750,14 +12785,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_profileId, arg_creativeFieldId, arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativeFieldValuesResourceApi res = new api.DfareportingApi(mock).creativeFieldValues;
       var arg_profileId = "foo";
       var arg_creativeFieldId = "foo";
@@ -12813,7 +12848,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreativeFieldValue());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_creativeFieldId, arg_id).then(unittest.expectAsync(((api.CreativeFieldValue response) {
         checkCreativeFieldValue(response);
@@ -12822,7 +12857,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativeFieldValuesResourceApi res = new api.DfareportingApi(mock).creativeFieldValues;
       var arg_request = buildCreativeFieldValue();
       var arg_profileId = "foo";
@@ -12878,7 +12913,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreativeFieldValue());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_profileId, arg_creativeFieldId).then(unittest.expectAsync(((api.CreativeFieldValue response) {
         checkCreativeFieldValue(response);
@@ -12887,11 +12922,11 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativeFieldValuesResourceApi res = new api.DfareportingApi(mock).creativeFieldValues;
       var arg_profileId = "foo";
       var arg_creativeFieldId = "foo";
-      var arg_ids = buildUnnamed470();
+      var arg_ids = buildUnnamed883();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -12951,7 +12986,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreativeFieldValuesListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, arg_creativeFieldId, ids: arg_ids, maxResults: arg_maxResults, pageToken: arg_pageToken, searchString: arg_searchString, sortField: arg_sortField, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.CreativeFieldValuesListResponse response) {
         checkCreativeFieldValuesListResponse(response);
@@ -12960,7 +12995,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativeFieldValuesResourceApi res = new api.DfareportingApi(mock).creativeFieldValues;
       var arg_request = buildCreativeFieldValue();
       var arg_profileId = "foo";
@@ -13018,7 +13053,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreativeFieldValue());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_profileId, arg_creativeFieldId, arg_id).then(unittest.expectAsync(((api.CreativeFieldValue response) {
         checkCreativeFieldValue(response);
@@ -13027,7 +13062,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativeFieldValuesResourceApi res = new api.DfareportingApi(mock).creativeFieldValues;
       var arg_request = buildCreativeFieldValue();
       var arg_profileId = "foo";
@@ -13083,7 +13118,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreativeFieldValue());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_profileId, arg_creativeFieldId).then(unittest.expectAsync(((api.CreativeFieldValue response) {
         checkCreativeFieldValue(response);
@@ -13096,7 +13131,7 @@
   unittest.group("resource-CreativeFieldsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativeFieldsResourceApi res = new api.DfareportingApi(mock).creativeFields;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -13144,14 +13179,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_profileId, arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativeFieldsResourceApi res = new api.DfareportingApi(mock).creativeFields;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -13199,7 +13234,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreativeField());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.CreativeField response) {
         checkCreativeField(response);
@@ -13208,7 +13243,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativeFieldsResourceApi res = new api.DfareportingApi(mock).creativeFields;
       var arg_request = buildCreativeField();
       var arg_profileId = "foo";
@@ -13256,7 +13291,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreativeField());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_profileId).then(unittest.expectAsync(((api.CreativeField response) {
         checkCreativeField(response);
@@ -13265,11 +13300,11 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativeFieldsResourceApi res = new api.DfareportingApi(mock).creativeFields;
       var arg_profileId = "foo";
-      var arg_advertiserIds = buildUnnamed471();
-      var arg_ids = buildUnnamed472();
+      var arg_advertiserIds = buildUnnamed884();
+      var arg_ids = buildUnnamed885();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -13323,7 +13358,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreativeFieldsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, advertiserIds: arg_advertiserIds, ids: arg_ids, maxResults: arg_maxResults, pageToken: arg_pageToken, searchString: arg_searchString, sortField: arg_sortField, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.CreativeFieldsListResponse response) {
         checkCreativeFieldsListResponse(response);
@@ -13332,7 +13367,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativeFieldsResourceApi res = new api.DfareportingApi(mock).creativeFields;
       var arg_request = buildCreativeField();
       var arg_profileId = "foo";
@@ -13382,7 +13417,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreativeField());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_profileId, arg_id).then(unittest.expectAsync(((api.CreativeField response) {
         checkCreativeField(response);
@@ -13391,7 +13426,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativeFieldsResourceApi res = new api.DfareportingApi(mock).creativeFields;
       var arg_request = buildCreativeField();
       var arg_profileId = "foo";
@@ -13439,7 +13474,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreativeField());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_profileId).then(unittest.expectAsync(((api.CreativeField response) {
         checkCreativeField(response);
@@ -13452,7 +13487,7 @@
   unittest.group("resource-CreativeGroupsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativeGroupsResourceApi res = new api.DfareportingApi(mock).creativeGroups;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -13500,7 +13535,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreativeGroup());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.CreativeGroup response) {
         checkCreativeGroup(response);
@@ -13509,7 +13544,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativeGroupsResourceApi res = new api.DfareportingApi(mock).creativeGroups;
       var arg_request = buildCreativeGroup();
       var arg_profileId = "foo";
@@ -13557,7 +13592,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreativeGroup());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_profileId).then(unittest.expectAsync(((api.CreativeGroup response) {
         checkCreativeGroup(response);
@@ -13566,12 +13601,12 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativeGroupsResourceApi res = new api.DfareportingApi(mock).creativeGroups;
       var arg_profileId = "foo";
-      var arg_advertiserIds = buildUnnamed473();
+      var arg_advertiserIds = buildUnnamed886();
       var arg_groupNumber = 42;
-      var arg_ids = buildUnnamed474();
+      var arg_ids = buildUnnamed887();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -13626,7 +13661,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreativeGroupsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, advertiserIds: arg_advertiserIds, groupNumber: arg_groupNumber, ids: arg_ids, maxResults: arg_maxResults, pageToken: arg_pageToken, searchString: arg_searchString, sortField: arg_sortField, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.CreativeGroupsListResponse response) {
         checkCreativeGroupsListResponse(response);
@@ -13635,7 +13670,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativeGroupsResourceApi res = new api.DfareportingApi(mock).creativeGroups;
       var arg_request = buildCreativeGroup();
       var arg_profileId = "foo";
@@ -13685,7 +13720,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreativeGroup());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_profileId, arg_id).then(unittest.expectAsync(((api.CreativeGroup response) {
         checkCreativeGroup(response);
@@ -13694,7 +13729,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativeGroupsResourceApi res = new api.DfareportingApi(mock).creativeGroups;
       var arg_request = buildCreativeGroup();
       var arg_profileId = "foo";
@@ -13742,7 +13777,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreativeGroup());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_profileId).then(unittest.expectAsync(((api.CreativeGroup response) {
         checkCreativeGroup(response);
@@ -13755,7 +13790,7 @@
   unittest.group("resource-CreativesResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativesResourceApi res = new api.DfareportingApi(mock).creatives;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -13803,7 +13838,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreative());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.Creative response) {
         checkCreative(response);
@@ -13812,7 +13847,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativesResourceApi res = new api.DfareportingApi(mock).creatives;
       var arg_request = buildCreative();
       var arg_profileId = "foo";
@@ -13860,7 +13895,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreative());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_profileId).then(unittest.expectAsync(((api.Creative response) {
         checkCreative(response);
@@ -13869,25 +13904,25 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativesResourceApi res = new api.DfareportingApi(mock).creatives;
       var arg_profileId = "foo";
       var arg_active = true;
       var arg_advertiserId = "foo";
       var arg_archived = true;
       var arg_campaignId = "foo";
-      var arg_companionCreativeIds = buildUnnamed475();
-      var arg_creativeFieldIds = buildUnnamed476();
-      var arg_ids = buildUnnamed477();
+      var arg_companionCreativeIds = buildUnnamed888();
+      var arg_creativeFieldIds = buildUnnamed889();
+      var arg_ids = buildUnnamed890();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
-      var arg_renderingIds = buildUnnamed478();
+      var arg_renderingIds = buildUnnamed891();
       var arg_searchString = "foo";
-      var arg_sizeIds = buildUnnamed479();
+      var arg_sizeIds = buildUnnamed892();
       var arg_sortField = "foo";
       var arg_sortOrder = "foo";
       var arg_studioCreativeId = "foo";
-      var arg_types = buildUnnamed480();
+      var arg_types = buildUnnamed893();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -13945,7 +13980,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreativesListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, active: arg_active, advertiserId: arg_advertiserId, archived: arg_archived, campaignId: arg_campaignId, companionCreativeIds: arg_companionCreativeIds, creativeFieldIds: arg_creativeFieldIds, ids: arg_ids, maxResults: arg_maxResults, pageToken: arg_pageToken, renderingIds: arg_renderingIds, searchString: arg_searchString, sizeIds: arg_sizeIds, sortField: arg_sortField, sortOrder: arg_sortOrder, studioCreativeId: arg_studioCreativeId, types: arg_types).then(unittest.expectAsync(((api.CreativesListResponse response) {
         checkCreativesListResponse(response);
@@ -13954,7 +13989,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativesResourceApi res = new api.DfareportingApi(mock).creatives;
       var arg_request = buildCreative();
       var arg_profileId = "foo";
@@ -14004,7 +14039,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreative());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_profileId, arg_id).then(unittest.expectAsync(((api.Creative response) {
         checkCreative(response);
@@ -14013,7 +14048,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CreativesResourceApi res = new api.DfareportingApi(mock).creatives;
       var arg_request = buildCreative();
       var arg_profileId = "foo";
@@ -14061,7 +14096,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreative());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_profileId).then(unittest.expectAsync(((api.Creative response) {
         checkCreative(response);
@@ -14074,7 +14109,7 @@
   unittest.group("resource-DimensionValuesResourceApi", () {
     unittest.test("method--query", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DimensionValuesResourceApi res = new api.DfareportingApi(mock).dimensionValues;
       var arg_request = buildDimensionValueRequest();
       var arg_profileId = "foo";
@@ -14126,7 +14161,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDimensionValueList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.query(arg_request, arg_profileId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.DimensionValueList response) {
         checkDimensionValueList(response);
@@ -14139,7 +14174,7 @@
   unittest.group("resource-DirectorySiteContactsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DirectorySiteContactsResourceApi res = new api.DfareportingApi(mock).directorySiteContacts;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -14187,7 +14222,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDirectorySiteContact());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.DirectorySiteContact response) {
         checkDirectorySiteContact(response);
@@ -14196,11 +14231,11 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DirectorySiteContactsResourceApi res = new api.DfareportingApi(mock).directorySiteContacts;
       var arg_profileId = "foo";
-      var arg_directorySiteIds = buildUnnamed481();
-      var arg_ids = buildUnnamed482();
+      var arg_directorySiteIds = buildUnnamed894();
+      var arg_ids = buildUnnamed895();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -14254,7 +14289,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDirectorySiteContactsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, directorySiteIds: arg_directorySiteIds, ids: arg_ids, maxResults: arg_maxResults, pageToken: arg_pageToken, searchString: arg_searchString, sortField: arg_sortField, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.DirectorySiteContactsListResponse response) {
         checkDirectorySiteContactsListResponse(response);
@@ -14267,7 +14302,7 @@
   unittest.group("resource-DirectorySitesResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DirectorySitesResourceApi res = new api.DfareportingApi(mock).directorySites;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -14315,7 +14350,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDirectorySite());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.DirectorySite response) {
         checkDirectorySite(response);
@@ -14324,7 +14359,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DirectorySitesResourceApi res = new api.DfareportingApi(mock).directorySites;
       var arg_profileId = "foo";
       var arg_acceptsInStreamVideoPlacements = true;
@@ -14333,7 +14368,7 @@
       var arg_active = true;
       var arg_countryId = "foo";
       var arg_dfpNetworkCode = "foo";
-      var arg_ids = buildUnnamed483();
+      var arg_ids = buildUnnamed896();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_parentId = "foo";
@@ -14394,7 +14429,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDirectorySitesListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, acceptsInStreamVideoPlacements: arg_acceptsInStreamVideoPlacements, acceptsInterstitialPlacements: arg_acceptsInterstitialPlacements, acceptsPublisherPaidPlacements: arg_acceptsPublisherPaidPlacements, active: arg_active, countryId: arg_countryId, dfpNetworkCode: arg_dfpNetworkCode, ids: arg_ids, maxResults: arg_maxResults, pageToken: arg_pageToken, parentId: arg_parentId, searchString: arg_searchString, sortField: arg_sortField, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.DirectorySitesListResponse response) {
         checkDirectorySitesListResponse(response);
@@ -14407,7 +14442,7 @@
   unittest.group("resource-EventTagsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EventTagsResourceApi res = new api.DfareportingApi(mock).eventTags;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -14455,14 +14490,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_profileId, arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EventTagsResourceApi res = new api.DfareportingApi(mock).eventTags;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -14510,7 +14545,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEventTag());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.EventTag response) {
         checkEventTag(response);
@@ -14519,7 +14554,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EventTagsResourceApi res = new api.DfareportingApi(mock).eventTags;
       var arg_request = buildEventTag();
       var arg_profileId = "foo";
@@ -14567,7 +14602,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEventTag());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_profileId).then(unittest.expectAsync(((api.EventTag response) {
         checkEventTag(response);
@@ -14576,7 +14611,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EventTagsResourceApi res = new api.DfareportingApi(mock).eventTags;
       var arg_profileId = "foo";
       var arg_adId = "foo";
@@ -14584,8 +14619,8 @@
       var arg_campaignId = "foo";
       var arg_definitionsOnly = true;
       var arg_enabled = true;
-      var arg_eventTagTypes = buildUnnamed484();
-      var arg_ids = buildUnnamed485();
+      var arg_eventTagTypes = buildUnnamed897();
+      var arg_ids = buildUnnamed898();
       var arg_searchString = "foo";
       var arg_sortField = "foo";
       var arg_sortOrder = "foo";
@@ -14640,7 +14675,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEventTagsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, adId: arg_adId, advertiserId: arg_advertiserId, campaignId: arg_campaignId, definitionsOnly: arg_definitionsOnly, enabled: arg_enabled, eventTagTypes: arg_eventTagTypes, ids: arg_ids, searchString: arg_searchString, sortField: arg_sortField, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.EventTagsListResponse response) {
         checkEventTagsListResponse(response);
@@ -14649,7 +14684,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EventTagsResourceApi res = new api.DfareportingApi(mock).eventTags;
       var arg_request = buildEventTag();
       var arg_profileId = "foo";
@@ -14699,7 +14734,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEventTag());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_profileId, arg_id).then(unittest.expectAsync(((api.EventTag response) {
         checkEventTag(response);
@@ -14708,7 +14743,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EventTagsResourceApi res = new api.DfareportingApi(mock).eventTags;
       var arg_request = buildEventTag();
       var arg_profileId = "foo";
@@ -14756,7 +14791,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEventTag());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_profileId).then(unittest.expectAsync(((api.EventTag response) {
         checkEventTag(response);
@@ -14771,7 +14806,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FilesResourceApi res = new api.DfareportingApi(mock).files;
       var arg_reportId = "foo";
       var arg_fileId = "foo";
@@ -14819,7 +14854,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_reportId, arg_fileId).then(unittest.expectAsync(((api.File response) {
         checkFile(response);
@@ -14828,7 +14863,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FilesResourceApi res = new api.DfareportingApi(mock).files;
       var arg_profileId = "foo";
       var arg_maxResults = 42;
@@ -14882,7 +14917,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFileList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, maxResults: arg_maxResults, pageToken: arg_pageToken, scope: arg_scope, sortField: arg_sortField, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.FileList response) {
         checkFileList(response);
@@ -14895,7 +14930,7 @@
   unittest.group("resource-FloodlightActivitiesResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FloodlightActivitiesResourceApi res = new api.DfareportingApi(mock).floodlightActivities;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -14943,14 +14978,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_profileId, arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--generatetag", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FloodlightActivitiesResourceApi res = new api.DfareportingApi(mock).floodlightActivities;
       var arg_profileId = "foo";
       var arg_floodlightActivityId = "foo";
@@ -14996,7 +15031,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFloodlightActivitiesGenerateTagResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.generatetag(arg_profileId, floodlightActivityId: arg_floodlightActivityId).then(unittest.expectAsync(((api.FloodlightActivitiesGenerateTagResponse response) {
         checkFloodlightActivitiesGenerateTagResponse(response);
@@ -15005,7 +15040,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FloodlightActivitiesResourceApi res = new api.DfareportingApi(mock).floodlightActivities;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -15053,7 +15088,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFloodlightActivity());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.FloodlightActivity response) {
         checkFloodlightActivity(response);
@@ -15062,7 +15097,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FloodlightActivitiesResourceApi res = new api.DfareportingApi(mock).floodlightActivities;
       var arg_request = buildFloodlightActivity();
       var arg_profileId = "foo";
@@ -15110,7 +15145,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFloodlightActivity());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_profileId).then(unittest.expectAsync(((api.FloodlightActivity response) {
         checkFloodlightActivity(response);
@@ -15119,16 +15154,16 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FloodlightActivitiesResourceApi res = new api.DfareportingApi(mock).floodlightActivities;
       var arg_profileId = "foo";
       var arg_advertiserId = "foo";
-      var arg_floodlightActivityGroupIds = buildUnnamed486();
+      var arg_floodlightActivityGroupIds = buildUnnamed899();
       var arg_floodlightActivityGroupName = "foo";
       var arg_floodlightActivityGroupTagString = "foo";
       var arg_floodlightActivityGroupType = "foo";
       var arg_floodlightConfigurationId = "foo";
-      var arg_ids = buildUnnamed487();
+      var arg_ids = buildUnnamed900();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -15189,7 +15224,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFloodlightActivitiesListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, advertiserId: arg_advertiserId, floodlightActivityGroupIds: arg_floodlightActivityGroupIds, floodlightActivityGroupName: arg_floodlightActivityGroupName, floodlightActivityGroupTagString: arg_floodlightActivityGroupTagString, floodlightActivityGroupType: arg_floodlightActivityGroupType, floodlightConfigurationId: arg_floodlightConfigurationId, ids: arg_ids, maxResults: arg_maxResults, pageToken: arg_pageToken, searchString: arg_searchString, sortField: arg_sortField, sortOrder: arg_sortOrder, tagString: arg_tagString).then(unittest.expectAsync(((api.FloodlightActivitiesListResponse response) {
         checkFloodlightActivitiesListResponse(response);
@@ -15198,7 +15233,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FloodlightActivitiesResourceApi res = new api.DfareportingApi(mock).floodlightActivities;
       var arg_request = buildFloodlightActivity();
       var arg_profileId = "foo";
@@ -15248,7 +15283,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFloodlightActivity());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_profileId, arg_id).then(unittest.expectAsync(((api.FloodlightActivity response) {
         checkFloodlightActivity(response);
@@ -15257,7 +15292,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FloodlightActivitiesResourceApi res = new api.DfareportingApi(mock).floodlightActivities;
       var arg_request = buildFloodlightActivity();
       var arg_profileId = "foo";
@@ -15305,7 +15340,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFloodlightActivity());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_profileId).then(unittest.expectAsync(((api.FloodlightActivity response) {
         checkFloodlightActivity(response);
@@ -15318,7 +15353,7 @@
   unittest.group("resource-FloodlightActivityGroupsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FloodlightActivityGroupsResourceApi res = new api.DfareportingApi(mock).floodlightActivityGroups;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -15366,14 +15401,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_profileId, arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FloodlightActivityGroupsResourceApi res = new api.DfareportingApi(mock).floodlightActivityGroups;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -15421,7 +15456,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFloodlightActivityGroup());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.FloodlightActivityGroup response) {
         checkFloodlightActivityGroup(response);
@@ -15430,7 +15465,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FloodlightActivityGroupsResourceApi res = new api.DfareportingApi(mock).floodlightActivityGroups;
       var arg_request = buildFloodlightActivityGroup();
       var arg_profileId = "foo";
@@ -15478,7 +15513,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFloodlightActivityGroup());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_profileId).then(unittest.expectAsync(((api.FloodlightActivityGroup response) {
         checkFloodlightActivityGroup(response);
@@ -15487,12 +15522,12 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FloodlightActivityGroupsResourceApi res = new api.DfareportingApi(mock).floodlightActivityGroups;
       var arg_profileId = "foo";
       var arg_advertiserId = "foo";
       var arg_floodlightConfigurationId = "foo";
-      var arg_ids = buildUnnamed488();
+      var arg_ids = buildUnnamed901();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -15549,7 +15584,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFloodlightActivityGroupsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, advertiserId: arg_advertiserId, floodlightConfigurationId: arg_floodlightConfigurationId, ids: arg_ids, maxResults: arg_maxResults, pageToken: arg_pageToken, searchString: arg_searchString, sortField: arg_sortField, sortOrder: arg_sortOrder, type: arg_type).then(unittest.expectAsync(((api.FloodlightActivityGroupsListResponse response) {
         checkFloodlightActivityGroupsListResponse(response);
@@ -15558,7 +15593,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FloodlightActivityGroupsResourceApi res = new api.DfareportingApi(mock).floodlightActivityGroups;
       var arg_request = buildFloodlightActivityGroup();
       var arg_profileId = "foo";
@@ -15608,7 +15643,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFloodlightActivityGroup());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_profileId, arg_id).then(unittest.expectAsync(((api.FloodlightActivityGroup response) {
         checkFloodlightActivityGroup(response);
@@ -15617,7 +15652,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FloodlightActivityGroupsResourceApi res = new api.DfareportingApi(mock).floodlightActivityGroups;
       var arg_request = buildFloodlightActivityGroup();
       var arg_profileId = "foo";
@@ -15665,7 +15700,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFloodlightActivityGroup());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_profileId).then(unittest.expectAsync(((api.FloodlightActivityGroup response) {
         checkFloodlightActivityGroup(response);
@@ -15678,7 +15713,7 @@
   unittest.group("resource-FloodlightConfigurationsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FloodlightConfigurationsResourceApi res = new api.DfareportingApi(mock).floodlightConfigurations;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -15726,7 +15761,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFloodlightConfiguration());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.FloodlightConfiguration response) {
         checkFloodlightConfiguration(response);
@@ -15735,10 +15770,10 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FloodlightConfigurationsResourceApi res = new api.DfareportingApi(mock).floodlightConfigurations;
       var arg_profileId = "foo";
-      var arg_ids = buildUnnamed489();
+      var arg_ids = buildUnnamed902();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -15781,7 +15816,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFloodlightConfigurationsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, ids: arg_ids).then(unittest.expectAsync(((api.FloodlightConfigurationsListResponse response) {
         checkFloodlightConfigurationsListResponse(response);
@@ -15790,7 +15825,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FloodlightConfigurationsResourceApi res = new api.DfareportingApi(mock).floodlightConfigurations;
       var arg_request = buildFloodlightConfiguration();
       var arg_profileId = "foo";
@@ -15840,7 +15875,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFloodlightConfiguration());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_profileId, arg_id).then(unittest.expectAsync(((api.FloodlightConfiguration response) {
         checkFloodlightConfiguration(response);
@@ -15849,7 +15884,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FloodlightConfigurationsResourceApi res = new api.DfareportingApi(mock).floodlightConfigurations;
       var arg_request = buildFloodlightConfiguration();
       var arg_profileId = "foo";
@@ -15897,7 +15932,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFloodlightConfiguration());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_profileId).then(unittest.expectAsync(((api.FloodlightConfiguration response) {
         checkFloodlightConfiguration(response);
@@ -15910,7 +15945,7 @@
   unittest.group("resource-LandingPagesResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LandingPagesResourceApi res = new api.DfareportingApi(mock).landingPages;
       var arg_profileId = "foo";
       var arg_campaignId = "foo";
@@ -15966,14 +16001,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_profileId, arg_campaignId, arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LandingPagesResourceApi res = new api.DfareportingApi(mock).landingPages;
       var arg_profileId = "foo";
       var arg_campaignId = "foo";
@@ -16029,7 +16064,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLandingPage());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_campaignId, arg_id).then(unittest.expectAsync(((api.LandingPage response) {
         checkLandingPage(response);
@@ -16038,7 +16073,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LandingPagesResourceApi res = new api.DfareportingApi(mock).landingPages;
       var arg_request = buildLandingPage();
       var arg_profileId = "foo";
@@ -16094,7 +16129,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLandingPage());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_profileId, arg_campaignId).then(unittest.expectAsync(((api.LandingPage response) {
         checkLandingPage(response);
@@ -16103,7 +16138,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LandingPagesResourceApi res = new api.DfareportingApi(mock).landingPages;
       var arg_profileId = "foo";
       var arg_campaignId = "foo";
@@ -16155,7 +16190,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLandingPagesListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, arg_campaignId).then(unittest.expectAsync(((api.LandingPagesListResponse response) {
         checkLandingPagesListResponse(response);
@@ -16164,7 +16199,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LandingPagesResourceApi res = new api.DfareportingApi(mock).landingPages;
       var arg_request = buildLandingPage();
       var arg_profileId = "foo";
@@ -16222,7 +16257,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLandingPage());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_profileId, arg_campaignId, arg_id).then(unittest.expectAsync(((api.LandingPage response) {
         checkLandingPage(response);
@@ -16231,7 +16266,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LandingPagesResourceApi res = new api.DfareportingApi(mock).landingPages;
       var arg_request = buildLandingPage();
       var arg_profileId = "foo";
@@ -16287,7 +16322,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLandingPage());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_profileId, arg_campaignId).then(unittest.expectAsync(((api.LandingPage response) {
         checkLandingPage(response);
@@ -16300,7 +16335,7 @@
   unittest.group("resource-MetrosResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MetrosResourceApi res = new api.DfareportingApi(mock).metros;
       var arg_profileId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -16344,7 +16379,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMetrosListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId).then(unittest.expectAsync(((api.MetrosListResponse response) {
         checkMetrosListResponse(response);
@@ -16357,7 +16392,7 @@
   unittest.group("resource-MobileCarriersResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MobileCarriersResourceApi res = new api.DfareportingApi(mock).mobileCarriers;
       var arg_profileId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -16401,7 +16436,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMobileCarriersListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId).then(unittest.expectAsync(((api.MobileCarriersListResponse response) {
         checkMobileCarriersListResponse(response);
@@ -16414,7 +16449,7 @@
   unittest.group("resource-OperatingSystemVersionsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.OperatingSystemVersionsResourceApi res = new api.DfareportingApi(mock).operatingSystemVersions;
       var arg_profileId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -16458,7 +16493,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperatingSystemVersionsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId).then(unittest.expectAsync(((api.OperatingSystemVersionsListResponse response) {
         checkOperatingSystemVersionsListResponse(response);
@@ -16471,7 +16506,7 @@
   unittest.group("resource-OperatingSystemsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.OperatingSystemsResourceApi res = new api.DfareportingApi(mock).operatingSystems;
       var arg_profileId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -16515,7 +16550,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOperatingSystemsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId).then(unittest.expectAsync(((api.OperatingSystemsListResponse response) {
         checkOperatingSystemsListResponse(response);
@@ -16528,7 +16563,7 @@
   unittest.group("resource-PlacementGroupsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlacementGroupsResourceApi res = new api.DfareportingApi(mock).placementGroups;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -16576,7 +16611,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlacementGroup());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.PlacementGroup response) {
         checkPlacementGroup(response);
@@ -16585,7 +16620,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlacementGroupsResourceApi res = new api.DfareportingApi(mock).placementGroups;
       var arg_request = buildPlacementGroup();
       var arg_profileId = "foo";
@@ -16633,7 +16668,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlacementGroup());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_profileId).then(unittest.expectAsync(((api.PlacementGroup response) {
         checkPlacementGroup(response);
@@ -16642,22 +16677,22 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlacementGroupsResourceApi res = new api.DfareportingApi(mock).placementGroups;
       var arg_profileId = "foo";
-      var arg_advertiserIds = buildUnnamed490();
+      var arg_advertiserIds = buildUnnamed903();
       var arg_archived = true;
-      var arg_campaignIds = buildUnnamed491();
-      var arg_contentCategoryIds = buildUnnamed492();
-      var arg_directorySiteIds = buildUnnamed493();
-      var arg_ids = buildUnnamed494();
+      var arg_campaignIds = buildUnnamed904();
+      var arg_contentCategoryIds = buildUnnamed905();
+      var arg_directorySiteIds = buildUnnamed906();
+      var arg_ids = buildUnnamed907();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_placementGroupType = "foo";
-      var arg_placementStrategyIds = buildUnnamed495();
-      var arg_pricingTypes = buildUnnamed496();
+      var arg_placementStrategyIds = buildUnnamed908();
+      var arg_pricingTypes = buildUnnamed909();
       var arg_searchString = "foo";
-      var arg_siteIds = buildUnnamed497();
+      var arg_siteIds = buildUnnamed910();
       var arg_sortField = "foo";
       var arg_sortOrder = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -16716,7 +16751,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlacementGroupsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, advertiserIds: arg_advertiserIds, archived: arg_archived, campaignIds: arg_campaignIds, contentCategoryIds: arg_contentCategoryIds, directorySiteIds: arg_directorySiteIds, ids: arg_ids, maxResults: arg_maxResults, pageToken: arg_pageToken, placementGroupType: arg_placementGroupType, placementStrategyIds: arg_placementStrategyIds, pricingTypes: arg_pricingTypes, searchString: arg_searchString, siteIds: arg_siteIds, sortField: arg_sortField, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.PlacementGroupsListResponse response) {
         checkPlacementGroupsListResponse(response);
@@ -16725,7 +16760,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlacementGroupsResourceApi res = new api.DfareportingApi(mock).placementGroups;
       var arg_request = buildPlacementGroup();
       var arg_profileId = "foo";
@@ -16775,7 +16810,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlacementGroup());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_profileId, arg_id).then(unittest.expectAsync(((api.PlacementGroup response) {
         checkPlacementGroup(response);
@@ -16784,7 +16819,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlacementGroupsResourceApi res = new api.DfareportingApi(mock).placementGroups;
       var arg_request = buildPlacementGroup();
       var arg_profileId = "foo";
@@ -16832,7 +16867,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlacementGroup());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_profileId).then(unittest.expectAsync(((api.PlacementGroup response) {
         checkPlacementGroup(response);
@@ -16845,7 +16880,7 @@
   unittest.group("resource-PlacementStrategiesResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlacementStrategiesResourceApi res = new api.DfareportingApi(mock).placementStrategies;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -16893,14 +16928,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_profileId, arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlacementStrategiesResourceApi res = new api.DfareportingApi(mock).placementStrategies;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -16948,7 +16983,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlacementStrategy());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.PlacementStrategy response) {
         checkPlacementStrategy(response);
@@ -16957,7 +16992,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlacementStrategiesResourceApi res = new api.DfareportingApi(mock).placementStrategies;
       var arg_request = buildPlacementStrategy();
       var arg_profileId = "foo";
@@ -17005,7 +17040,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlacementStrategy());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_profileId).then(unittest.expectAsync(((api.PlacementStrategy response) {
         checkPlacementStrategy(response);
@@ -17014,10 +17049,10 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlacementStrategiesResourceApi res = new api.DfareportingApi(mock).placementStrategies;
       var arg_profileId = "foo";
-      var arg_ids = buildUnnamed498();
+      var arg_ids = buildUnnamed911();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -17070,7 +17105,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlacementStrategiesListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, ids: arg_ids, maxResults: arg_maxResults, pageToken: arg_pageToken, searchString: arg_searchString, sortField: arg_sortField, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.PlacementStrategiesListResponse response) {
         checkPlacementStrategiesListResponse(response);
@@ -17079,7 +17114,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlacementStrategiesResourceApi res = new api.DfareportingApi(mock).placementStrategies;
       var arg_request = buildPlacementStrategy();
       var arg_profileId = "foo";
@@ -17129,7 +17164,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlacementStrategy());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_profileId, arg_id).then(unittest.expectAsync(((api.PlacementStrategy response) {
         checkPlacementStrategy(response);
@@ -17138,7 +17173,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlacementStrategiesResourceApi res = new api.DfareportingApi(mock).placementStrategies;
       var arg_request = buildPlacementStrategy();
       var arg_profileId = "foo";
@@ -17186,7 +17221,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlacementStrategy());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_profileId).then(unittest.expectAsync(((api.PlacementStrategy response) {
         checkPlacementStrategy(response);
@@ -17199,12 +17234,12 @@
   unittest.group("resource-PlacementsResourceApi", () {
     unittest.test("method--generatetags", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlacementsResourceApi res = new api.DfareportingApi(mock).placements;
       var arg_profileId = "foo";
       var arg_campaignId = "foo";
-      var arg_placementIds = buildUnnamed499();
-      var arg_tagFormats = buildUnnamed500();
+      var arg_placementIds = buildUnnamed912();
+      var arg_tagFormats = buildUnnamed913();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -17249,7 +17284,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlacementsGenerateTagsResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.generatetags(arg_profileId, campaignId: arg_campaignId, placementIds: arg_placementIds, tagFormats: arg_tagFormats).then(unittest.expectAsync(((api.PlacementsGenerateTagsResponse response) {
         checkPlacementsGenerateTagsResponse(response);
@@ -17258,7 +17293,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlacementsResourceApi res = new api.DfareportingApi(mock).placements;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -17306,7 +17341,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlacement());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.Placement response) {
         checkPlacement(response);
@@ -17315,7 +17350,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlacementsResourceApi res = new api.DfareportingApi(mock).placements;
       var arg_request = buildPlacement();
       var arg_profileId = "foo";
@@ -17363,7 +17398,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlacement());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_profileId).then(unittest.expectAsync(((api.Placement response) {
         checkPlacement(response);
@@ -17372,25 +17407,25 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlacementsResourceApi res = new api.DfareportingApi(mock).placements;
       var arg_profileId = "foo";
-      var arg_advertiserIds = buildUnnamed501();
+      var arg_advertiserIds = buildUnnamed914();
       var arg_archived = true;
-      var arg_campaignIds = buildUnnamed502();
-      var arg_compatibilities = buildUnnamed503();
-      var arg_contentCategoryIds = buildUnnamed504();
-      var arg_directorySiteIds = buildUnnamed505();
-      var arg_groupIds = buildUnnamed506();
-      var arg_ids = buildUnnamed507();
+      var arg_campaignIds = buildUnnamed915();
+      var arg_compatibilities = buildUnnamed916();
+      var arg_contentCategoryIds = buildUnnamed917();
+      var arg_directorySiteIds = buildUnnamed918();
+      var arg_groupIds = buildUnnamed919();
+      var arg_ids = buildUnnamed920();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_paymentSource = "foo";
-      var arg_placementStrategyIds = buildUnnamed508();
-      var arg_pricingTypes = buildUnnamed509();
+      var arg_placementStrategyIds = buildUnnamed921();
+      var arg_pricingTypes = buildUnnamed922();
       var arg_searchString = "foo";
-      var arg_siteIds = buildUnnamed510();
-      var arg_sizeIds = buildUnnamed511();
+      var arg_siteIds = buildUnnamed923();
+      var arg_sizeIds = buildUnnamed924();
       var arg_sortField = "foo";
       var arg_sortOrder = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -17452,7 +17487,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlacementsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, advertiserIds: arg_advertiserIds, archived: arg_archived, campaignIds: arg_campaignIds, compatibilities: arg_compatibilities, contentCategoryIds: arg_contentCategoryIds, directorySiteIds: arg_directorySiteIds, groupIds: arg_groupIds, ids: arg_ids, maxResults: arg_maxResults, pageToken: arg_pageToken, paymentSource: arg_paymentSource, placementStrategyIds: arg_placementStrategyIds, pricingTypes: arg_pricingTypes, searchString: arg_searchString, siteIds: arg_siteIds, sizeIds: arg_sizeIds, sortField: arg_sortField, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.PlacementsListResponse response) {
         checkPlacementsListResponse(response);
@@ -17461,7 +17496,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlacementsResourceApi res = new api.DfareportingApi(mock).placements;
       var arg_request = buildPlacement();
       var arg_profileId = "foo";
@@ -17511,7 +17546,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlacement());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_profileId, arg_id).then(unittest.expectAsync(((api.Placement response) {
         checkPlacement(response);
@@ -17520,7 +17555,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlacementsResourceApi res = new api.DfareportingApi(mock).placements;
       var arg_request = buildPlacement();
       var arg_profileId = "foo";
@@ -17568,7 +17603,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlacement());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_profileId).then(unittest.expectAsync(((api.Placement response) {
         checkPlacement(response);
@@ -17581,7 +17616,7 @@
   unittest.group("resource-PlatformTypesResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlatformTypesResourceApi res = new api.DfareportingApi(mock).platformTypes;
       var arg_profileId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -17625,7 +17660,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlatformTypesListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId).then(unittest.expectAsync(((api.PlatformTypesListResponse response) {
         checkPlatformTypesListResponse(response);
@@ -17638,7 +17673,7 @@
   unittest.group("resource-PostalCodesResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PostalCodesResourceApi res = new api.DfareportingApi(mock).postalCodes;
       var arg_profileId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -17682,7 +17717,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPostalCodesListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId).then(unittest.expectAsync(((api.PostalCodesListResponse response) {
         checkPostalCodesListResponse(response);
@@ -17695,7 +17730,7 @@
   unittest.group("resource-RegionsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RegionsResourceApi res = new api.DfareportingApi(mock).regions;
       var arg_profileId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -17739,7 +17774,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRegionsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId).then(unittest.expectAsync(((api.RegionsListResponse response) {
         checkRegionsListResponse(response);
@@ -17752,7 +17787,7 @@
   unittest.group("resource-ReportsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsResourceApi res = new api.DfareportingApi(mock).reports;
       var arg_profileId = "foo";
       var arg_reportId = "foo";
@@ -17800,14 +17835,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_profileId, arg_reportId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsResourceApi res = new api.DfareportingApi(mock).reports;
       var arg_profileId = "foo";
       var arg_reportId = "foo";
@@ -17855,7 +17890,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildReport());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_reportId).then(unittest.expectAsync(((api.Report response) {
         checkReport(response);
@@ -17864,7 +17899,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsResourceApi res = new api.DfareportingApi(mock).reports;
       var arg_request = buildReport();
       var arg_profileId = "foo";
@@ -17912,7 +17947,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildReport());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_profileId).then(unittest.expectAsync(((api.Report response) {
         checkReport(response);
@@ -17921,7 +17956,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsResourceApi res = new api.DfareportingApi(mock).reports;
       var arg_profileId = "foo";
       var arg_maxResults = 42;
@@ -17975,7 +18010,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildReportList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, maxResults: arg_maxResults, pageToken: arg_pageToken, scope: arg_scope, sortField: arg_sortField, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.ReportList response) {
         checkReportList(response);
@@ -17984,7 +18019,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsResourceApi res = new api.DfareportingApi(mock).reports;
       var arg_request = buildReport();
       var arg_profileId = "foo";
@@ -18036,7 +18071,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildReport());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_profileId, arg_reportId).then(unittest.expectAsync(((api.Report response) {
         checkReport(response);
@@ -18045,7 +18080,7 @@
 
     unittest.test("method--run", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsResourceApi res = new api.DfareportingApi(mock).reports;
       var arg_profileId = "foo";
       var arg_reportId = "foo";
@@ -18099,7 +18134,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.run(arg_profileId, arg_reportId, synchronous: arg_synchronous).then(unittest.expectAsync(((api.File response) {
         checkFile(response);
@@ -18108,7 +18143,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsResourceApi res = new api.DfareportingApi(mock).reports;
       var arg_request = buildReport();
       var arg_profileId = "foo";
@@ -18160,7 +18195,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildReport());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_profileId, arg_reportId).then(unittest.expectAsync(((api.Report response) {
         checkReport(response);
@@ -18173,7 +18208,7 @@
   unittest.group("resource-ReportsCompatibleFieldsResourceApi", () {
     unittest.test("method--query", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsCompatibleFieldsResourceApi res = new api.DfareportingApi(mock).reports.compatibleFields;
       var arg_request = buildReport();
       var arg_profileId = "foo";
@@ -18221,7 +18256,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCompatibleFields());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.query(arg_request, arg_profileId).then(unittest.expectAsync(((api.CompatibleFields response) {
         checkCompatibleFields(response);
@@ -18236,7 +18271,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsFilesResourceApi res = new api.DfareportingApi(mock).reports.files;
       var arg_profileId = "foo";
       var arg_reportId = "foo";
@@ -18292,7 +18327,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_reportId, arg_fileId).then(unittest.expectAsync(((api.File response) {
         checkFile(response);
@@ -18301,7 +18336,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsFilesResourceApi res = new api.DfareportingApi(mock).reports.files;
       var arg_profileId = "foo";
       var arg_reportId = "foo";
@@ -18361,7 +18396,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFileList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, arg_reportId, maxResults: arg_maxResults, pageToken: arg_pageToken, sortField: arg_sortField, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.FileList response) {
         checkFileList(response);
@@ -18374,7 +18409,7 @@
   unittest.group("resource-SitesResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SitesResourceApi res = new api.DfareportingApi(mock).sites;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -18422,7 +18457,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSite());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.Site response) {
         checkSite(response);
@@ -18431,7 +18466,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SitesResourceApi res = new api.DfareportingApi(mock).sites;
       var arg_request = buildSite();
       var arg_profileId = "foo";
@@ -18479,7 +18514,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSite());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_profileId).then(unittest.expectAsync(((api.Site response) {
         checkSite(response);
@@ -18488,7 +18523,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SitesResourceApi res = new api.DfareportingApi(mock).sites;
       var arg_profileId = "foo";
       var arg_acceptsInStreamVideoPlacements = true;
@@ -18496,9 +18531,9 @@
       var arg_acceptsPublisherPaidPlacements = true;
       var arg_adWordsSite = true;
       var arg_approved = true;
-      var arg_campaignIds = buildUnnamed512();
-      var arg_directorySiteIds = buildUnnamed513();
-      var arg_ids = buildUnnamed514();
+      var arg_campaignIds = buildUnnamed925();
+      var arg_directorySiteIds = buildUnnamed926();
+      var arg_ids = buildUnnamed927();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -18562,7 +18597,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSitesListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, acceptsInStreamVideoPlacements: arg_acceptsInStreamVideoPlacements, acceptsInterstitialPlacements: arg_acceptsInterstitialPlacements, acceptsPublisherPaidPlacements: arg_acceptsPublisherPaidPlacements, adWordsSite: arg_adWordsSite, approved: arg_approved, campaignIds: arg_campaignIds, directorySiteIds: arg_directorySiteIds, ids: arg_ids, maxResults: arg_maxResults, pageToken: arg_pageToken, searchString: arg_searchString, sortField: arg_sortField, sortOrder: arg_sortOrder, subaccountId: arg_subaccountId, unmappedSite: arg_unmappedSite).then(unittest.expectAsync(((api.SitesListResponse response) {
         checkSitesListResponse(response);
@@ -18571,7 +18606,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SitesResourceApi res = new api.DfareportingApi(mock).sites;
       var arg_request = buildSite();
       var arg_profileId = "foo";
@@ -18621,7 +18656,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSite());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_profileId, arg_id).then(unittest.expectAsync(((api.Site response) {
         checkSite(response);
@@ -18630,7 +18665,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SitesResourceApi res = new api.DfareportingApi(mock).sites;
       var arg_request = buildSite();
       var arg_profileId = "foo";
@@ -18678,7 +18713,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSite());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_profileId).then(unittest.expectAsync(((api.Site response) {
         checkSite(response);
@@ -18691,7 +18726,7 @@
   unittest.group("resource-SizesResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SizesResourceApi res = new api.DfareportingApi(mock).sizes;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -18739,7 +18774,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSize());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.Size response) {
         checkSize(response);
@@ -18748,7 +18783,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SizesResourceApi res = new api.DfareportingApi(mock).sizes;
       var arg_request = buildSize();
       var arg_profileId = "foo";
@@ -18796,7 +18831,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSize());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_profileId).then(unittest.expectAsync(((api.Size response) {
         checkSize(response);
@@ -18805,12 +18840,12 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SizesResourceApi res = new api.DfareportingApi(mock).sizes;
       var arg_profileId = "foo";
       var arg_height = 42;
       var arg_iabStandard = true;
-      var arg_ids = buildUnnamed515();
+      var arg_ids = buildUnnamed928();
       var arg_width = 42;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -18857,7 +18892,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSizesListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, height: arg_height, iabStandard: arg_iabStandard, ids: arg_ids, width: arg_width).then(unittest.expectAsync(((api.SizesListResponse response) {
         checkSizesListResponse(response);
@@ -18870,7 +18905,7 @@
   unittest.group("resource-SubaccountsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SubaccountsResourceApi res = new api.DfareportingApi(mock).subaccounts;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -18918,7 +18953,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSubaccount());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.Subaccount response) {
         checkSubaccount(response);
@@ -18927,7 +18962,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SubaccountsResourceApi res = new api.DfareportingApi(mock).subaccounts;
       var arg_request = buildSubaccount();
       var arg_profileId = "foo";
@@ -18975,7 +19010,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSubaccount());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_profileId).then(unittest.expectAsync(((api.Subaccount response) {
         checkSubaccount(response);
@@ -18984,10 +19019,10 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SubaccountsResourceApi res = new api.DfareportingApi(mock).subaccounts;
       var arg_profileId = "foo";
-      var arg_ids = buildUnnamed516();
+      var arg_ids = buildUnnamed929();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -19040,7 +19075,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSubaccountsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, ids: arg_ids, maxResults: arg_maxResults, pageToken: arg_pageToken, searchString: arg_searchString, sortField: arg_sortField, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.SubaccountsListResponse response) {
         checkSubaccountsListResponse(response);
@@ -19049,7 +19084,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SubaccountsResourceApi res = new api.DfareportingApi(mock).subaccounts;
       var arg_request = buildSubaccount();
       var arg_profileId = "foo";
@@ -19099,7 +19134,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSubaccount());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_profileId, arg_id).then(unittest.expectAsync(((api.Subaccount response) {
         checkSubaccount(response);
@@ -19108,7 +19143,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SubaccountsResourceApi res = new api.DfareportingApi(mock).subaccounts;
       var arg_request = buildSubaccount();
       var arg_profileId = "foo";
@@ -19156,7 +19191,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSubaccount());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_profileId).then(unittest.expectAsync(((api.Subaccount response) {
         checkSubaccount(response);
@@ -19169,7 +19204,7 @@
   unittest.group("resource-UserProfilesResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UserProfilesResourceApi res = new api.DfareportingApi(mock).userProfiles;
       var arg_profileId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -19209,7 +19244,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUserProfile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId).then(unittest.expectAsync(((api.UserProfile response) {
         checkUserProfile(response);
@@ -19218,7 +19253,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UserProfilesResourceApi res = new api.DfareportingApi(mock).userProfiles;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -19254,7 +19289,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUserProfileList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list().then(unittest.expectAsync(((api.UserProfileList response) {
         checkUserProfileList(response);
@@ -19267,7 +19302,7 @@
   unittest.group("resource-UserRolePermissionGroupsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UserRolePermissionGroupsResourceApi res = new api.DfareportingApi(mock).userRolePermissionGroups;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -19315,7 +19350,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUserRolePermissionGroup());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.UserRolePermissionGroup response) {
         checkUserRolePermissionGroup(response);
@@ -19324,7 +19359,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UserRolePermissionGroupsResourceApi res = new api.DfareportingApi(mock).userRolePermissionGroups;
       var arg_profileId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -19368,7 +19403,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUserRolePermissionGroupsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId).then(unittest.expectAsync(((api.UserRolePermissionGroupsListResponse response) {
         checkUserRolePermissionGroupsListResponse(response);
@@ -19381,7 +19416,7 @@
   unittest.group("resource-UserRolePermissionsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UserRolePermissionsResourceApi res = new api.DfareportingApi(mock).userRolePermissions;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -19429,7 +19464,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUserRolePermission());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.UserRolePermission response) {
         checkUserRolePermission(response);
@@ -19438,10 +19473,10 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UserRolePermissionsResourceApi res = new api.DfareportingApi(mock).userRolePermissions;
       var arg_profileId = "foo";
-      var arg_ids = buildUnnamed517();
+      var arg_ids = buildUnnamed930();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -19484,7 +19519,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUserRolePermissionsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, ids: arg_ids).then(unittest.expectAsync(((api.UserRolePermissionsListResponse response) {
         checkUserRolePermissionsListResponse(response);
@@ -19497,7 +19532,7 @@
   unittest.group("resource-UserRolesResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UserRolesResourceApi res = new api.DfareportingApi(mock).userRoles;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -19545,14 +19580,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_profileId, arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UserRolesResourceApi res = new api.DfareportingApi(mock).userRoles;
       var arg_profileId = "foo";
       var arg_id = "foo";
@@ -19600,7 +19635,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUserRole());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_profileId, arg_id).then(unittest.expectAsync(((api.UserRole response) {
         checkUserRole(response);
@@ -19609,7 +19644,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UserRolesResourceApi res = new api.DfareportingApi(mock).userRoles;
       var arg_request = buildUserRole();
       var arg_profileId = "foo";
@@ -19657,7 +19692,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUserRole());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_profileId).then(unittest.expectAsync(((api.UserRole response) {
         checkUserRole(response);
@@ -19666,11 +19701,11 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UserRolesResourceApi res = new api.DfareportingApi(mock).userRoles;
       var arg_profileId = "foo";
       var arg_accountUserRoleOnly = true;
-      var arg_ids = buildUnnamed518();
+      var arg_ids = buildUnnamed931();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -19726,7 +19761,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUserRolesListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_profileId, accountUserRoleOnly: arg_accountUserRoleOnly, ids: arg_ids, maxResults: arg_maxResults, pageToken: arg_pageToken, searchString: arg_searchString, sortField: arg_sortField, sortOrder: arg_sortOrder, subaccountId: arg_subaccountId).then(unittest.expectAsync(((api.UserRolesListResponse response) {
         checkUserRolesListResponse(response);
@@ -19735,7 +19770,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UserRolesResourceApi res = new api.DfareportingApi(mock).userRoles;
       var arg_request = buildUserRole();
       var arg_profileId = "foo";
@@ -19785,7 +19820,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUserRole());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_profileId, arg_id).then(unittest.expectAsync(((api.UserRole response) {
         checkUserRole(response);
@@ -19794,7 +19829,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UserRolesResourceApi res = new api.DfareportingApi(mock).userRoles;
       var arg_request = buildUserRole();
       var arg_profileId = "foo";
@@ -19842,7 +19877,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUserRole());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_profileId).then(unittest.expectAsync(((api.UserRole response) {
         checkUserRole(response);
diff --git a/generated/googleapis/test/discovery/v1_test.dart b/generated/googleapis/test/discovery/v1_test.dart
index 6ce841a..20d94f9 100644
--- a/generated/googleapis/test/discovery/v1_test.dart
+++ b/generated/googleapis/test/discovery/v1_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/discovery/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterDirectoryListItemsIcons = 0;
 buildDirectoryListItemsIcons() {
@@ -37,14 +72,14 @@
   buildCounterDirectoryListItemsIcons--;
 }
 
-buildUnnamed519() {
+buildUnnamed932() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed519(core.List<core.String> o) {
+checkUnnamed932(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -62,7 +97,7 @@
     o.icons = buildDirectoryListItemsIcons();
     o.id = "foo";
     o.kind = "foo";
-    o.labels = buildUnnamed519();
+    o.labels = buildUnnamed932();
     o.name = "foo";
     o.preferred = true;
     o.title = "foo";
@@ -82,7 +117,7 @@
     checkDirectoryListItemsIcons(o.icons);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed519(o.labels);
+    checkUnnamed932(o.labels);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.preferred, unittest.isTrue);
     unittest.expect(o.title, unittest.equals('foo'));
@@ -91,14 +126,14 @@
   buildCounterDirectoryListItems--;
 }
 
-buildUnnamed520() {
+buildUnnamed933() {
   var o = new core.List<api.DirectoryListItems>();
   o.add(buildDirectoryListItems());
   o.add(buildDirectoryListItems());
   return o;
 }
 
-checkUnnamed520(core.List<api.DirectoryListItems> o) {
+checkUnnamed933(core.List<api.DirectoryListItems> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDirectoryListItems(o[0]);
   checkDirectoryListItems(o[1]);
@@ -110,7 +145,7 @@
   buildCounterDirectoryList++;
   if (buildCounterDirectoryList < 3) {
     o.discoveryVersion = "foo";
-    o.items = buildUnnamed520();
+    o.items = buildUnnamed933();
     o.kind = "foo";
   }
   buildCounterDirectoryList--;
@@ -121,20 +156,20 @@
   buildCounterDirectoryList++;
   if (buildCounterDirectoryList < 3) {
     unittest.expect(o.discoveryVersion, unittest.equals('foo'));
-    checkUnnamed520(o.items);
+    checkUnnamed933(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterDirectoryList--;
 }
 
-buildUnnamed521() {
+buildUnnamed934() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed521(core.List<core.String> o) {
+checkUnnamed934(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -145,7 +180,7 @@
   var o = new api.JsonSchemaAnnotations();
   buildCounterJsonSchemaAnnotations++;
   if (buildCounterJsonSchemaAnnotations < 3) {
-    o.required = buildUnnamed521();
+    o.required = buildUnnamed934();
   }
   buildCounterJsonSchemaAnnotations--;
   return o;
@@ -154,45 +189,45 @@
 checkJsonSchemaAnnotations(api.JsonSchemaAnnotations o) {
   buildCounterJsonSchemaAnnotations++;
   if (buildCounterJsonSchemaAnnotations < 3) {
-    checkUnnamed521(o.required);
+    checkUnnamed934(o.required);
   }
   buildCounterJsonSchemaAnnotations--;
 }
 
-buildUnnamed522() {
+buildUnnamed935() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed522(core.List<core.String> o) {
+checkUnnamed935(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed523() {
+buildUnnamed936() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed523(core.List<core.String> o) {
+checkUnnamed936(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed524() {
+buildUnnamed937() {
   var o = new core.Map<core.String, api.JsonSchema>();
   o["x"] = buildJsonSchema();
   o["y"] = buildJsonSchema();
   return o;
 }
 
-checkUnnamed524(core.Map<core.String, api.JsonSchema> o) {
+checkUnnamed937(core.Map<core.String, api.JsonSchema> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkJsonSchema(o["x"]);
   checkJsonSchema(o["y"]);
@@ -219,14 +254,14 @@
   buildCounterJsonSchemaVariantMap--;
 }
 
-buildUnnamed525() {
+buildUnnamed938() {
   var o = new core.List<api.JsonSchemaVariantMap>();
   o.add(buildJsonSchemaVariantMap());
   o.add(buildJsonSchemaVariantMap());
   return o;
 }
 
-checkUnnamed525(core.List<api.JsonSchemaVariantMap> o) {
+checkUnnamed938(core.List<api.JsonSchemaVariantMap> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkJsonSchemaVariantMap(o[0]);
   checkJsonSchemaVariantMap(o[1]);
@@ -238,7 +273,7 @@
   buildCounterJsonSchemaVariant++;
   if (buildCounterJsonSchemaVariant < 3) {
     o.discriminant = "foo";
-    o.map = buildUnnamed525();
+    o.map = buildUnnamed938();
   }
   buildCounterJsonSchemaVariant--;
   return o;
@@ -248,7 +283,7 @@
   buildCounterJsonSchemaVariant++;
   if (buildCounterJsonSchemaVariant < 3) {
     unittest.expect(o.discriminant, unittest.equals('foo'));
-    checkUnnamed525(o.map);
+    checkUnnamed938(o.map);
   }
   buildCounterJsonSchemaVariant--;
 }
@@ -263,8 +298,8 @@
     o.annotations = buildJsonSchemaAnnotations();
     o.default_ = "foo";
     o.description = "foo";
-    o.enum_ = buildUnnamed522();
-    o.enumDescriptions = buildUnnamed523();
+    o.enum_ = buildUnnamed935();
+    o.enumDescriptions = buildUnnamed936();
     o.format = "foo";
     o.id = "foo";
     o.items = buildJsonSchema();
@@ -272,7 +307,7 @@
     o.maximum = "foo";
     o.minimum = "foo";
     o.pattern = "foo";
-    o.properties = buildUnnamed524();
+    o.properties = buildUnnamed937();
     o.readOnly = true;
     o.repeated = true;
     o.required = true;
@@ -291,8 +326,8 @@
     checkJsonSchemaAnnotations(o.annotations);
     unittest.expect(o.default_, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed522(o.enum_);
-    checkUnnamed523(o.enumDescriptions);
+    checkUnnamed935(o.enum_);
+    checkUnnamed936(o.enumDescriptions);
     unittest.expect(o.format, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     checkJsonSchema(o.items);
@@ -300,7 +335,7 @@
     unittest.expect(o.maximum, unittest.equals('foo'));
     unittest.expect(o.minimum, unittest.equals('foo'));
     unittest.expect(o.pattern, unittest.equals('foo'));
-    checkUnnamed524(o.properties);
+    checkUnnamed937(o.properties);
     unittest.expect(o.readOnly, unittest.isTrue);
     unittest.expect(o.repeated, unittest.isTrue);
     unittest.expect(o.required, unittest.isTrue);
@@ -329,14 +364,14 @@
   buildCounterRestDescriptionAuthOauth2ScopesValue--;
 }
 
-buildUnnamed526() {
+buildUnnamed939() {
   var o = new core.Map<core.String, api.RestDescriptionAuthOauth2ScopesValue>();
   o["x"] = buildRestDescriptionAuthOauth2ScopesValue();
   o["y"] = buildRestDescriptionAuthOauth2ScopesValue();
   return o;
 }
 
-checkUnnamed526(core.Map<core.String, api.RestDescriptionAuthOauth2ScopesValue> o) {
+checkUnnamed939(core.Map<core.String, api.RestDescriptionAuthOauth2ScopesValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRestDescriptionAuthOauth2ScopesValue(o["x"]);
   checkRestDescriptionAuthOauth2ScopesValue(o["y"]);
@@ -347,7 +382,7 @@
   var o = new api.RestDescriptionAuthOauth2();
   buildCounterRestDescriptionAuthOauth2++;
   if (buildCounterRestDescriptionAuthOauth2 < 3) {
-    o.scopes = buildUnnamed526();
+    o.scopes = buildUnnamed939();
   }
   buildCounterRestDescriptionAuthOauth2--;
   return o;
@@ -356,7 +391,7 @@
 checkRestDescriptionAuthOauth2(api.RestDescriptionAuthOauth2 o) {
   buildCounterRestDescriptionAuthOauth2++;
   if (buildCounterRestDescriptionAuthOauth2 < 3) {
-    checkUnnamed526(o.scopes);
+    checkUnnamed939(o.scopes);
   }
   buildCounterRestDescriptionAuthOauth2--;
 }
@@ -380,14 +415,14 @@
   buildCounterRestDescriptionAuth--;
 }
 
-buildUnnamed527() {
+buildUnnamed940() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed527(core.List<core.String> o) {
+checkUnnamed940(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -414,66 +449,66 @@
   buildCounterRestDescriptionIcons--;
 }
 
-buildUnnamed528() {
+buildUnnamed941() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed528(core.List<core.String> o) {
+checkUnnamed941(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed529() {
+buildUnnamed942() {
   var o = new core.Map<core.String, api.RestMethod>();
   o["x"] = buildRestMethod();
   o["y"] = buildRestMethod();
   return o;
 }
 
-checkUnnamed529(core.Map<core.String, api.RestMethod> o) {
+checkUnnamed942(core.Map<core.String, api.RestMethod> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRestMethod(o["x"]);
   checkRestMethod(o["y"]);
 }
 
-buildUnnamed530() {
+buildUnnamed943() {
   var o = new core.Map<core.String, api.JsonSchema>();
   o["x"] = buildJsonSchema();
   o["y"] = buildJsonSchema();
   return o;
 }
 
-checkUnnamed530(core.Map<core.String, api.JsonSchema> o) {
+checkUnnamed943(core.Map<core.String, api.JsonSchema> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkJsonSchema(o["x"]);
   checkJsonSchema(o["y"]);
 }
 
-buildUnnamed531() {
+buildUnnamed944() {
   var o = new core.Map<core.String, api.RestResource>();
   o["x"] = buildRestResource();
   o["y"] = buildRestResource();
   return o;
 }
 
-checkUnnamed531(core.Map<core.String, api.RestResource> o) {
+checkUnnamed944(core.Map<core.String, api.RestResource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRestResource(o["x"]);
   checkRestResource(o["y"]);
 }
 
-buildUnnamed532() {
+buildUnnamed945() {
   var o = new core.Map<core.String, api.JsonSchema>();
   o["x"] = buildJsonSchema();
   o["y"] = buildJsonSchema();
   return o;
 }
 
-checkUnnamed532(core.Map<core.String, api.JsonSchema> o) {
+checkUnnamed945(core.Map<core.String, api.JsonSchema> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkJsonSchema(o["x"]);
   checkJsonSchema(o["y"]);
@@ -493,22 +528,22 @@
     o.discoveryVersion = "foo";
     o.documentationLink = "foo";
     o.etag = "foo";
-    o.features = buildUnnamed527();
+    o.features = buildUnnamed940();
     o.icons = buildRestDescriptionIcons();
     o.id = "foo";
     o.kind = "foo";
-    o.labels = buildUnnamed528();
-    o.methods = buildUnnamed529();
+    o.labels = buildUnnamed941();
+    o.methods = buildUnnamed942();
     o.name = "foo";
     o.ownerDomain = "foo";
     o.ownerName = "foo";
     o.packagePath = "foo";
-    o.parameters = buildUnnamed530();
+    o.parameters = buildUnnamed943();
     o.protocol = "foo";
-    o.resources = buildUnnamed531();
+    o.resources = buildUnnamed944();
     o.revision = "foo";
     o.rootUrl = "foo";
-    o.schemas = buildUnnamed532();
+    o.schemas = buildUnnamed945();
     o.servicePath = "foo";
     o.title = "foo";
     o.version = "foo";
@@ -529,22 +564,22 @@
     unittest.expect(o.discoveryVersion, unittest.equals('foo'));
     unittest.expect(o.documentationLink, unittest.equals('foo'));
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed527(o.features);
+    checkUnnamed940(o.features);
     checkRestDescriptionIcons(o.icons);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed528(o.labels);
-    checkUnnamed529(o.methods);
+    checkUnnamed941(o.labels);
+    checkUnnamed942(o.methods);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.ownerDomain, unittest.equals('foo'));
     unittest.expect(o.ownerName, unittest.equals('foo'));
     unittest.expect(o.packagePath, unittest.equals('foo'));
-    checkUnnamed530(o.parameters);
+    checkUnnamed943(o.parameters);
     unittest.expect(o.protocol, unittest.equals('foo'));
-    checkUnnamed531(o.resources);
+    checkUnnamed944(o.resources);
     unittest.expect(o.revision, unittest.equals('foo'));
     unittest.expect(o.rootUrl, unittest.equals('foo'));
-    checkUnnamed532(o.schemas);
+    checkUnnamed945(o.schemas);
     unittest.expect(o.servicePath, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
     unittest.expect(o.version, unittest.equals('foo'));
@@ -552,14 +587,14 @@
   buildCounterRestDescription--;
 }
 
-buildUnnamed533() {
+buildUnnamed946() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed533(core.List<core.String> o) {
+checkUnnamed946(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -633,7 +668,7 @@
   var o = new api.RestMethodMediaUpload();
   buildCounterRestMethodMediaUpload++;
   if (buildCounterRestMethodMediaUpload < 3) {
-    o.accept = buildUnnamed533();
+    o.accept = buildUnnamed946();
     o.maxSize = "foo";
     o.protocols = buildRestMethodMediaUploadProtocols();
   }
@@ -644,34 +679,34 @@
 checkRestMethodMediaUpload(api.RestMethodMediaUpload o) {
   buildCounterRestMethodMediaUpload++;
   if (buildCounterRestMethodMediaUpload < 3) {
-    checkUnnamed533(o.accept);
+    checkUnnamed946(o.accept);
     unittest.expect(o.maxSize, unittest.equals('foo'));
     checkRestMethodMediaUploadProtocols(o.protocols);
   }
   buildCounterRestMethodMediaUpload--;
 }
 
-buildUnnamed534() {
+buildUnnamed947() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed534(core.List<core.String> o) {
+checkUnnamed947(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed535() {
+buildUnnamed948() {
   var o = new core.Map<core.String, api.JsonSchema>();
   o["x"] = buildJsonSchema();
   o["y"] = buildJsonSchema();
   return o;
 }
 
-checkUnnamed535(core.Map<core.String, api.JsonSchema> o) {
+checkUnnamed948(core.Map<core.String, api.JsonSchema> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkJsonSchema(o["x"]);
   checkJsonSchema(o["y"]);
@@ -717,14 +752,14 @@
   buildCounterRestMethodResponse--;
 }
 
-buildUnnamed536() {
+buildUnnamed949() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed536(core.List<core.String> o) {
+checkUnnamed949(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -740,15 +775,16 @@
     o.httpMethod = "foo";
     o.id = "foo";
     o.mediaUpload = buildRestMethodMediaUpload();
-    o.parameterOrder = buildUnnamed534();
-    o.parameters = buildUnnamed535();
+    o.parameterOrder = buildUnnamed947();
+    o.parameters = buildUnnamed948();
     o.path = "foo";
     o.request = buildRestMethodRequest();
     o.response = buildRestMethodResponse();
-    o.scopes = buildUnnamed536();
+    o.scopes = buildUnnamed949();
     o.supportsMediaDownload = true;
     o.supportsMediaUpload = true;
     o.supportsSubscription = true;
+    o.useMediaDownloadService = true;
   }
   buildCounterRestMethod--;
   return o;
@@ -762,40 +798,41 @@
     unittest.expect(o.httpMethod, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     checkRestMethodMediaUpload(o.mediaUpload);
-    checkUnnamed534(o.parameterOrder);
-    checkUnnamed535(o.parameters);
+    checkUnnamed947(o.parameterOrder);
+    checkUnnamed948(o.parameters);
     unittest.expect(o.path, unittest.equals('foo'));
     checkRestMethodRequest(o.request);
     checkRestMethodResponse(o.response);
-    checkUnnamed536(o.scopes);
+    checkUnnamed949(o.scopes);
     unittest.expect(o.supportsMediaDownload, unittest.isTrue);
     unittest.expect(o.supportsMediaUpload, unittest.isTrue);
     unittest.expect(o.supportsSubscription, unittest.isTrue);
+    unittest.expect(o.useMediaDownloadService, unittest.isTrue);
   }
   buildCounterRestMethod--;
 }
 
-buildUnnamed537() {
+buildUnnamed950() {
   var o = new core.Map<core.String, api.RestMethod>();
   o["x"] = buildRestMethod();
   o["y"] = buildRestMethod();
   return o;
 }
 
-checkUnnamed537(core.Map<core.String, api.RestMethod> o) {
+checkUnnamed950(core.Map<core.String, api.RestMethod> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRestMethod(o["x"]);
   checkRestMethod(o["y"]);
 }
 
-buildUnnamed538() {
+buildUnnamed951() {
   var o = new core.Map<core.String, api.RestResource>();
   o["x"] = buildRestResource();
   o["y"] = buildRestResource();
   return o;
 }
 
-checkUnnamed538(core.Map<core.String, api.RestResource> o) {
+checkUnnamed951(core.Map<core.String, api.RestResource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRestResource(o["x"]);
   checkRestResource(o["y"]);
@@ -806,8 +843,8 @@
   var o = new api.RestResource();
   buildCounterRestResource++;
   if (buildCounterRestResource < 3) {
-    o.methods = buildUnnamed537();
-    o.resources = buildUnnamed538();
+    o.methods = buildUnnamed950();
+    o.resources = buildUnnamed951();
   }
   buildCounterRestResource--;
   return o;
@@ -816,8 +853,8 @@
 checkRestResource(api.RestResource o) {
   buildCounterRestResource++;
   if (buildCounterRestResource < 3) {
-    checkUnnamed537(o.methods);
-    checkUnnamed538(o.resources);
+    checkUnnamed950(o.methods);
+    checkUnnamed951(o.resources);
   }
   buildCounterRestResource--;
 }
@@ -1007,7 +1044,7 @@
   unittest.group("resource-ApisResourceApi", () {
     unittest.test("method--getRest", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ApisResourceApi res = new api.DiscoveryApi(mock).apis;
       var arg_api = "foo";
       var arg_version = "foo";
@@ -1059,7 +1096,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRestDescription());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.getRest(arg_api, arg_version).then(unittest.expectAsync(((api.RestDescription response) {
         checkRestDescription(response);
@@ -1068,7 +1105,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ApisResourceApi res = new api.DiscoveryApi(mock).apis;
       var arg_name = "foo";
       var arg_preferred = true;
@@ -1108,7 +1145,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDirectoryList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(name: arg_name, preferred: arg_preferred).then(unittest.expectAsync(((api.DirectoryList response) {
         checkDirectoryList(response);
diff --git a/generated/googleapis/test/doubleclickbidmanager/v1_test.dart b/generated/googleapis/test/doubleclickbidmanager/v1_test.dart
index c32476e..6899fa9 100644
--- a/generated/googleapis/test/doubleclickbidmanager/v1_test.dart
+++ b/generated/googleapis/test/doubleclickbidmanager/v1_test.dart
@@ -8,22 +8,57 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/doubleclickbidmanager/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
 
-buildUnnamed1016() {
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+buildUnnamed952() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1016(core.List<core.String> o) {
+checkUnnamed952(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -34,7 +69,7 @@
   var o = new api.DownloadLineItemsRequest();
   buildCounterDownloadLineItemsRequest++;
   if (buildCounterDownloadLineItemsRequest < 3) {
-    o.filterIds = buildUnnamed1016();
+    o.filterIds = buildUnnamed952();
     o.filterType = "foo";
     o.format = "foo";
   }
@@ -45,7 +80,7 @@
 checkDownloadLineItemsRequest(api.DownloadLineItemsRequest o) {
   buildCounterDownloadLineItemsRequest++;
   if (buildCounterDownloadLineItemsRequest < 3) {
-    checkUnnamed1016(o.filterIds);
+    checkUnnamed952(o.filterIds);
     unittest.expect(o.filterType, unittest.equals('foo'));
     unittest.expect(o.format, unittest.equals('foo'));
   }
@@ -92,14 +127,14 @@
   buildCounterFilterPair--;
 }
 
-buildUnnamed1017() {
+buildUnnamed953() {
   var o = new core.List<api.Query>();
   o.add(buildQuery());
   o.add(buildQuery());
   return o;
 }
 
-checkUnnamed1017(core.List<api.Query> o) {
+checkUnnamed953(core.List<api.Query> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuery(o[0]);
   checkQuery(o[1]);
@@ -111,7 +146,7 @@
   buildCounterListQueriesResponse++;
   if (buildCounterListQueriesResponse < 3) {
     o.kind = "foo";
-    o.queries = buildUnnamed1017();
+    o.queries = buildUnnamed953();
   }
   buildCounterListQueriesResponse--;
   return o;
@@ -121,19 +156,19 @@
   buildCounterListQueriesResponse++;
   if (buildCounterListQueriesResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1017(o.queries);
+    checkUnnamed953(o.queries);
   }
   buildCounterListQueriesResponse--;
 }
 
-buildUnnamed1018() {
+buildUnnamed954() {
   var o = new core.List<api.Report>();
   o.add(buildReport());
   o.add(buildReport());
   return o;
 }
 
-checkUnnamed1018(core.List<api.Report> o) {
+checkUnnamed954(core.List<api.Report> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReport(o[0]);
   checkReport(o[1]);
@@ -145,7 +180,7 @@
   buildCounterListReportsResponse++;
   if (buildCounterListReportsResponse < 3) {
     o.kind = "foo";
-    o.reports = buildUnnamed1018();
+    o.reports = buildUnnamed954();
   }
   buildCounterListReportsResponse--;
   return o;
@@ -155,45 +190,45 @@
   buildCounterListReportsResponse++;
   if (buildCounterListReportsResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1018(o.reports);
+    checkUnnamed954(o.reports);
   }
   buildCounterListReportsResponse--;
 }
 
-buildUnnamed1019() {
+buildUnnamed955() {
   var o = new core.List<api.FilterPair>();
   o.add(buildFilterPair());
   o.add(buildFilterPair());
   return o;
 }
 
-checkUnnamed1019(core.List<api.FilterPair> o) {
+checkUnnamed955(core.List<api.FilterPair> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFilterPair(o[0]);
   checkFilterPair(o[1]);
 }
 
-buildUnnamed1020() {
+buildUnnamed956() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1020(core.List<core.String> o) {
+checkUnnamed956(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1021() {
+buildUnnamed957() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1021(core.List<core.String> o) {
+checkUnnamed957(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -204,10 +239,10 @@
   var o = new api.Parameters();
   buildCounterParameters++;
   if (buildCounterParameters < 3) {
-    o.filters = buildUnnamed1019();
-    o.groupBys = buildUnnamed1020();
+    o.filters = buildUnnamed955();
+    o.groupBys = buildUnnamed956();
     o.includeInviteData = true;
-    o.metrics = buildUnnamed1021();
+    o.metrics = buildUnnamed957();
     o.type = "foo";
   }
   buildCounterParameters--;
@@ -217,10 +252,10 @@
 checkParameters(api.Parameters o) {
   buildCounterParameters++;
   if (buildCounterParameters < 3) {
-    checkUnnamed1019(o.filters);
-    checkUnnamed1020(o.groupBys);
+    checkUnnamed955(o.filters);
+    checkUnnamed956(o.groupBys);
     unittest.expect(o.includeInviteData, unittest.isTrue);
-    checkUnnamed1021(o.metrics);
+    checkUnnamed957(o.metrics);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterParameters--;
@@ -259,14 +294,14 @@
   buildCounterQuery--;
 }
 
-buildUnnamed1022() {
+buildUnnamed958() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1022(core.List<core.String> o) {
+checkUnnamed958(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -286,7 +321,7 @@
     o.reportCount = 42;
     o.running = true;
     o.sendNotification = true;
-    o.shareEmailAddress = buildUnnamed1022();
+    o.shareEmailAddress = buildUnnamed958();
     o.title = "foo";
   }
   buildCounterQueryMetadata--;
@@ -305,7 +340,7 @@
     unittest.expect(o.reportCount, unittest.equals(42));
     unittest.expect(o.running, unittest.isTrue);
     unittest.expect(o.sendNotification, unittest.isTrue);
-    checkUnnamed1022(o.shareEmailAddress);
+    checkUnnamed958(o.shareEmailAddress);
     unittest.expect(o.title, unittest.equals('foo'));
   }
   buildCounterQueryMetadata--;
@@ -449,14 +484,14 @@
   buildCounterReportStatus--;
 }
 
-buildUnnamed1023() {
+buildUnnamed959() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1023(core.List<core.String> o) {
+checkUnnamed959(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -470,7 +505,7 @@
     o.changed = true;
     o.entityId = "foo";
     o.entityName = "foo";
-    o.errors = buildUnnamed1023();
+    o.errors = buildUnnamed959();
     o.persisted = true;
     o.rowNumber = 42;
   }
@@ -484,7 +519,7 @@
     unittest.expect(o.changed, unittest.isTrue);
     unittest.expect(o.entityId, unittest.equals('foo'));
     unittest.expect(o.entityName, unittest.equals('foo'));
-    checkUnnamed1023(o.errors);
+    checkUnnamed959(o.errors);
     unittest.expect(o.persisted, unittest.isTrue);
     unittest.expect(o.rowNumber, unittest.equals(42));
   }
@@ -558,27 +593,27 @@
   buildCounterUploadLineItemsResponse--;
 }
 
-buildUnnamed1024() {
+buildUnnamed960() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1024(core.List<core.String> o) {
+checkUnnamed960(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1025() {
+buildUnnamed961() {
   var o = new core.List<api.RowStatus>();
   o.add(buildRowStatus());
   o.add(buildRowStatus());
   return o;
 }
 
-checkUnnamed1025(core.List<api.RowStatus> o) {
+checkUnnamed961(core.List<api.RowStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRowStatus(o[0]);
   checkRowStatus(o[1]);
@@ -589,8 +624,8 @@
   var o = new api.UploadStatus();
   buildCounterUploadStatus++;
   if (buildCounterUploadStatus < 3) {
-    o.errors = buildUnnamed1024();
-    o.rowStatus = buildUnnamed1025();
+    o.errors = buildUnnamed960();
+    o.rowStatus = buildUnnamed961();
   }
   buildCounterUploadStatus--;
   return o;
@@ -599,8 +634,8 @@
 checkUploadStatus(api.UploadStatus o) {
   buildCounterUploadStatus++;
   if (buildCounterUploadStatus < 3) {
-    checkUnnamed1024(o.errors);
-    checkUnnamed1025(o.rowStatus);
+    checkUnnamed960(o.errors);
+    checkUnnamed961(o.rowStatus);
   }
   buildCounterUploadStatus--;
 }
@@ -781,7 +816,7 @@
   unittest.group("resource-LineitemsResourceApi", () {
     unittest.test("method--downloadlineitems", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LineitemsResourceApi res = new api.DoubleclickbidmanagerApi(mock).lineitems;
       var arg_request = buildDownloadLineItemsRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -821,7 +856,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDownloadLineItemsResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.downloadlineitems(arg_request).then(unittest.expectAsync(((api.DownloadLineItemsResponse response) {
         checkDownloadLineItemsResponse(response);
@@ -830,7 +865,7 @@
 
     unittest.test("method--uploadlineitems", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LineitemsResourceApi res = new api.DoubleclickbidmanagerApi(mock).lineitems;
       var arg_request = buildUploadLineItemsRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -870,7 +905,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUploadLineItemsResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.uploadlineitems(arg_request).then(unittest.expectAsync(((api.UploadLineItemsResponse response) {
         checkUploadLineItemsResponse(response);
@@ -883,7 +918,7 @@
   unittest.group("resource-QueriesResourceApi", () {
     unittest.test("method--createquery", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.QueriesResourceApi res = new api.DoubleclickbidmanagerApi(mock).queries;
       var arg_request = buildQuery();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -923,7 +958,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildQuery());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.createquery(arg_request).then(unittest.expectAsync(((api.Query response) {
         checkQuery(response);
@@ -932,7 +967,7 @@
 
     unittest.test("method--deletequery", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.QueriesResourceApi res = new api.DoubleclickbidmanagerApi(mock).queries;
       var arg_queryId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -972,14 +1007,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.deletequery(arg_queryId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--getquery", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.QueriesResourceApi res = new api.DoubleclickbidmanagerApi(mock).queries;
       var arg_queryId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1019,7 +1054,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildQuery());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.getquery(arg_queryId).then(unittest.expectAsync(((api.Query response) {
         checkQuery(response);
@@ -1028,7 +1063,7 @@
 
     unittest.test("method--listqueries", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.QueriesResourceApi res = new api.DoubleclickbidmanagerApi(mock).queries;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1064,7 +1099,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListQueriesResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.listqueries().then(unittest.expectAsync(((api.ListQueriesResponse response) {
         checkListQueriesResponse(response);
@@ -1073,7 +1108,7 @@
 
     unittest.test("method--runquery", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.QueriesResourceApi res = new api.DoubleclickbidmanagerApi(mock).queries;
       var arg_request = buildRunQueryRequest();
       var arg_queryId = "foo";
@@ -1117,7 +1152,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.runquery(arg_request, arg_queryId).then(unittest.expectAsync((_) {}));
     });
@@ -1128,7 +1163,7 @@
   unittest.group("resource-ReportsResourceApi", () {
     unittest.test("method--listreports", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsResourceApi res = new api.DoubleclickbidmanagerApi(mock).reports;
       var arg_queryId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1172,7 +1207,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListReportsResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.listreports(arg_queryId).then(unittest.expectAsync(((api.ListReportsResponse response) {
         checkListReportsResponse(response);
diff --git a/generated/googleapis/test/doubleclicksearch/v2_test.dart b/generated/googleapis/test/doubleclicksearch/v2_test.dart
index f44e8ac..8453fc9 100644
--- a/generated/googleapis/test/doubleclicksearch/v2_test.dart
+++ b/generated/googleapis/test/doubleclicksearch/v2_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/doubleclicksearch/v2.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterAvailability = 0;
 buildAvailability() {
@@ -45,27 +80,27 @@
   buildCounterAvailability--;
 }
 
-buildUnnamed1057() {
+buildUnnamed962() {
   var o = new core.List<api.CustomDimension>();
   o.add(buildCustomDimension());
   o.add(buildCustomDimension());
   return o;
 }
 
-checkUnnamed1057(core.List<api.CustomDimension> o) {
+checkUnnamed962(core.List<api.CustomDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomDimension(o[0]);
   checkCustomDimension(o[1]);
 }
 
-buildUnnamed1058() {
+buildUnnamed963() {
   var o = new core.List<api.CustomMetric>();
   o.add(buildCustomMetric());
   o.add(buildCustomMetric());
   return o;
 }
 
-checkUnnamed1058(core.List<api.CustomMetric> o) {
+checkUnnamed963(core.List<api.CustomMetric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomMetric(o[0]);
   checkCustomMetric(o[1]);
@@ -89,8 +124,8 @@
     o.countMillis = "foo";
     o.criterionId = "foo";
     o.currencyCode = "foo";
-    o.customDimension = buildUnnamed1057();
-    o.customMetric = buildUnnamed1058();
+    o.customDimension = buildUnnamed962();
+    o.customMetric = buildUnnamed963();
     o.dsConversionId = "foo";
     o.engineAccountId = "foo";
     o.floodlightOrderId = "foo";
@@ -122,8 +157,8 @@
     unittest.expect(o.countMillis, unittest.equals('foo'));
     unittest.expect(o.criterionId, unittest.equals('foo'));
     unittest.expect(o.currencyCode, unittest.equals('foo'));
-    checkUnnamed1057(o.customDimension);
-    checkUnnamed1058(o.customMetric);
+    checkUnnamed962(o.customDimension);
+    checkUnnamed963(o.customMetric);
     unittest.expect(o.dsConversionId, unittest.equals('foo'));
     unittest.expect(o.engineAccountId, unittest.equals('foo'));
     unittest.expect(o.floodlightOrderId, unittest.equals('foo'));
@@ -138,14 +173,14 @@
   buildCounterConversion--;
 }
 
-buildUnnamed1059() {
+buildUnnamed964() {
   var o = new core.List<api.Conversion>();
   o.add(buildConversion());
   o.add(buildConversion());
   return o;
 }
 
-checkUnnamed1059(core.List<api.Conversion> o) {
+checkUnnamed964(core.List<api.Conversion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConversion(o[0]);
   checkConversion(o[1]);
@@ -156,7 +191,7 @@
   var o = new api.ConversionList();
   buildCounterConversionList++;
   if (buildCounterConversionList < 3) {
-    o.conversion = buildUnnamed1059();
+    o.conversion = buildUnnamed964();
     o.kind = "foo";
   }
   buildCounterConversionList--;
@@ -166,7 +201,7 @@
 checkConversionList(api.ConversionList o) {
   buildCounterConversionList++;
   if (buildCounterConversionList < 3) {
-    checkUnnamed1059(o.conversion);
+    checkUnnamed964(o.conversion);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterConversionList--;
@@ -235,27 +270,27 @@
   buildCounterReportFiles--;
 }
 
-buildUnnamed1060() {
+buildUnnamed965() {
   var o = new core.List<api.ReportFiles>();
   o.add(buildReportFiles());
   o.add(buildReportFiles());
   return o;
 }
 
-checkUnnamed1060(core.List<api.ReportFiles> o) {
+checkUnnamed965(core.List<api.ReportFiles> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportFiles(o[0]);
   checkReportFiles(o[1]);
 }
 
-buildUnnamed1061() {
+buildUnnamed966() {
   var o = new core.List<api.ReportRow>();
   o.add(buildReportRow());
   o.add(buildReportRow());
   return o;
 }
 
-checkUnnamed1061(core.List<api.ReportRow> o) {
+checkUnnamed966(core.List<api.ReportRow> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportRow(o[0]);
   checkReportRow(o[1]);
@@ -266,13 +301,13 @@
   var o = new api.Report();
   buildCounterReport++;
   if (buildCounterReport < 3) {
-    o.files = buildUnnamed1060();
+    o.files = buildUnnamed965();
     o.id = "foo";
     o.isReportReady = true;
     o.kind = "foo";
     o.request = buildReportRequest();
     o.rowCount = 42;
-    o.rows = buildUnnamed1061();
+    o.rows = buildUnnamed966();
     o.statisticsCurrencyCode = "foo";
     o.statisticsTimeZone = "foo";
   }
@@ -283,13 +318,13 @@
 checkReport(api.Report o) {
   buildCounterReport++;
   if (buildCounterReport < 3) {
-    checkUnnamed1060(o.files);
+    checkUnnamed965(o.files);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.isReportReady, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkReportRequest(o.request);
     unittest.expect(o.rowCount, unittest.equals(42));
-    checkUnnamed1061(o.rows);
+    checkUnnamed966(o.rows);
     unittest.expect(o.statisticsCurrencyCode, unittest.equals('foo'));
     unittest.expect(o.statisticsTimeZone, unittest.equals('foo'));
   }
@@ -331,27 +366,27 @@
   buildCounterReportApiColumnSpec--;
 }
 
-buildUnnamed1062() {
+buildUnnamed967() {
   var o = new core.List<api.ReportApiColumnSpec>();
   o.add(buildReportApiColumnSpec());
   o.add(buildReportApiColumnSpec());
   return o;
 }
 
-checkUnnamed1062(core.List<api.ReportApiColumnSpec> o) {
+checkUnnamed967(core.List<api.ReportApiColumnSpec> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportApiColumnSpec(o[0]);
   checkReportApiColumnSpec(o[1]);
 }
 
-buildUnnamed1063() {
+buildUnnamed968() {
   var o = new core.List<core.Object>();
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   return o;
 }
 
-checkUnnamed1063(core.List<core.Object> o) {
+checkUnnamed968(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o[0]) as core.Map; unittest.expect(casted1, unittest.hasLength(3)); unittest.expect(casted1["list"], unittest.equals([1, 2, 3])); unittest.expect(casted1["bool"], unittest.equals(true)); unittest.expect(casted1["string"], unittest.equals('foo')); 
   var casted2 = (o[1]) as core.Map; unittest.expect(casted2, unittest.hasLength(3)); unittest.expect(casted2["list"], unittest.equals([1, 2, 3])); unittest.expect(casted2["bool"], unittest.equals(true)); unittest.expect(casted2["string"], unittest.equals('foo')); 
@@ -364,7 +399,7 @@
   if (buildCounterReportRequestFilters < 3) {
     o.column = buildReportApiColumnSpec();
     o.operator = "foo";
-    o.values = buildUnnamed1063();
+    o.values = buildUnnamed968();
   }
   buildCounterReportRequestFilters--;
   return o;
@@ -375,19 +410,19 @@
   if (buildCounterReportRequestFilters < 3) {
     checkReportApiColumnSpec(o.column);
     unittest.expect(o.operator, unittest.equals('foo'));
-    checkUnnamed1063(o.values);
+    checkUnnamed968(o.values);
   }
   buildCounterReportRequestFilters--;
 }
 
-buildUnnamed1064() {
+buildUnnamed969() {
   var o = new core.List<api.ReportRequestFilters>();
   o.add(buildReportRequestFilters());
   o.add(buildReportRequestFilters());
   return o;
 }
 
-checkUnnamed1064(core.List<api.ReportRequestFilters> o) {
+checkUnnamed969(core.List<api.ReportRequestFilters> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportRequestFilters(o[0]);
   checkReportRequestFilters(o[1]);
@@ -414,14 +449,14 @@
   buildCounterReportRequestOrderBy--;
 }
 
-buildUnnamed1065() {
+buildUnnamed970() {
   var o = new core.List<api.ReportRequestOrderBy>();
   o.add(buildReportRequestOrderBy());
   o.add(buildReportRequestOrderBy());
   return o;
 }
 
-checkUnnamed1065(core.List<api.ReportRequestOrderBy> o) {
+checkUnnamed970(core.List<api.ReportRequestOrderBy> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportRequestOrderBy(o[0]);
   checkReportRequestOrderBy(o[1]);
@@ -488,13 +523,13 @@
   var o = new api.ReportRequest();
   buildCounterReportRequest++;
   if (buildCounterReportRequest < 3) {
-    o.columns = buildUnnamed1062();
+    o.columns = buildUnnamed967();
     o.downloadFormat = "foo";
-    o.filters = buildUnnamed1064();
+    o.filters = buildUnnamed969();
     o.includeDeletedEntities = true;
     o.includeRemovedEntities = true;
     o.maxRowsPerFile = 42;
-    o.orderBy = buildUnnamed1065();
+    o.orderBy = buildUnnamed970();
     o.reportScope = buildReportRequestReportScope();
     o.reportType = "foo";
     o.rowCount = 42;
@@ -510,13 +545,13 @@
 checkReportRequest(api.ReportRequest o) {
   buildCounterReportRequest++;
   if (buildCounterReportRequest < 3) {
-    checkUnnamed1062(o.columns);
+    checkUnnamed967(o.columns);
     unittest.expect(o.downloadFormat, unittest.equals('foo'));
-    checkUnnamed1064(o.filters);
+    checkUnnamed969(o.filters);
     unittest.expect(o.includeDeletedEntities, unittest.isTrue);
     unittest.expect(o.includeRemovedEntities, unittest.isTrue);
     unittest.expect(o.maxRowsPerFile, unittest.equals(42));
-    checkUnnamed1065(o.orderBy);
+    checkUnnamed970(o.orderBy);
     checkReportRequestReportScope(o.reportScope);
     unittest.expect(o.reportType, unittest.equals('foo'));
     unittest.expect(o.rowCount, unittest.equals(42));
@@ -564,14 +599,14 @@
   buildCounterSavedColumn--;
 }
 
-buildUnnamed1066() {
+buildUnnamed971() {
   var o = new core.List<api.SavedColumn>();
   o.add(buildSavedColumn());
   o.add(buildSavedColumn());
   return o;
 }
 
-checkUnnamed1066(core.List<api.SavedColumn> o) {
+checkUnnamed971(core.List<api.SavedColumn> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSavedColumn(o[0]);
   checkSavedColumn(o[1]);
@@ -582,7 +617,7 @@
   var o = new api.SavedColumnList();
   buildCounterSavedColumnList++;
   if (buildCounterSavedColumnList < 3) {
-    o.items = buildUnnamed1066();
+    o.items = buildUnnamed971();
     o.kind = "foo";
   }
   buildCounterSavedColumnList--;
@@ -592,20 +627,20 @@
 checkSavedColumnList(api.SavedColumnList o) {
   buildCounterSavedColumnList++;
   if (buildCounterSavedColumnList < 3) {
-    checkUnnamed1066(o.items);
+    checkUnnamed971(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterSavedColumnList--;
 }
 
-buildUnnamed1067() {
+buildUnnamed972() {
   var o = new core.List<api.Availability>();
   o.add(buildAvailability());
   o.add(buildAvailability());
   return o;
 }
 
-checkUnnamed1067(core.List<api.Availability> o) {
+checkUnnamed972(core.List<api.Availability> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAvailability(o[0]);
   checkAvailability(o[1]);
@@ -616,7 +651,7 @@
   var o = new api.UpdateAvailabilityRequest();
   buildCounterUpdateAvailabilityRequest++;
   if (buildCounterUpdateAvailabilityRequest < 3) {
-    o.availabilities = buildUnnamed1067();
+    o.availabilities = buildUnnamed972();
   }
   buildCounterUpdateAvailabilityRequest--;
   return o;
@@ -625,19 +660,19 @@
 checkUpdateAvailabilityRequest(api.UpdateAvailabilityRequest o) {
   buildCounterUpdateAvailabilityRequest++;
   if (buildCounterUpdateAvailabilityRequest < 3) {
-    checkUnnamed1067(o.availabilities);
+    checkUnnamed972(o.availabilities);
   }
   buildCounterUpdateAvailabilityRequest--;
 }
 
-buildUnnamed1068() {
+buildUnnamed973() {
   var o = new core.List<api.Availability>();
   o.add(buildAvailability());
   o.add(buildAvailability());
   return o;
 }
 
-checkUnnamed1068(core.List<api.Availability> o) {
+checkUnnamed973(core.List<api.Availability> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAvailability(o[0]);
   checkAvailability(o[1]);
@@ -648,7 +683,7 @@
   var o = new api.UpdateAvailabilityResponse();
   buildCounterUpdateAvailabilityResponse++;
   if (buildCounterUpdateAvailabilityResponse < 3) {
-    o.availabilities = buildUnnamed1068();
+    o.availabilities = buildUnnamed973();
   }
   buildCounterUpdateAvailabilityResponse--;
   return o;
@@ -657,7 +692,7 @@
 checkUpdateAvailabilityResponse(api.UpdateAvailabilityResponse o) {
   buildCounterUpdateAvailabilityResponse++;
   if (buildCounterUpdateAvailabilityResponse < 3) {
-    checkUnnamed1068(o.availabilities);
+    checkUnnamed973(o.availabilities);
   }
   buildCounterUpdateAvailabilityResponse--;
 }
@@ -829,7 +864,7 @@
   unittest.group("resource-ConversionResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ConversionResourceApi res = new api.DoubleclicksearchApi(mock).conversion;
       var arg_agencyId = "foo";
       var arg_advertiserId = "foo";
@@ -905,7 +940,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildConversionList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_agencyId, arg_advertiserId, arg_engineAccountId, arg_endDate, arg_rowCount, arg_startDate, arg_startRow, adGroupId: arg_adGroupId, adId: arg_adId, campaignId: arg_campaignId, criterionId: arg_criterionId).then(unittest.expectAsync(((api.ConversionList response) {
         checkConversionList(response);
@@ -914,7 +949,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ConversionResourceApi res = new api.DoubleclicksearchApi(mock).conversion;
       var arg_request = buildConversionList();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -954,7 +989,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildConversionList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request).then(unittest.expectAsync(((api.ConversionList response) {
         checkConversionList(response);
@@ -963,7 +998,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ConversionResourceApi res = new api.DoubleclicksearchApi(mock).conversion;
       var arg_request = buildConversionList();
       var arg_advertiserId = "foo";
@@ -1017,7 +1052,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildConversionList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_advertiserId, arg_agencyId, arg_endDate, arg_engineAccountId, arg_rowCount, arg_startDate, arg_startRow).then(unittest.expectAsync(((api.ConversionList response) {
         checkConversionList(response);
@@ -1026,7 +1061,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ConversionResourceApi res = new api.DoubleclicksearchApi(mock).conversion;
       var arg_request = buildConversionList();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1066,7 +1101,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildConversionList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request).then(unittest.expectAsync(((api.ConversionList response) {
         checkConversionList(response);
@@ -1075,7 +1110,7 @@
 
     unittest.test("method--updateAvailability", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ConversionResourceApi res = new api.DoubleclicksearchApi(mock).conversion;
       var arg_request = buildUpdateAvailabilityRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1115,7 +1150,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUpdateAvailabilityResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.updateAvailability(arg_request).then(unittest.expectAsync(((api.UpdateAvailabilityResponse response) {
         checkUpdateAvailabilityResponse(response);
@@ -1128,7 +1163,7 @@
   unittest.group("resource-ReportsResourceApi", () {
     unittest.test("method--generate", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsResourceApi res = new api.DoubleclicksearchApi(mock).reports;
       var arg_request_1 = buildReportRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1168,7 +1203,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildReport());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.generate(arg_request_1).then(unittest.expectAsync(((api.Report response) {
         checkReport(response);
@@ -1177,7 +1212,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsResourceApi res = new api.DoubleclicksearchApi(mock).reports;
       var arg_reportId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1217,7 +1252,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildReport());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_reportId).then(unittest.expectAsync(((api.Report response) {
         checkReport(response);
@@ -1228,7 +1263,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsResourceApi res = new api.DoubleclicksearchApi(mock).reports;
       var arg_reportId = "foo";
       var arg_reportFragment = 42;
@@ -1276,14 +1311,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.getFile(arg_reportId, arg_reportFragment).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--request", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsResourceApi res = new api.DoubleclicksearchApi(mock).reports;
       var arg_request_1 = buildReportRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1323,7 +1358,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildReport());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.request(arg_request_1).then(unittest.expectAsync(((api.Report response) {
         checkReport(response);
@@ -1336,7 +1371,7 @@
   unittest.group("resource-SavedColumnsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SavedColumnsResourceApi res = new api.DoubleclicksearchApi(mock).savedColumns;
       var arg_agencyId = "foo";
       var arg_advertiserId = "foo";
@@ -1388,7 +1423,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSavedColumnList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_agencyId, arg_advertiserId).then(unittest.expectAsync(((api.SavedColumnList response) {
         checkSavedColumnList(response);
diff --git a/generated/googleapis/test/drive/v2_test.dart b/generated/googleapis/test/drive/v2_test.dart
index 499595f..2be6e1a 100644
--- a/generated/googleapis/test/drive/v2_test.dart
+++ b/generated/googleapis/test/drive/v2_test.dart
@@ -8,22 +8,57 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/drive/v2.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
 
-buildUnnamed687() {
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+buildUnnamed974() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed687(core.List<core.String> o) {
+checkUnnamed974(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -34,7 +69,7 @@
   var o = new api.AboutAdditionalRoleInfoRoleSets();
   buildCounterAboutAdditionalRoleInfoRoleSets++;
   if (buildCounterAboutAdditionalRoleInfoRoleSets < 3) {
-    o.additionalRoles = buildUnnamed687();
+    o.additionalRoles = buildUnnamed974();
     o.primaryRole = "foo";
   }
   buildCounterAboutAdditionalRoleInfoRoleSets--;
@@ -44,20 +79,20 @@
 checkAboutAdditionalRoleInfoRoleSets(api.AboutAdditionalRoleInfoRoleSets o) {
   buildCounterAboutAdditionalRoleInfoRoleSets++;
   if (buildCounterAboutAdditionalRoleInfoRoleSets < 3) {
-    checkUnnamed687(o.additionalRoles);
+    checkUnnamed974(o.additionalRoles);
     unittest.expect(o.primaryRole, unittest.equals('foo'));
   }
   buildCounterAboutAdditionalRoleInfoRoleSets--;
 }
 
-buildUnnamed688() {
+buildUnnamed975() {
   var o = new core.List<api.AboutAdditionalRoleInfoRoleSets>();
   o.add(buildAboutAdditionalRoleInfoRoleSets());
   o.add(buildAboutAdditionalRoleInfoRoleSets());
   return o;
 }
 
-checkUnnamed688(core.List<api.AboutAdditionalRoleInfoRoleSets> o) {
+checkUnnamed975(core.List<api.AboutAdditionalRoleInfoRoleSets> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAboutAdditionalRoleInfoRoleSets(o[0]);
   checkAboutAdditionalRoleInfoRoleSets(o[1]);
@@ -68,7 +103,7 @@
   var o = new api.AboutAdditionalRoleInfo();
   buildCounterAboutAdditionalRoleInfo++;
   if (buildCounterAboutAdditionalRoleInfo < 3) {
-    o.roleSets = buildUnnamed688();
+    o.roleSets = buildUnnamed975();
     o.type = "foo";
   }
   buildCounterAboutAdditionalRoleInfo--;
@@ -78,33 +113,33 @@
 checkAboutAdditionalRoleInfo(api.AboutAdditionalRoleInfo o) {
   buildCounterAboutAdditionalRoleInfo++;
   if (buildCounterAboutAdditionalRoleInfo < 3) {
-    checkUnnamed688(o.roleSets);
+    checkUnnamed975(o.roleSets);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterAboutAdditionalRoleInfo--;
 }
 
-buildUnnamed689() {
+buildUnnamed976() {
   var o = new core.List<api.AboutAdditionalRoleInfo>();
   o.add(buildAboutAdditionalRoleInfo());
   o.add(buildAboutAdditionalRoleInfo());
   return o;
 }
 
-checkUnnamed689(core.List<api.AboutAdditionalRoleInfo> o) {
+checkUnnamed976(core.List<api.AboutAdditionalRoleInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAboutAdditionalRoleInfo(o[0]);
   checkAboutAdditionalRoleInfo(o[1]);
 }
 
-buildUnnamed690() {
+buildUnnamed977() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed690(core.List<core.String> o) {
+checkUnnamed977(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -116,7 +151,7 @@
   buildCounterAboutExportFormats++;
   if (buildCounterAboutExportFormats < 3) {
     o.source = "foo";
-    o.targets = buildUnnamed690();
+    o.targets = buildUnnamed977();
   }
   buildCounterAboutExportFormats--;
   return o;
@@ -126,19 +161,19 @@
   buildCounterAboutExportFormats++;
   if (buildCounterAboutExportFormats < 3) {
     unittest.expect(o.source, unittest.equals('foo'));
-    checkUnnamed690(o.targets);
+    checkUnnamed977(o.targets);
   }
   buildCounterAboutExportFormats--;
 }
 
-buildUnnamed691() {
+buildUnnamed978() {
   var o = new core.List<api.AboutExportFormats>();
   o.add(buildAboutExportFormats());
   o.add(buildAboutExportFormats());
   return o;
 }
 
-checkUnnamed691(core.List<api.AboutExportFormats> o) {
+checkUnnamed978(core.List<api.AboutExportFormats> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAboutExportFormats(o[0]);
   checkAboutExportFormats(o[1]);
@@ -165,40 +200,40 @@
   buildCounterAboutFeatures--;
 }
 
-buildUnnamed692() {
+buildUnnamed979() {
   var o = new core.List<api.AboutFeatures>();
   o.add(buildAboutFeatures());
   o.add(buildAboutFeatures());
   return o;
 }
 
-checkUnnamed692(core.List<api.AboutFeatures> o) {
+checkUnnamed979(core.List<api.AboutFeatures> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAboutFeatures(o[0]);
   checkAboutFeatures(o[1]);
 }
 
-buildUnnamed693() {
+buildUnnamed980() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed693(core.List<core.String> o) {
+checkUnnamed980(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed694() {
+buildUnnamed981() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed694(core.List<core.String> o) {
+checkUnnamed981(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -210,7 +245,7 @@
   buildCounterAboutImportFormats++;
   if (buildCounterAboutImportFormats < 3) {
     o.source = "foo";
-    o.targets = buildUnnamed694();
+    o.targets = buildUnnamed981();
   }
   buildCounterAboutImportFormats--;
   return o;
@@ -220,19 +255,19 @@
   buildCounterAboutImportFormats++;
   if (buildCounterAboutImportFormats < 3) {
     unittest.expect(o.source, unittest.equals('foo'));
-    checkUnnamed694(o.targets);
+    checkUnnamed981(o.targets);
   }
   buildCounterAboutImportFormats--;
 }
 
-buildUnnamed695() {
+buildUnnamed982() {
   var o = new core.List<api.AboutImportFormats>();
   o.add(buildAboutImportFormats());
   o.add(buildAboutImportFormats());
   return o;
 }
 
-checkUnnamed695(core.List<api.AboutImportFormats> o) {
+checkUnnamed982(core.List<api.AboutImportFormats> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAboutImportFormats(o[0]);
   checkAboutImportFormats(o[1]);
@@ -259,14 +294,14 @@
   buildCounterAboutMaxUploadSizes--;
 }
 
-buildUnnamed696() {
+buildUnnamed983() {
   var o = new core.List<api.AboutMaxUploadSizes>();
   o.add(buildAboutMaxUploadSizes());
   o.add(buildAboutMaxUploadSizes());
   return o;
 }
 
-checkUnnamed696(core.List<api.AboutMaxUploadSizes> o) {
+checkUnnamed983(core.List<api.AboutMaxUploadSizes> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAboutMaxUploadSizes(o[0]);
   checkAboutMaxUploadSizes(o[1]);
@@ -293,14 +328,14 @@
   buildCounterAboutQuotaBytesByService--;
 }
 
-buildUnnamed697() {
+buildUnnamed984() {
   var o = new core.List<api.AboutQuotaBytesByService>();
   o.add(buildAboutQuotaBytesByService());
   o.add(buildAboutQuotaBytesByService());
   return o;
 }
 
-checkUnnamed697(core.List<api.AboutQuotaBytesByService> o) {
+checkUnnamed984(core.List<api.AboutQuotaBytesByService> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAboutQuotaBytesByService(o[0]);
   checkAboutQuotaBytesByService(o[1]);
@@ -311,21 +346,21 @@
   var o = new api.About();
   buildCounterAbout++;
   if (buildCounterAbout < 3) {
-    o.additionalRoleInfo = buildUnnamed689();
+    o.additionalRoleInfo = buildUnnamed976();
     o.domainSharingPolicy = "foo";
     o.etag = "foo";
-    o.exportFormats = buildUnnamed691();
-    o.features = buildUnnamed692();
-    o.folderColorPalette = buildUnnamed693();
-    o.importFormats = buildUnnamed695();
+    o.exportFormats = buildUnnamed978();
+    o.features = buildUnnamed979();
+    o.folderColorPalette = buildUnnamed980();
+    o.importFormats = buildUnnamed982();
     o.isCurrentAppInstalled = true;
     o.kind = "foo";
     o.languageCode = "foo";
     o.largestChangeId = "foo";
-    o.maxUploadSizes = buildUnnamed696();
+    o.maxUploadSizes = buildUnnamed983();
     o.name = "foo";
     o.permissionId = "foo";
-    o.quotaBytesByService = buildUnnamed697();
+    o.quotaBytesByService = buildUnnamed984();
     o.quotaBytesTotal = "foo";
     o.quotaBytesUsed = "foo";
     o.quotaBytesUsedAggregate = "foo";
@@ -343,21 +378,21 @@
 checkAbout(api.About o) {
   buildCounterAbout++;
   if (buildCounterAbout < 3) {
-    checkUnnamed689(o.additionalRoleInfo);
+    checkUnnamed976(o.additionalRoleInfo);
     unittest.expect(o.domainSharingPolicy, unittest.equals('foo'));
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed691(o.exportFormats);
-    checkUnnamed692(o.features);
-    checkUnnamed693(o.folderColorPalette);
-    checkUnnamed695(o.importFormats);
+    checkUnnamed978(o.exportFormats);
+    checkUnnamed979(o.features);
+    checkUnnamed980(o.folderColorPalette);
+    checkUnnamed982(o.importFormats);
     unittest.expect(o.isCurrentAppInstalled, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.languageCode, unittest.equals('foo'));
     unittest.expect(o.largestChangeId, unittest.equals('foo'));
-    checkUnnamed696(o.maxUploadSizes);
+    checkUnnamed983(o.maxUploadSizes);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.permissionId, unittest.equals('foo'));
-    checkUnnamed697(o.quotaBytesByService);
+    checkUnnamed984(o.quotaBytesByService);
     unittest.expect(o.quotaBytesTotal, unittest.equals('foo'));
     unittest.expect(o.quotaBytesUsed, unittest.equals('foo'));
     unittest.expect(o.quotaBytesUsedAggregate, unittest.equals('foo'));
@@ -394,66 +429,66 @@
   buildCounterAppIcons--;
 }
 
-buildUnnamed698() {
+buildUnnamed985() {
   var o = new core.List<api.AppIcons>();
   o.add(buildAppIcons());
   o.add(buildAppIcons());
   return o;
 }
 
-checkUnnamed698(core.List<api.AppIcons> o) {
+checkUnnamed985(core.List<api.AppIcons> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAppIcons(o[0]);
   checkAppIcons(o[1]);
 }
 
-buildUnnamed699() {
+buildUnnamed986() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed699(core.List<core.String> o) {
+checkUnnamed986(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed700() {
+buildUnnamed987() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed700(core.List<core.String> o) {
+checkUnnamed987(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed701() {
+buildUnnamed988() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed701(core.List<core.String> o) {
+checkUnnamed988(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed702() {
+buildUnnamed989() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed702(core.List<core.String> o) {
+checkUnnamed989(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -468,7 +503,7 @@
     o.createInFolderTemplate = "foo";
     o.createUrl = "foo";
     o.hasDriveWideScope = true;
-    o.icons = buildUnnamed698();
+    o.icons = buildUnnamed985();
     o.id = "foo";
     o.installed = true;
     o.kind = "foo";
@@ -476,12 +511,12 @@
     o.name = "foo";
     o.objectType = "foo";
     o.openUrlTemplate = "foo";
-    o.primaryFileExtensions = buildUnnamed699();
-    o.primaryMimeTypes = buildUnnamed700();
+    o.primaryFileExtensions = buildUnnamed986();
+    o.primaryMimeTypes = buildUnnamed987();
     o.productId = "foo";
     o.productUrl = "foo";
-    o.secondaryFileExtensions = buildUnnamed701();
-    o.secondaryMimeTypes = buildUnnamed702();
+    o.secondaryFileExtensions = buildUnnamed988();
+    o.secondaryMimeTypes = buildUnnamed989();
     o.shortDescription = "foo";
     o.supportsCreate = true;
     o.supportsImport = true;
@@ -500,7 +535,7 @@
     unittest.expect(o.createInFolderTemplate, unittest.equals('foo'));
     unittest.expect(o.createUrl, unittest.equals('foo'));
     unittest.expect(o.hasDriveWideScope, unittest.isTrue);
-    checkUnnamed698(o.icons);
+    checkUnnamed985(o.icons);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.installed, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
@@ -508,12 +543,12 @@
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.objectType, unittest.equals('foo'));
     unittest.expect(o.openUrlTemplate, unittest.equals('foo'));
-    checkUnnamed699(o.primaryFileExtensions);
-    checkUnnamed700(o.primaryMimeTypes);
+    checkUnnamed986(o.primaryFileExtensions);
+    checkUnnamed987(o.primaryMimeTypes);
     unittest.expect(o.productId, unittest.equals('foo'));
     unittest.expect(o.productUrl, unittest.equals('foo'));
-    checkUnnamed701(o.secondaryFileExtensions);
-    checkUnnamed702(o.secondaryMimeTypes);
+    checkUnnamed988(o.secondaryFileExtensions);
+    checkUnnamed989(o.secondaryMimeTypes);
     unittest.expect(o.shortDescription, unittest.equals('foo'));
     unittest.expect(o.supportsCreate, unittest.isTrue);
     unittest.expect(o.supportsImport, unittest.isTrue);
@@ -524,27 +559,27 @@
   buildCounterApp--;
 }
 
-buildUnnamed703() {
+buildUnnamed990() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed703(core.List<core.String> o) {
+checkUnnamed990(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed704() {
+buildUnnamed991() {
   var o = new core.List<api.App>();
   o.add(buildApp());
   o.add(buildApp());
   return o;
 }
 
-checkUnnamed704(core.List<api.App> o) {
+checkUnnamed991(core.List<api.App> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkApp(o[0]);
   checkApp(o[1]);
@@ -555,9 +590,9 @@
   var o = new api.AppList();
   buildCounterAppList++;
   if (buildCounterAppList < 3) {
-    o.defaultAppIds = buildUnnamed703();
+    o.defaultAppIds = buildUnnamed990();
     o.etag = "foo";
-    o.items = buildUnnamed704();
+    o.items = buildUnnamed991();
     o.kind = "foo";
     o.selfLink = "foo";
   }
@@ -568,9 +603,9 @@
 checkAppList(api.AppList o) {
   buildCounterAppList++;
   if (buildCounterAppList < 3) {
-    checkUnnamed703(o.defaultAppIds);
+    checkUnnamed990(o.defaultAppIds);
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed704(o.items);
+    checkUnnamed991(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
   }
@@ -608,14 +643,14 @@
   buildCounterChange--;
 }
 
-buildUnnamed705() {
+buildUnnamed992() {
   var o = new core.List<api.Change>();
   o.add(buildChange());
   o.add(buildChange());
   return o;
 }
 
-checkUnnamed705(core.List<api.Change> o) {
+checkUnnamed992(core.List<api.Change> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChange(o[0]);
   checkChange(o[1]);
@@ -627,7 +662,7 @@
   buildCounterChangeList++;
   if (buildCounterChangeList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed705();
+    o.items = buildUnnamed992();
     o.kind = "foo";
     o.largestChangeId = "foo";
     o.nextLink = "foo";
@@ -642,7 +677,7 @@
   buildCounterChangeList++;
   if (buildCounterChangeList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed705(o.items);
+    checkUnnamed992(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.largestChangeId, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -652,14 +687,14 @@
   buildCounterChangeList--;
 }
 
-buildUnnamed706() {
+buildUnnamed993() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed706(core.Map<core.String, core.String> o) {
+checkUnnamed993(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -674,7 +709,7 @@
     o.expiration = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.params = buildUnnamed706();
+    o.params = buildUnnamed993();
     o.payload = true;
     o.resourceId = "foo";
     o.resourceUri = "foo";
@@ -692,7 +727,7 @@
     unittest.expect(o.expiration, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed706(o.params);
+    checkUnnamed993(o.params);
     unittest.expect(o.payload, unittest.isTrue);
     unittest.expect(o.resourceId, unittest.equals('foo'));
     unittest.expect(o.resourceUri, unittest.equals('foo'));
@@ -702,14 +737,14 @@
   buildCounterChannel--;
 }
 
-buildUnnamed707() {
+buildUnnamed994() {
   var o = new core.List<api.ChildReference>();
   o.add(buildChildReference());
   o.add(buildChildReference());
   return o;
 }
 
-checkUnnamed707(core.List<api.ChildReference> o) {
+checkUnnamed994(core.List<api.ChildReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChildReference(o[0]);
   checkChildReference(o[1]);
@@ -721,7 +756,7 @@
   buildCounterChildList++;
   if (buildCounterChildList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed707();
+    o.items = buildUnnamed994();
     o.kind = "foo";
     o.nextLink = "foo";
     o.nextPageToken = "foo";
@@ -735,7 +770,7 @@
   buildCounterChildList++;
   if (buildCounterChildList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed707(o.items);
+    checkUnnamed994(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -790,14 +825,14 @@
   buildCounterCommentContext--;
 }
 
-buildUnnamed708() {
+buildUnnamed995() {
   var o = new core.List<api.CommentReply>();
   o.add(buildCommentReply());
   o.add(buildCommentReply());
   return o;
 }
 
-checkUnnamed708(core.List<api.CommentReply> o) {
+checkUnnamed995(core.List<api.CommentReply> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCommentReply(o[0]);
   checkCommentReply(o[1]);
@@ -820,7 +855,7 @@
     o.htmlContent = "foo";
     o.kind = "foo";
     o.modifiedDate = core.DateTime.parse("2002-02-27T14:01:02");
-    o.replies = buildUnnamed708();
+    o.replies = buildUnnamed995();
     o.selfLink = "foo";
     o.status = "foo";
   }
@@ -843,21 +878,21 @@
     unittest.expect(o.htmlContent, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.modifiedDate, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
-    checkUnnamed708(o.replies);
+    checkUnnamed995(o.replies);
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
   }
   buildCounterComment--;
 }
 
-buildUnnamed709() {
+buildUnnamed996() {
   var o = new core.List<api.Comment>();
   o.add(buildComment());
   o.add(buildComment());
   return o;
 }
 
-checkUnnamed709(core.List<api.Comment> o) {
+checkUnnamed996(core.List<api.Comment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkComment(o[0]);
   checkComment(o[1]);
@@ -868,7 +903,7 @@
   var o = new api.CommentList();
   buildCounterCommentList++;
   if (buildCounterCommentList < 3) {
-    o.items = buildUnnamed709();
+    o.items = buildUnnamed996();
     o.kind = "foo";
     o.nextLink = "foo";
     o.nextPageToken = "foo";
@@ -881,7 +916,7 @@
 checkCommentList(api.CommentList o) {
   buildCounterCommentList++;
   if (buildCounterCommentList < 3) {
-    checkUnnamed709(o.items);
+    checkUnnamed996(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -925,14 +960,14 @@
   buildCounterCommentReply--;
 }
 
-buildUnnamed710() {
+buildUnnamed997() {
   var o = new core.List<api.CommentReply>();
   o.add(buildCommentReply());
   o.add(buildCommentReply());
   return o;
 }
 
-checkUnnamed710(core.List<api.CommentReply> o) {
+checkUnnamed997(core.List<api.CommentReply> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCommentReply(o[0]);
   checkCommentReply(o[1]);
@@ -943,7 +978,7 @@
   var o = new api.CommentReplyList();
   buildCounterCommentReplyList++;
   if (buildCounterCommentReplyList < 3) {
-    o.items = buildUnnamed710();
+    o.items = buildUnnamed997();
     o.kind = "foo";
     o.nextLink = "foo";
     o.nextPageToken = "foo";
@@ -956,7 +991,7 @@
 checkCommentReplyList(api.CommentReplyList o) {
   buildCounterCommentReplyList++;
   if (buildCounterCommentReplyList < 3) {
-    checkUnnamed710(o.items);
+    checkUnnamed997(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -965,14 +1000,14 @@
   buildCounterCommentReplyList--;
 }
 
-buildUnnamed711() {
+buildUnnamed998() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed711(core.Map<core.String, core.String> o) {
+checkUnnamed998(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1106,79 +1141,79 @@
   buildCounterFileLabels--;
 }
 
-buildUnnamed712() {
+buildUnnamed999() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed712(core.Map<core.String, core.String> o) {
+checkUnnamed999(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed713() {
+buildUnnamed1000() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed713(core.List<core.String> o) {
+checkUnnamed1000(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed714() {
+buildUnnamed1001() {
   var o = new core.List<api.User>();
   o.add(buildUser());
   o.add(buildUser());
   return o;
 }
 
-checkUnnamed714(core.List<api.User> o) {
+checkUnnamed1001(core.List<api.User> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUser(o[0]);
   checkUser(o[1]);
 }
 
-buildUnnamed715() {
+buildUnnamed1002() {
   var o = new core.List<api.ParentReference>();
   o.add(buildParentReference());
   o.add(buildParentReference());
   return o;
 }
 
-checkUnnamed715(core.List<api.ParentReference> o) {
+checkUnnamed1002(core.List<api.ParentReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParentReference(o[0]);
   checkParentReference(o[1]);
 }
 
-buildUnnamed716() {
+buildUnnamed1003() {
   var o = new core.List<api.Permission>();
   o.add(buildPermission());
   o.add(buildPermission());
   return o;
 }
 
-checkUnnamed716(core.List<api.Permission> o) {
+checkUnnamed1003(core.List<api.Permission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPermission(o[0]);
   checkPermission(o[1]);
 }
 
-buildUnnamed717() {
+buildUnnamed1004() {
   var o = new core.List<api.Property>();
   o.add(buildProperty());
   o.add(buildProperty());
   return o;
 }
 
-checkUnnamed717(core.List<api.Property> o) {
+checkUnnamed1004(core.List<api.Property> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProperty(o[0]);
   checkProperty(o[1]);
@@ -1244,7 +1279,7 @@
     o.embedLink = "foo";
     o.etag = "foo";
     o.explicitlyTrashed = true;
-    o.exportLinks = buildUnnamed711();
+    o.exportLinks = buildUnnamed998();
     o.fileExtension = "foo";
     o.fileSize = "foo";
     o.folderColorRgb = "foo";
@@ -1263,13 +1298,13 @@
     o.mimeType = "foo";
     o.modifiedByMeDate = core.DateTime.parse("2002-02-27T14:01:02");
     o.modifiedDate = core.DateTime.parse("2002-02-27T14:01:02");
-    o.openWithLinks = buildUnnamed712();
+    o.openWithLinks = buildUnnamed999();
     o.originalFilename = "foo";
-    o.ownerNames = buildUnnamed713();
-    o.owners = buildUnnamed714();
-    o.parents = buildUnnamed715();
-    o.permissions = buildUnnamed716();
-    o.properties = buildUnnamed717();
+    o.ownerNames = buildUnnamed1000();
+    o.owners = buildUnnamed1001();
+    o.parents = buildUnnamed1002();
+    o.permissions = buildUnnamed1003();
+    o.properties = buildUnnamed1004();
     o.quotaBytesUsed = "foo";
     o.selfLink = "foo";
     o.shared = true;
@@ -1303,7 +1338,7 @@
     unittest.expect(o.embedLink, unittest.equals('foo'));
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.explicitlyTrashed, unittest.isTrue);
-    checkUnnamed711(o.exportLinks);
+    checkUnnamed998(o.exportLinks);
     unittest.expect(o.fileExtension, unittest.equals('foo'));
     unittest.expect(o.fileSize, unittest.equals('foo'));
     unittest.expect(o.folderColorRgb, unittest.equals('foo'));
@@ -1322,13 +1357,13 @@
     unittest.expect(o.mimeType, unittest.equals('foo'));
     unittest.expect(o.modifiedByMeDate, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.modifiedDate, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
-    checkUnnamed712(o.openWithLinks);
+    checkUnnamed999(o.openWithLinks);
     unittest.expect(o.originalFilename, unittest.equals('foo'));
-    checkUnnamed713(o.ownerNames);
-    checkUnnamed714(o.owners);
-    checkUnnamed715(o.parents);
-    checkUnnamed716(o.permissions);
-    checkUnnamed717(o.properties);
+    checkUnnamed1000(o.ownerNames);
+    checkUnnamed1001(o.owners);
+    checkUnnamed1002(o.parents);
+    checkUnnamed1003(o.permissions);
+    checkUnnamed1004(o.properties);
     unittest.expect(o.quotaBytesUsed, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.shared, unittest.isTrue);
@@ -1347,14 +1382,14 @@
   buildCounterFile--;
 }
 
-buildUnnamed718() {
+buildUnnamed1005() {
   var o = new core.List<api.File>();
   o.add(buildFile());
   o.add(buildFile());
   return o;
 }
 
-checkUnnamed718(core.List<api.File> o) {
+checkUnnamed1005(core.List<api.File> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFile(o[0]);
   checkFile(o[1]);
@@ -1366,7 +1401,7 @@
   buildCounterFileList++;
   if (buildCounterFileList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed718();
+    o.items = buildUnnamed1005();
     o.kind = "foo";
     o.nextLink = "foo";
     o.nextPageToken = "foo";
@@ -1380,7 +1415,7 @@
   buildCounterFileList++;
   if (buildCounterFileList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed718(o.items);
+    checkUnnamed1005(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -1389,14 +1424,14 @@
   buildCounterFileList--;
 }
 
-buildUnnamed719() {
+buildUnnamed1006() {
   var o = new core.List<api.ParentReference>();
   o.add(buildParentReference());
   o.add(buildParentReference());
   return o;
 }
 
-checkUnnamed719(core.List<api.ParentReference> o) {
+checkUnnamed1006(core.List<api.ParentReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParentReference(o[0]);
   checkParentReference(o[1]);
@@ -1408,7 +1443,7 @@
   buildCounterParentList++;
   if (buildCounterParentList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed719();
+    o.items = buildUnnamed1006();
     o.kind = "foo";
     o.selfLink = "foo";
   }
@@ -1420,7 +1455,7 @@
   buildCounterParentList++;
   if (buildCounterParentList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed719(o.items);
+    checkUnnamed1006(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
   }
@@ -1454,14 +1489,14 @@
   buildCounterParentReference--;
 }
 
-buildUnnamed720() {
+buildUnnamed1007() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed720(core.List<core.String> o) {
+checkUnnamed1007(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1472,7 +1507,7 @@
   var o = new api.Permission();
   buildCounterPermission++;
   if (buildCounterPermission < 3) {
-    o.additionalRoles = buildUnnamed720();
+    o.additionalRoles = buildUnnamed1007();
     o.authKey = "foo";
     o.domain = "foo";
     o.emailAddress = "foo";
@@ -1494,7 +1529,7 @@
 checkPermission(api.Permission o) {
   buildCounterPermission++;
   if (buildCounterPermission < 3) {
-    checkUnnamed720(o.additionalRoles);
+    checkUnnamed1007(o.additionalRoles);
     unittest.expect(o.authKey, unittest.equals('foo'));
     unittest.expect(o.domain, unittest.equals('foo'));
     unittest.expect(o.emailAddress, unittest.equals('foo'));
@@ -1533,14 +1568,14 @@
   buildCounterPermissionId--;
 }
 
-buildUnnamed721() {
+buildUnnamed1008() {
   var o = new core.List<api.Permission>();
   o.add(buildPermission());
   o.add(buildPermission());
   return o;
 }
 
-checkUnnamed721(core.List<api.Permission> o) {
+checkUnnamed1008(core.List<api.Permission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPermission(o[0]);
   checkPermission(o[1]);
@@ -1552,7 +1587,7 @@
   buildCounterPermissionList++;
   if (buildCounterPermissionList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed721();
+    o.items = buildUnnamed1008();
     o.kind = "foo";
     o.selfLink = "foo";
   }
@@ -1564,7 +1599,7 @@
   buildCounterPermissionList++;
   if (buildCounterPermissionList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed721(o.items);
+    checkUnnamed1008(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
   }
@@ -1600,14 +1635,14 @@
   buildCounterProperty--;
 }
 
-buildUnnamed722() {
+buildUnnamed1009() {
   var o = new core.List<api.Property>();
   o.add(buildProperty());
   o.add(buildProperty());
   return o;
 }
 
-checkUnnamed722(core.List<api.Property> o) {
+checkUnnamed1009(core.List<api.Property> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProperty(o[0]);
   checkProperty(o[1]);
@@ -1619,7 +1654,7 @@
   buildCounterPropertyList++;
   if (buildCounterPropertyList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed722();
+    o.items = buildUnnamed1009();
     o.kind = "foo";
     o.selfLink = "foo";
   }
@@ -1631,21 +1666,21 @@
   buildCounterPropertyList++;
   if (buildCounterPropertyList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed722(o.items);
+    checkUnnamed1009(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
   }
   buildCounterPropertyList--;
 }
 
-buildUnnamed723() {
+buildUnnamed1010() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed723(core.Map<core.String, core.String> o) {
+checkUnnamed1010(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1658,7 +1693,7 @@
   if (buildCounterRevision < 3) {
     o.downloadUrl = "foo";
     o.etag = "foo";
-    o.exportLinks = buildUnnamed723();
+    o.exportLinks = buildUnnamed1010();
     o.fileSize = "foo";
     o.id = "foo";
     o.kind = "foo";
@@ -1684,7 +1719,7 @@
   if (buildCounterRevision < 3) {
     unittest.expect(o.downloadUrl, unittest.equals('foo'));
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed723(o.exportLinks);
+    checkUnnamed1010(o.exportLinks);
     unittest.expect(o.fileSize, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
@@ -1704,14 +1739,14 @@
   buildCounterRevision--;
 }
 
-buildUnnamed724() {
+buildUnnamed1011() {
   var o = new core.List<api.Revision>();
   o.add(buildRevision());
   o.add(buildRevision());
   return o;
 }
 
-checkUnnamed724(core.List<api.Revision> o) {
+checkUnnamed1011(core.List<api.Revision> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRevision(o[0]);
   checkRevision(o[1]);
@@ -1723,7 +1758,7 @@
   buildCounterRevisionList++;
   if (buildCounterRevisionList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed724();
+    o.items = buildUnnamed1011();
     o.kind = "foo";
     o.selfLink = "foo";
   }
@@ -1735,7 +1770,7 @@
   buildCounterRevisionList++;
   if (buildCounterRevisionList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed724(o.items);
+    checkUnnamed1011(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
   }
@@ -2155,7 +2190,7 @@
   unittest.group("resource-AboutResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AboutResourceApi res = new api.DriveApi(mock).about;
       var arg_includeSubscribed = true;
       var arg_maxChangeIdCount = "foo";
@@ -2197,7 +2232,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAbout());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(includeSubscribed: arg_includeSubscribed, maxChangeIdCount: arg_maxChangeIdCount, startChangeId: arg_startChangeId).then(unittest.expectAsync(((api.About response) {
         checkAbout(response);
@@ -2210,7 +2245,7 @@
   unittest.group("resource-AppsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AppsResourceApi res = new api.DriveApi(mock).apps;
       var arg_appId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2250,7 +2285,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildApp());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_appId).then(unittest.expectAsync(((api.App response) {
         checkApp(response);
@@ -2259,7 +2294,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AppsResourceApi res = new api.DriveApi(mock).apps;
       var arg_appFilterExtensions = "foo";
       var arg_appFilterMimeTypes = "foo";
@@ -2301,7 +2336,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAppList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(appFilterExtensions: arg_appFilterExtensions, appFilterMimeTypes: arg_appFilterMimeTypes, languageCode: arg_languageCode).then(unittest.expectAsync(((api.AppList response) {
         checkAppList(response);
@@ -2314,7 +2349,7 @@
   unittest.group("resource-ChangesResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ChangesResourceApi res = new api.DriveApi(mock).changes;
       var arg_changeId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2354,7 +2389,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChange());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_changeId).then(unittest.expectAsync(((api.Change response) {
         checkChange(response);
@@ -2363,7 +2398,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ChangesResourceApi res = new api.DriveApi(mock).changes;
       var arg_includeDeleted = true;
       var arg_includeSubscribed = true;
@@ -2409,7 +2444,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChangeList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(includeDeleted: arg_includeDeleted, includeSubscribed: arg_includeSubscribed, maxResults: arg_maxResults, pageToken: arg_pageToken, startChangeId: arg_startChangeId).then(unittest.expectAsync(((api.ChangeList response) {
         checkChangeList(response);
@@ -2418,7 +2453,7 @@
 
     unittest.test("method--watch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ChangesResourceApi res = new api.DriveApi(mock).changes;
       var arg_request = buildChannel();
       var arg_includeDeleted = true;
@@ -2468,7 +2503,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChannel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.watch(arg_request, includeDeleted: arg_includeDeleted, includeSubscribed: arg_includeSubscribed, maxResults: arg_maxResults, pageToken: arg_pageToken, startChangeId: arg_startChangeId).then(unittest.expectAsync(((api.Channel response) {
         checkChannel(response);
@@ -2481,7 +2516,7 @@
   unittest.group("resource-ChannelsResourceApi", () {
     unittest.test("method--stop", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ChannelsResourceApi res = new api.DriveApi(mock).channels;
       var arg_request = buildChannel();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2521,7 +2556,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.stop(arg_request).then(unittest.expectAsync((_) {}));
     });
@@ -2532,7 +2567,7 @@
   unittest.group("resource-ChildrenResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ChildrenResourceApi res = new api.DriveApi(mock).children;
       var arg_folderId = "foo";
       var arg_childId = "foo";
@@ -2580,14 +2615,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_folderId, arg_childId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ChildrenResourceApi res = new api.DriveApi(mock).children;
       var arg_folderId = "foo";
       var arg_childId = "foo";
@@ -2635,7 +2670,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChildReference());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_folderId, arg_childId).then(unittest.expectAsync(((api.ChildReference response) {
         checkChildReference(response);
@@ -2644,7 +2679,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ChildrenResourceApi res = new api.DriveApi(mock).children;
       var arg_request = buildChildReference();
       var arg_folderId = "foo";
@@ -2692,7 +2727,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChildReference());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_folderId).then(unittest.expectAsync(((api.ChildReference response) {
         checkChildReference(response);
@@ -2701,7 +2736,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ChildrenResourceApi res = new api.DriveApi(mock).children;
       var arg_folderId = "foo";
       var arg_maxResults = 42;
@@ -2751,7 +2786,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChildList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_folderId, maxResults: arg_maxResults, pageToken: arg_pageToken, q: arg_q).then(unittest.expectAsync(((api.ChildList response) {
         checkChildList(response);
@@ -2764,7 +2799,7 @@
   unittest.group("resource-CommentsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CommentsResourceApi res = new api.DriveApi(mock).comments;
       var arg_fileId = "foo";
       var arg_commentId = "foo";
@@ -2812,14 +2847,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_fileId, arg_commentId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CommentsResourceApi res = new api.DriveApi(mock).comments;
       var arg_fileId = "foo";
       var arg_commentId = "foo";
@@ -2869,7 +2904,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildComment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_fileId, arg_commentId, includeDeleted: arg_includeDeleted).then(unittest.expectAsync(((api.Comment response) {
         checkComment(response);
@@ -2878,7 +2913,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CommentsResourceApi res = new api.DriveApi(mock).comments;
       var arg_request = buildComment();
       var arg_fileId = "foo";
@@ -2926,7 +2961,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildComment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_fileId).then(unittest.expectAsync(((api.Comment response) {
         checkComment(response);
@@ -2935,7 +2970,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CommentsResourceApi res = new api.DriveApi(mock).comments;
       var arg_fileId = "foo";
       var arg_includeDeleted = true;
@@ -2987,7 +3022,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCommentList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_fileId, includeDeleted: arg_includeDeleted, maxResults: arg_maxResults, pageToken: arg_pageToken, updatedMin: arg_updatedMin).then(unittest.expectAsync(((api.CommentList response) {
         checkCommentList(response);
@@ -2996,7 +3031,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CommentsResourceApi res = new api.DriveApi(mock).comments;
       var arg_request = buildComment();
       var arg_fileId = "foo";
@@ -3048,7 +3083,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildComment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_fileId, arg_commentId).then(unittest.expectAsync(((api.Comment response) {
         checkComment(response);
@@ -3057,7 +3092,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CommentsResourceApi res = new api.DriveApi(mock).comments;
       var arg_request = buildComment();
       var arg_fileId = "foo";
@@ -3109,7 +3144,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildComment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_fileId, arg_commentId).then(unittest.expectAsync(((api.Comment response) {
         checkComment(response);
@@ -3122,7 +3157,7 @@
   unittest.group("resource-FilesResourceApi", () {
     unittest.test("method--copy", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FilesResourceApi res = new api.DriveApi(mock).files;
       var arg_request = buildFile();
       var arg_fileId = "foo";
@@ -3184,7 +3219,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.copy(arg_request, arg_fileId, convert: arg_convert, ocr: arg_ocr, ocrLanguage: arg_ocrLanguage, pinned: arg_pinned, timedTextLanguage: arg_timedTextLanguage, timedTextTrackName: arg_timedTextTrackName, visibility: arg_visibility).then(unittest.expectAsync(((api.File response) {
         checkFile(response);
@@ -3193,7 +3228,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FilesResourceApi res = new api.DriveApi(mock).files;
       var arg_fileId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -3233,14 +3268,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_fileId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--emptyTrash", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FilesResourceApi res = new api.DriveApi(mock).files;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -3276,7 +3311,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.emptyTrash().then(unittest.expectAsync((_) {}));
     });
@@ -3285,11 +3320,12 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FilesResourceApi res = new api.DriveApi(mock).files;
       var arg_fileId = "foo";
       var arg_acknowledgeAbuse = true;
       var arg_projection = "foo";
+      var arg_revisionId = "foo";
       var arg_updateViewedDate = true;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -3324,6 +3360,7 @@
         }
         unittest.expect(queryMap["acknowledgeAbuse"].first, unittest.equals("$arg_acknowledgeAbuse"));
         unittest.expect(queryMap["projection"].first, unittest.equals(arg_projection));
+        unittest.expect(queryMap["revisionId"].first, unittest.equals(arg_revisionId));
         unittest.expect(queryMap["updateViewedDate"].first, unittest.equals("$arg_updateViewedDate"));
 
 
@@ -3331,9 +3368,9 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_fileId, acknowledgeAbuse: arg_acknowledgeAbuse, projection: arg_projection, updateViewedDate: arg_updateViewedDate).then(unittest.expectAsync(((api.File response) {
+      res.get(arg_fileId, acknowledgeAbuse: arg_acknowledgeAbuse, projection: arg_projection, revisionId: arg_revisionId, updateViewedDate: arg_updateViewedDate).then(unittest.expectAsync(((api.File response) {
         checkFile(response);
       })));
     });
@@ -3342,7 +3379,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FilesResourceApi res = new api.DriveApi(mock).files;
       var arg_request = buildFile();
       var arg_convert = true;
@@ -3398,7 +3435,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, convert: arg_convert, ocr: arg_ocr, ocrLanguage: arg_ocrLanguage, pinned: arg_pinned, timedTextLanguage: arg_timedTextLanguage, timedTextTrackName: arg_timedTextTrackName, useContentAsIndexableText: arg_useContentAsIndexableText, visibility: arg_visibility).then(unittest.expectAsync(((api.File response) {
         checkFile(response);
@@ -3407,7 +3444,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FilesResourceApi res = new api.DriveApi(mock).files;
       var arg_corpus = "foo";
       var arg_maxResults = 42;
@@ -3453,7 +3490,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFileList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(corpus: arg_corpus, maxResults: arg_maxResults, pageToken: arg_pageToken, projection: arg_projection, q: arg_q).then(unittest.expectAsync(((api.FileList response) {
         checkFileList(response);
@@ -3462,7 +3499,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FilesResourceApi res = new api.DriveApi(mock).files;
       var arg_request = buildFile();
       var arg_fileId = "foo";
@@ -3530,7 +3567,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_fileId, addParents: arg_addParents, convert: arg_convert, newRevision: arg_newRevision, ocr: arg_ocr, ocrLanguage: arg_ocrLanguage, pinned: arg_pinned, removeParents: arg_removeParents, setModifiedDate: arg_setModifiedDate, timedTextLanguage: arg_timedTextLanguage, timedTextTrackName: arg_timedTextTrackName, updateViewedDate: arg_updateViewedDate, useContentAsIndexableText: arg_useContentAsIndexableText).then(unittest.expectAsync(((api.File response) {
         checkFile(response);
@@ -3539,7 +3576,7 @@
 
     unittest.test("method--touch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FilesResourceApi res = new api.DriveApi(mock).files;
       var arg_fileId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -3583,7 +3620,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.touch(arg_fileId).then(unittest.expectAsync(((api.File response) {
         checkFile(response);
@@ -3592,7 +3629,7 @@
 
     unittest.test("method--trash", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FilesResourceApi res = new api.DriveApi(mock).files;
       var arg_fileId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -3636,7 +3673,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.trash(arg_fileId).then(unittest.expectAsync(((api.File response) {
         checkFile(response);
@@ -3645,7 +3682,7 @@
 
     unittest.test("method--untrash", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FilesResourceApi res = new api.DriveApi(mock).files;
       var arg_fileId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -3689,7 +3726,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.untrash(arg_fileId).then(unittest.expectAsync(((api.File response) {
         checkFile(response);
@@ -3700,7 +3737,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FilesResourceApi res = new api.DriveApi(mock).files;
       var arg_request = buildFile();
       var arg_fileId = "foo";
@@ -3768,7 +3805,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_fileId, addParents: arg_addParents, convert: arg_convert, newRevision: arg_newRevision, ocr: arg_ocr, ocrLanguage: arg_ocrLanguage, pinned: arg_pinned, removeParents: arg_removeParents, setModifiedDate: arg_setModifiedDate, timedTextLanguage: arg_timedTextLanguage, timedTextTrackName: arg_timedTextTrackName, updateViewedDate: arg_updateViewedDate, useContentAsIndexableText: arg_useContentAsIndexableText).then(unittest.expectAsync(((api.File response) {
         checkFile(response);
@@ -3779,12 +3816,13 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FilesResourceApi res = new api.DriveApi(mock).files;
       var arg_request = buildChannel();
       var arg_fileId = "foo";
       var arg_acknowledgeAbuse = true;
       var arg_projection = "foo";
+      var arg_revisionId = "foo";
       var arg_updateViewedDate = true;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var obj = new api.Channel.fromJson(json);
@@ -3826,6 +3864,7 @@
         }
         unittest.expect(queryMap["acknowledgeAbuse"].first, unittest.equals("$arg_acknowledgeAbuse"));
         unittest.expect(queryMap["projection"].first, unittest.equals(arg_projection));
+        unittest.expect(queryMap["revisionId"].first, unittest.equals(arg_revisionId));
         unittest.expect(queryMap["updateViewedDate"].first, unittest.equals("$arg_updateViewedDate"));
 
 
@@ -3833,9 +3872,9 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChannel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.watch(arg_request, arg_fileId, acknowledgeAbuse: arg_acknowledgeAbuse, projection: arg_projection, updateViewedDate: arg_updateViewedDate).then(unittest.expectAsync(((api.Channel response) {
+      res.watch(arg_request, arg_fileId, acknowledgeAbuse: arg_acknowledgeAbuse, projection: arg_projection, revisionId: arg_revisionId, updateViewedDate: arg_updateViewedDate).then(unittest.expectAsync(((api.Channel response) {
         checkChannel(response);
       })));
     });
@@ -3846,7 +3885,7 @@
   unittest.group("resource-ParentsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ParentsResourceApi res = new api.DriveApi(mock).parents;
       var arg_fileId = "foo";
       var arg_parentId = "foo";
@@ -3894,14 +3933,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_fileId, arg_parentId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ParentsResourceApi res = new api.DriveApi(mock).parents;
       var arg_fileId = "foo";
       var arg_parentId = "foo";
@@ -3949,7 +3988,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildParentReference());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_fileId, arg_parentId).then(unittest.expectAsync(((api.ParentReference response) {
         checkParentReference(response);
@@ -3958,7 +3997,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ParentsResourceApi res = new api.DriveApi(mock).parents;
       var arg_request = buildParentReference();
       var arg_fileId = "foo";
@@ -4006,7 +4045,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildParentReference());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_fileId).then(unittest.expectAsync(((api.ParentReference response) {
         checkParentReference(response);
@@ -4015,7 +4054,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ParentsResourceApi res = new api.DriveApi(mock).parents;
       var arg_fileId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -4059,7 +4098,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildParentList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_fileId).then(unittest.expectAsync(((api.ParentList response) {
         checkParentList(response);
@@ -4072,7 +4111,7 @@
   unittest.group("resource-PermissionsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PermissionsResourceApi res = new api.DriveApi(mock).permissions;
       var arg_fileId = "foo";
       var arg_permissionId = "foo";
@@ -4120,14 +4159,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_fileId, arg_permissionId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PermissionsResourceApi res = new api.DriveApi(mock).permissions;
       var arg_fileId = "foo";
       var arg_permissionId = "foo";
@@ -4175,7 +4214,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPermission());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_fileId, arg_permissionId).then(unittest.expectAsync(((api.Permission response) {
         checkPermission(response);
@@ -4184,7 +4223,7 @@
 
     unittest.test("method--getIdForEmail", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PermissionsResourceApi res = new api.DriveApi(mock).permissions;
       var arg_email = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -4224,7 +4263,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPermissionId());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.getIdForEmail(arg_email).then(unittest.expectAsync(((api.PermissionId response) {
         checkPermissionId(response);
@@ -4233,7 +4272,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PermissionsResourceApi res = new api.DriveApi(mock).permissions;
       var arg_request = buildPermission();
       var arg_fileId = "foo";
@@ -4285,7 +4324,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPermission());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_fileId, emailMessage: arg_emailMessage, sendNotificationEmails: arg_sendNotificationEmails).then(unittest.expectAsync(((api.Permission response) {
         checkPermission(response);
@@ -4294,7 +4333,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PermissionsResourceApi res = new api.DriveApi(mock).permissions;
       var arg_fileId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -4338,7 +4377,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPermissionList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_fileId).then(unittest.expectAsync(((api.PermissionList response) {
         checkPermissionList(response);
@@ -4347,7 +4386,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PermissionsResourceApi res = new api.DriveApi(mock).permissions;
       var arg_request = buildPermission();
       var arg_fileId = "foo";
@@ -4401,7 +4440,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPermission());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_fileId, arg_permissionId, transferOwnership: arg_transferOwnership).then(unittest.expectAsync(((api.Permission response) {
         checkPermission(response);
@@ -4410,7 +4449,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PermissionsResourceApi res = new api.DriveApi(mock).permissions;
       var arg_request = buildPermission();
       var arg_fileId = "foo";
@@ -4464,7 +4503,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPermission());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_fileId, arg_permissionId, transferOwnership: arg_transferOwnership).then(unittest.expectAsync(((api.Permission response) {
         checkPermission(response);
@@ -4477,7 +4516,7 @@
   unittest.group("resource-PropertiesResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PropertiesResourceApi res = new api.DriveApi(mock).properties;
       var arg_fileId = "foo";
       var arg_propertyKey = "foo";
@@ -4527,14 +4566,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_fileId, arg_propertyKey, visibility: arg_visibility).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PropertiesResourceApi res = new api.DriveApi(mock).properties;
       var arg_fileId = "foo";
       var arg_propertyKey = "foo";
@@ -4584,7 +4623,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProperty());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_fileId, arg_propertyKey, visibility: arg_visibility).then(unittest.expectAsync(((api.Property response) {
         checkProperty(response);
@@ -4593,7 +4632,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PropertiesResourceApi res = new api.DriveApi(mock).properties;
       var arg_request = buildProperty();
       var arg_fileId = "foo";
@@ -4641,7 +4680,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProperty());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_fileId).then(unittest.expectAsync(((api.Property response) {
         checkProperty(response);
@@ -4650,7 +4689,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PropertiesResourceApi res = new api.DriveApi(mock).properties;
       var arg_fileId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -4694,7 +4733,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPropertyList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_fileId).then(unittest.expectAsync(((api.PropertyList response) {
         checkPropertyList(response);
@@ -4703,7 +4742,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PropertiesResourceApi res = new api.DriveApi(mock).properties;
       var arg_request = buildProperty();
       var arg_fileId = "foo";
@@ -4757,7 +4796,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProperty());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_fileId, arg_propertyKey, visibility: arg_visibility).then(unittest.expectAsync(((api.Property response) {
         checkProperty(response);
@@ -4766,7 +4805,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PropertiesResourceApi res = new api.DriveApi(mock).properties;
       var arg_request = buildProperty();
       var arg_fileId = "foo";
@@ -4820,7 +4859,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProperty());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_fileId, arg_propertyKey, visibility: arg_visibility).then(unittest.expectAsync(((api.Property response) {
         checkProperty(response);
@@ -4835,7 +4874,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RealtimeResourceApi res = new api.DriveApi(mock).realtime;
       var arg_fileId = "foo";
       var arg_revision = 42;
@@ -4881,7 +4920,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_fileId, revision: arg_revision).then(unittest.expectAsync((_) {}));
     });
@@ -4890,7 +4929,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RealtimeResourceApi res = new api.DriveApi(mock).realtime;
       var arg_fileId = "foo";
       var arg_baseRevision = "foo";
@@ -4936,7 +4975,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_fileId, baseRevision: arg_baseRevision).then(unittest.expectAsync((_) {}));
     });
@@ -4947,7 +4986,7 @@
   unittest.group("resource-RepliesResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RepliesResourceApi res = new api.DriveApi(mock).replies;
       var arg_fileId = "foo";
       var arg_commentId = "foo";
@@ -5003,14 +5042,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_fileId, arg_commentId, arg_replyId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RepliesResourceApi res = new api.DriveApi(mock).replies;
       var arg_fileId = "foo";
       var arg_commentId = "foo";
@@ -5068,7 +5107,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCommentReply());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_fileId, arg_commentId, arg_replyId, includeDeleted: arg_includeDeleted).then(unittest.expectAsync(((api.CommentReply response) {
         checkCommentReply(response);
@@ -5077,7 +5116,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RepliesResourceApi res = new api.DriveApi(mock).replies;
       var arg_request = buildCommentReply();
       var arg_fileId = "foo";
@@ -5133,7 +5172,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCommentReply());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_fileId, arg_commentId).then(unittest.expectAsync(((api.CommentReply response) {
         checkCommentReply(response);
@@ -5142,7 +5181,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RepliesResourceApi res = new api.DriveApi(mock).replies;
       var arg_fileId = "foo";
       var arg_commentId = "foo";
@@ -5200,7 +5239,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCommentReplyList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_fileId, arg_commentId, includeDeleted: arg_includeDeleted, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.CommentReplyList response) {
         checkCommentReplyList(response);
@@ -5209,7 +5248,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RepliesResourceApi res = new api.DriveApi(mock).replies;
       var arg_request = buildCommentReply();
       var arg_fileId = "foo";
@@ -5269,7 +5308,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCommentReply());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_fileId, arg_commentId, arg_replyId).then(unittest.expectAsync(((api.CommentReply response) {
         checkCommentReply(response);
@@ -5278,7 +5317,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RepliesResourceApi res = new api.DriveApi(mock).replies;
       var arg_request = buildCommentReply();
       var arg_fileId = "foo";
@@ -5338,7 +5377,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCommentReply());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_fileId, arg_commentId, arg_replyId).then(unittest.expectAsync(((api.CommentReply response) {
         checkCommentReply(response);
@@ -5351,7 +5390,7 @@
   unittest.group("resource-RevisionsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RevisionsResourceApi res = new api.DriveApi(mock).revisions;
       var arg_fileId = "foo";
       var arg_revisionId = "foo";
@@ -5399,14 +5438,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_fileId, arg_revisionId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RevisionsResourceApi res = new api.DriveApi(mock).revisions;
       var arg_fileId = "foo";
       var arg_revisionId = "foo";
@@ -5454,7 +5493,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRevision());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_fileId, arg_revisionId).then(unittest.expectAsync(((api.Revision response) {
         checkRevision(response);
@@ -5463,7 +5502,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RevisionsResourceApi res = new api.DriveApi(mock).revisions;
       var arg_fileId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -5507,7 +5546,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRevisionList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_fileId).then(unittest.expectAsync(((api.RevisionList response) {
         checkRevisionList(response);
@@ -5516,7 +5555,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RevisionsResourceApi res = new api.DriveApi(mock).revisions;
       var arg_request = buildRevision();
       var arg_fileId = "foo";
@@ -5568,7 +5607,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRevision());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_fileId, arg_revisionId).then(unittest.expectAsync(((api.Revision response) {
         checkRevision(response);
@@ -5577,7 +5616,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RevisionsResourceApi res = new api.DriveApi(mock).revisions;
       var arg_request = buildRevision();
       var arg_fileId = "foo";
@@ -5629,7 +5668,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRevision());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_fileId, arg_revisionId).then(unittest.expectAsync(((api.Revision response) {
         checkRevision(response);
diff --git a/generated/googleapis/test/fitness/v1_test.dart b/generated/googleapis/test/fitness/v1_test.dart
index 0e8bd7d..f27ae5e 100644
--- a/generated/googleapis/test/fitness/v1_test.dart
+++ b/generated/googleapis/test/fitness/v1_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/fitness/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterApplication = 0;
 buildApplication() {
@@ -41,14 +76,14 @@
   buildCounterApplication--;
 }
 
-buildUnnamed1227() {
+buildUnnamed1012() {
   var o = new core.List<api.Value>();
   o.add(buildValue());
   o.add(buildValue());
   return o;
 }
 
-checkUnnamed1227(core.List<api.Value> o) {
+checkUnnamed1012(core.List<api.Value> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkValue(o[0]);
   checkValue(o[1]);
@@ -66,7 +101,7 @@
     o.originDataSourceId = "foo";
     o.rawTimestampNanos = "foo";
     o.startTimeNanos = "foo";
-    o.value = buildUnnamed1227();
+    o.value = buildUnnamed1012();
   }
   buildCounterDataPoint--;
   return o;
@@ -82,7 +117,7 @@
     unittest.expect(o.originDataSourceId, unittest.equals('foo'));
     unittest.expect(o.rawTimestampNanos, unittest.equals('foo'));
     unittest.expect(o.startTimeNanos, unittest.equals('foo'));
-    checkUnnamed1227(o.value);
+    checkUnnamed1012(o.value);
   }
   buildCounterDataPoint--;
 }
@@ -118,14 +153,14 @@
   buildCounterDataSource--;
 }
 
-buildUnnamed1228() {
+buildUnnamed1013() {
   var o = new core.List<api.DataTypeField>();
   o.add(buildDataTypeField());
   o.add(buildDataTypeField());
   return o;
 }
 
-checkUnnamed1228(core.List<api.DataTypeField> o) {
+checkUnnamed1013(core.List<api.DataTypeField> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDataTypeField(o[0]);
   checkDataTypeField(o[1]);
@@ -136,7 +171,7 @@
   var o = new api.DataType();
   buildCounterDataType++;
   if (buildCounterDataType < 3) {
-    o.field = buildUnnamed1228();
+    o.field = buildUnnamed1013();
     o.name = "foo";
   }
   buildCounterDataType--;
@@ -146,7 +181,7 @@
 checkDataType(api.DataType o) {
   buildCounterDataType++;
   if (buildCounterDataType < 3) {
-    checkUnnamed1228(o.field);
+    checkUnnamed1013(o.field);
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterDataType--;
@@ -175,14 +210,14 @@
   buildCounterDataTypeField--;
 }
 
-buildUnnamed1229() {
+buildUnnamed1014() {
   var o = new core.List<api.DataPoint>();
   o.add(buildDataPoint());
   o.add(buildDataPoint());
   return o;
 }
 
-checkUnnamed1229(core.List<api.DataPoint> o) {
+checkUnnamed1014(core.List<api.DataPoint> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDataPoint(o[0]);
   checkDataPoint(o[1]);
@@ -197,7 +232,7 @@
     o.maxEndTimeNs = "foo";
     o.minStartTimeNs = "foo";
     o.nextPageToken = "foo";
-    o.point = buildUnnamed1229();
+    o.point = buildUnnamed1014();
   }
   buildCounterDataset--;
   return o;
@@ -210,7 +245,7 @@
     unittest.expect(o.maxEndTimeNs, unittest.equals('foo'));
     unittest.expect(o.minStartTimeNs, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1229(o.point);
+    checkUnnamed1014(o.point);
   }
   buildCounterDataset--;
 }
@@ -242,14 +277,14 @@
   buildCounterDevice--;
 }
 
-buildUnnamed1230() {
+buildUnnamed1015() {
   var o = new core.List<api.DataSource>();
   o.add(buildDataSource());
   o.add(buildDataSource());
   return o;
 }
 
-checkUnnamed1230(core.List<api.DataSource> o) {
+checkUnnamed1015(core.List<api.DataSource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDataSource(o[0]);
   checkDataSource(o[1]);
@@ -260,7 +295,7 @@
   var o = new api.ListDataSourcesResponse();
   buildCounterListDataSourcesResponse++;
   if (buildCounterListDataSourcesResponse < 3) {
-    o.dataSource = buildUnnamed1230();
+    o.dataSource = buildUnnamed1015();
   }
   buildCounterListDataSourcesResponse--;
   return o;
@@ -269,32 +304,32 @@
 checkListDataSourcesResponse(api.ListDataSourcesResponse o) {
   buildCounterListDataSourcesResponse++;
   if (buildCounterListDataSourcesResponse < 3) {
-    checkUnnamed1230(o.dataSource);
+    checkUnnamed1015(o.dataSource);
   }
   buildCounterListDataSourcesResponse--;
 }
 
-buildUnnamed1231() {
+buildUnnamed1016() {
   var o = new core.List<api.Session>();
   o.add(buildSession());
   o.add(buildSession());
   return o;
 }
 
-checkUnnamed1231(core.List<api.Session> o) {
+checkUnnamed1016(core.List<api.Session> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSession(o[0]);
   checkSession(o[1]);
 }
 
-buildUnnamed1232() {
+buildUnnamed1017() {
   var o = new core.List<api.Session>();
   o.add(buildSession());
   o.add(buildSession());
   return o;
 }
 
-checkUnnamed1232(core.List<api.Session> o) {
+checkUnnamed1017(core.List<api.Session> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSession(o[0]);
   checkSession(o[1]);
@@ -305,9 +340,9 @@
   var o = new api.ListSessionsResponse();
   buildCounterListSessionsResponse++;
   if (buildCounterListSessionsResponse < 3) {
-    o.deletedSession = buildUnnamed1231();
+    o.deletedSession = buildUnnamed1016();
     o.nextPageToken = "foo";
-    o.session = buildUnnamed1232();
+    o.session = buildUnnamed1017();
   }
   buildCounterListSessionsResponse--;
   return o;
@@ -316,9 +351,9 @@
 checkListSessionsResponse(api.ListSessionsResponse o) {
   buildCounterListSessionsResponse++;
   if (buildCounterListSessionsResponse < 3) {
-    checkUnnamed1231(o.deletedSession);
+    checkUnnamed1016(o.deletedSession);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1232(o.session);
+    checkUnnamed1017(o.session);
   }
   buildCounterListSessionsResponse--;
 }
@@ -377,14 +412,14 @@
   buildCounterValue--;
 }
 
-buildUnnamed1233() {
+buildUnnamed1018() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1233(core.List<core.String> o) {
+checkUnnamed1018(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -494,7 +529,7 @@
   unittest.group("resource-UsersDataSourcesResourceApi", () {
     unittest.test("method--create", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersDataSourcesResourceApi res = new api.FitnessApi(mock).users.dataSources;
       var arg_request = buildDataSource();
       var arg_userId = "foo";
@@ -531,7 +566,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDataSource());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.create(arg_request, arg_userId).then(unittest.expectAsync(((api.DataSource response) {
         checkDataSource(response);
@@ -540,7 +575,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersDataSourcesResourceApi res = new api.FitnessApi(mock).users.dataSources;
       var arg_userId = "foo";
       var arg_dataSourceId = "foo";
@@ -574,7 +609,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDataSource());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_userId, arg_dataSourceId).then(unittest.expectAsync(((api.DataSource response) {
         checkDataSource(response);
@@ -583,10 +618,10 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersDataSourcesResourceApi res = new api.FitnessApi(mock).users.dataSources;
       var arg_userId = "foo";
-      var arg_dataTypeName = buildUnnamed1233();
+      var arg_dataTypeName = buildUnnamed1018();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -618,7 +653,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListDataSourcesResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userId, dataTypeName: arg_dataTypeName).then(unittest.expectAsync(((api.ListDataSourcesResponse response) {
         checkListDataSourcesResponse(response);
@@ -627,7 +662,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersDataSourcesResourceApi res = new api.FitnessApi(mock).users.dataSources;
       var arg_request = buildDataSource();
       var arg_userId = "foo";
@@ -665,7 +700,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDataSource());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_userId, arg_dataSourceId).then(unittest.expectAsync(((api.DataSource response) {
         checkDataSource(response);
@@ -674,7 +709,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersDataSourcesResourceApi res = new api.FitnessApi(mock).users.dataSources;
       var arg_request = buildDataSource();
       var arg_userId = "foo";
@@ -712,7 +747,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDataSource());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_userId, arg_dataSourceId).then(unittest.expectAsync(((api.DataSource response) {
         checkDataSource(response);
@@ -725,7 +760,7 @@
   unittest.group("resource-UsersDataSourcesDatasetsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersDataSourcesDatasetsResourceApi res = new api.FitnessApi(mock).users.dataSources.datasets;
       var arg_userId = "foo";
       var arg_dataSourceId = "foo";
@@ -764,14 +799,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_userId, arg_dataSourceId, arg_datasetId, currentTimeMillis: arg_currentTimeMillis, modifiedTimeMillis: arg_modifiedTimeMillis).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersDataSourcesDatasetsResourceApi res = new api.FitnessApi(mock).users.dataSources.datasets;
       var arg_userId = "foo";
       var arg_dataSourceId = "foo";
@@ -810,7 +845,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDataset());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_userId, arg_dataSourceId, arg_datasetId, limit: arg_limit, pageToken: arg_pageToken).then(unittest.expectAsync(((api.Dataset response) {
         checkDataset(response);
@@ -819,7 +854,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersDataSourcesDatasetsResourceApi res = new api.FitnessApi(mock).users.dataSources.datasets;
       var arg_request = buildDataset();
       var arg_userId = "foo";
@@ -860,7 +895,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDataset());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_userId, arg_dataSourceId, arg_datasetId, currentTimeMillis: arg_currentTimeMillis).then(unittest.expectAsync(((api.Dataset response) {
         checkDataset(response);
@@ -873,7 +908,7 @@
   unittest.group("resource-UsersSessionsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersSessionsResourceApi res = new api.FitnessApi(mock).users.sessions;
       var arg_userId = "foo";
       var arg_sessionId = "foo";
@@ -909,14 +944,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_userId, arg_sessionId, currentTimeMillis: arg_currentTimeMillis).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersSessionsResourceApi res = new api.FitnessApi(mock).users.sessions;
       var arg_userId = "foo";
       var arg_endTime = "foo";
@@ -957,7 +992,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListSessionsResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userId, endTime: arg_endTime, includeDeleted: arg_includeDeleted, pageToken: arg_pageToken, startTime: arg_startTime).then(unittest.expectAsync(((api.ListSessionsResponse response) {
         checkListSessionsResponse(response);
@@ -966,7 +1001,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersSessionsResourceApi res = new api.FitnessApi(mock).users.sessions;
       var arg_request = buildSession();
       var arg_userId = "foo";
@@ -1006,7 +1041,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSession());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_userId, arg_sessionId, currentTimeMillis: arg_currentTimeMillis).then(unittest.expectAsync(((api.Session response) {
         checkSession(response);
diff --git a/generated/googleapis/test/freebase/v1_test.dart b/generated/googleapis/test/freebase/v1_test.dart
index d2ba98b..bc9996a 100644
--- a/generated/googleapis/test/freebase/v1_test.dart
+++ b/generated/googleapis/test/freebase/v1_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/freebase/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterReconcileCandidateNotable = 0;
 buildReconcileCandidateNotable() {
@@ -64,14 +99,14 @@
   buildCounterReconcileCandidate--;
 }
 
-buildUnnamed1045() {
+buildUnnamed1019() {
   var o = new core.List<api.ReconcileCandidate>();
   o.add(buildReconcileCandidate());
   o.add(buildReconcileCandidate());
   return o;
 }
 
-checkUnnamed1045(core.List<api.ReconcileCandidate> o) {
+checkUnnamed1019(core.List<api.ReconcileCandidate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReconcileCandidate(o[0]);
   checkReconcileCandidate(o[1]);
@@ -121,14 +156,14 @@
   buildCounterReconcileGetWarning--;
 }
 
-buildUnnamed1046() {
+buildUnnamed1020() {
   var o = new core.List<api.ReconcileGetWarning>();
   o.add(buildReconcileGetWarning());
   o.add(buildReconcileGetWarning());
   return o;
 }
 
-checkUnnamed1046(core.List<api.ReconcileGetWarning> o) {
+checkUnnamed1020(core.List<api.ReconcileGetWarning> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReconcileGetWarning(o[0]);
   checkReconcileGetWarning(o[1]);
@@ -139,10 +174,10 @@
   var o = new api.ReconcileGet();
   buildCounterReconcileGet++;
   if (buildCounterReconcileGet < 3) {
-    o.candidate = buildUnnamed1045();
+    o.candidate = buildUnnamed1019();
     o.costs = buildReconcileGetCosts();
     o.match = buildReconcileCandidate();
-    o.warning = buildUnnamed1046();
+    o.warning = buildUnnamed1020();
   }
   buildCounterReconcileGet--;
   return o;
@@ -151,139 +186,139 @@
 checkReconcileGet(api.ReconcileGet o) {
   buildCounterReconcileGet++;
   if (buildCounterReconcileGet < 3) {
-    checkUnnamed1045(o.candidate);
+    checkUnnamed1019(o.candidate);
     checkReconcileGetCosts(o.costs);
     checkReconcileCandidate(o.match);
-    checkUnnamed1046(o.warning);
+    checkUnnamed1020(o.warning);
   }
   buildCounterReconcileGet--;
 }
 
-buildUnnamed1047() {
+buildUnnamed1021() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1047(core.List<core.String> o) {
+checkUnnamed1021(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1048() {
+buildUnnamed1022() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1048(core.List<core.String> o) {
+checkUnnamed1022(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1049() {
+buildUnnamed1023() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1049(core.List<core.String> o) {
+checkUnnamed1023(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1050() {
+buildUnnamed1024() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1050(core.List<core.String> o) {
+checkUnnamed1024(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1051() {
+buildUnnamed1025() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1051(core.List<core.String> o) {
+checkUnnamed1025(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1052() {
+buildUnnamed1026() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1052(core.List<core.String> o) {
+checkUnnamed1026(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1053() {
+buildUnnamed1027() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1053(core.List<core.String> o) {
+checkUnnamed1027(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1054() {
+buildUnnamed1028() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1054(core.List<core.String> o) {
+checkUnnamed1028(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1055() {
+buildUnnamed1029() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1055(core.List<core.String> o) {
+checkUnnamed1029(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1056() {
+buildUnnamed1030() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1056(core.List<core.String> o) {
+checkUnnamed1030(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -339,14 +374,14 @@
   unittest.group("resource-FreebaseApi", () {
     unittest.test("method--reconcile", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FreebaseApi res = new api.FreebaseApi(mock);
       var arg_confidence = 42.0;
-      var arg_kind = buildUnnamed1047();
-      var arg_lang = buildUnnamed1048();
+      var arg_kind = buildUnnamed1021();
+      var arg_lang = buildUnnamed1022();
       var arg_limit = 42;
       var arg_name = "foo";
-      var arg_prop = buildUnnamed1049();
+      var arg_prop = buildUnnamed1023();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -387,7 +422,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildReconcileGet());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.reconcile(confidence: arg_confidence, kind: arg_kind, lang: arg_lang, limit: arg_limit, name: arg_name, prop: arg_prop).then(unittest.expectAsync(((api.ReconcileGet response) {
         checkReconcileGet(response);
@@ -398,21 +433,21 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.FreebaseApi res = new api.FreebaseApi(mock);
       var arg_asOfTime = "foo";
       var arg_callback = "foo";
       var arg_cursor = 42;
-      var arg_domain = buildUnnamed1050();
+      var arg_domain = buildUnnamed1024();
       var arg_encode = "foo";
       var arg_exact = true;
-      var arg_filter = buildUnnamed1051();
+      var arg_filter = buildUnnamed1025();
       var arg_format = "foo";
       var arg_help = "foo";
       var arg_indent = true;
-      var arg_lang = buildUnnamed1052();
+      var arg_lang = buildUnnamed1026();
       var arg_limit = 42;
-      var arg_mid = buildUnnamed1053();
+      var arg_mid = buildUnnamed1027();
       var arg_mqlOutput = "foo";
       var arg_output = "foo";
       var arg_prefixed = true;
@@ -420,9 +455,9 @@
       var arg_scoring = "foo";
       var arg_spell = "foo";
       var arg_stemmed = true;
-      var arg_type = buildUnnamed1054();
-      var arg_with_ = buildUnnamed1055();
-      var arg_without = buildUnnamed1056();
+      var arg_type = buildUnnamed1028();
+      var arg_with_ = buildUnnamed1029();
+      var arg_without = buildUnnamed1030();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -480,7 +515,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.search(asOfTime: arg_asOfTime, callback: arg_callback, cursor: arg_cursor, domain: arg_domain, encode: arg_encode, exact: arg_exact, filter: arg_filter, format: arg_format, help: arg_help, indent: arg_indent, lang: arg_lang, limit: arg_limit, mid: arg_mid, mqlOutput: arg_mqlOutput, output: arg_output, prefixed: arg_prefixed, query: arg_query, scoring: arg_scoring, spell: arg_spell, stemmed: arg_stemmed, type: arg_type, with_: arg_with_, without: arg_without).then(unittest.expectAsync((_) {}));
     });
diff --git a/generated/googleapis/test/fusiontables/v1_test.dart b/generated/googleapis/test/fusiontables/v1_test.dart
index b6f1a4a..3b5f814 100644
--- a/generated/googleapis/test/fusiontables/v1_test.dart
+++ b/generated/googleapis/test/fusiontables/v1_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/fusiontables/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterBucket = 0;
 buildBucket() {
@@ -97,14 +132,14 @@
   buildCounterColumn--;
 }
 
-buildUnnamed1434() {
+buildUnnamed1031() {
   var o = new core.List<api.Column>();
   o.add(buildColumn());
   o.add(buildColumn());
   return o;
 }
 
-checkUnnamed1434(core.List<api.Column> o) {
+checkUnnamed1031(core.List<api.Column> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkColumn(o[0]);
   checkColumn(o[1]);
@@ -115,7 +150,7 @@
   var o = new api.ColumnList();
   buildCounterColumnList++;
   if (buildCounterColumnList < 3) {
-    o.items = buildUnnamed1434();
+    o.items = buildUnnamed1031();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
@@ -127,7 +162,7 @@
 checkColumnList(api.ColumnList o) {
   buildCounterColumnList++;
   if (buildCounterColumnList < 3) {
-    checkUnnamed1434(o.items);
+    checkUnnamed1031(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -135,14 +170,14 @@
   buildCounterColumnList--;
 }
 
-buildUnnamed1435() {
+buildUnnamed1032() {
   var o = new core.List<core.Object>();
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   return o;
 }
 
-checkUnnamed1435(core.List<core.Object> o) {
+checkUnnamed1032(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o[0]) as core.Map; unittest.expect(casted1, unittest.hasLength(3)); unittest.expect(casted1["list"], unittest.equals([1, 2, 3])); unittest.expect(casted1["bool"], unittest.equals(true)); unittest.expect(casted1["string"], unittest.equals('foo')); 
   var casted2 = (o[1]) as core.Map; unittest.expect(casted2, unittest.hasLength(3)); unittest.expect(casted2["list"], unittest.equals([1, 2, 3])); unittest.expect(casted2["bool"], unittest.equals(true)); unittest.expect(casted2["string"], unittest.equals('foo')); 
@@ -153,7 +188,7 @@
   var o = new api.Geometry();
   buildCounterGeometry++;
   if (buildCounterGeometry < 3) {
-    o.geometries = buildUnnamed1435();
+    o.geometries = buildUnnamed1032();
     o.geometry = {'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'};
     o.type = "foo";
   }
@@ -164,7 +199,7 @@
 checkGeometry(api.Geometry o) {
   buildCounterGeometry++;
   if (buildCounterGeometry < 3) {
-    checkUnnamed1435(o.geometries);
+    checkUnnamed1032(o.geometries);
     var casted3 = (o.geometry) as core.Map; unittest.expect(casted3, unittest.hasLength(3)); unittest.expect(casted3["list"], unittest.equals([1, 2, 3])); unittest.expect(casted3["bool"], unittest.equals(true)); unittest.expect(casted3["string"], unittest.equals('foo')); 
     unittest.expect(o.type, unittest.equals('foo'));
   }
@@ -192,30 +227,30 @@
   buildCounterImport--;
 }
 
-buildUnnamed1436() {
+buildUnnamed1033() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed1436(core.List<core.double> o) {
+checkUnnamed1033(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed1437() {
+buildUnnamed1034() {
   var o = new core.List<core.List<core.double>>();
-  o.add(buildUnnamed1436());
-  o.add(buildUnnamed1436());
+  o.add(buildUnnamed1033());
+  o.add(buildUnnamed1033());
   return o;
 }
 
-checkUnnamed1437(core.List<core.List<core.double>> o) {
+checkUnnamed1034(core.List<core.List<core.double>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1436(o[0]);
-  checkUnnamed1436(o[1]);
+  checkUnnamed1033(o[0]);
+  checkUnnamed1033(o[1]);
 }
 
 core.int buildCounterLine = 0;
@@ -223,7 +258,7 @@
   var o = new api.Line();
   buildCounterLine++;
   if (buildCounterLine < 3) {
-    o.coordinates = buildUnnamed1437();
+    o.coordinates = buildUnnamed1034();
     o.type = "foo";
   }
   buildCounterLine--;
@@ -233,7 +268,7 @@
 checkLine(api.Line o) {
   buildCounterLine++;
   if (buildCounterLine < 3) {
-    checkUnnamed1437(o.coordinates);
+    checkUnnamed1034(o.coordinates);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterLine--;
@@ -266,14 +301,14 @@
   buildCounterLineStyle--;
 }
 
-buildUnnamed1438() {
+buildUnnamed1035() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed1438(core.List<core.double> o) {
+checkUnnamed1035(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
@@ -284,7 +319,7 @@
   var o = new api.Point();
   buildCounterPoint++;
   if (buildCounterPoint < 3) {
-    o.coordinates = buildUnnamed1438();
+    o.coordinates = buildUnnamed1035();
     o.type = "foo";
   }
   buildCounterPoint--;
@@ -294,7 +329,7 @@
 checkPoint(api.Point o) {
   buildCounterPoint++;
   if (buildCounterPoint < 3) {
-    checkUnnamed1438(o.coordinates);
+    checkUnnamed1035(o.coordinates);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterPoint--;
@@ -321,43 +356,43 @@
   buildCounterPointStyle--;
 }
 
-buildUnnamed1439() {
+buildUnnamed1036() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed1439(core.List<core.double> o) {
+checkUnnamed1036(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed1440() {
+buildUnnamed1037() {
   var o = new core.List<core.List<core.double>>();
-  o.add(buildUnnamed1439());
-  o.add(buildUnnamed1439());
+  o.add(buildUnnamed1036());
+  o.add(buildUnnamed1036());
   return o;
 }
 
-checkUnnamed1440(core.List<core.List<core.double>> o) {
+checkUnnamed1037(core.List<core.List<core.double>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1439(o[0]);
-  checkUnnamed1439(o[1]);
+  checkUnnamed1036(o[0]);
+  checkUnnamed1036(o[1]);
 }
 
-buildUnnamed1441() {
+buildUnnamed1038() {
   var o = new core.List<core.List<core.List<core.double>>>();
-  o.add(buildUnnamed1440());
-  o.add(buildUnnamed1440());
+  o.add(buildUnnamed1037());
+  o.add(buildUnnamed1037());
   return o;
 }
 
-checkUnnamed1441(core.List<core.List<core.List<core.double>>> o) {
+checkUnnamed1038(core.List<core.List<core.List<core.double>>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1440(o[0]);
-  checkUnnamed1440(o[1]);
+  checkUnnamed1037(o[0]);
+  checkUnnamed1037(o[1]);
 }
 
 core.int buildCounterPolygon = 0;
@@ -365,7 +400,7 @@
   var o = new api.Polygon();
   buildCounterPolygon++;
   if (buildCounterPolygon < 3) {
-    o.coordinates = buildUnnamed1441();
+    o.coordinates = buildUnnamed1038();
     o.type = "foo";
   }
   buildCounterPolygon--;
@@ -375,7 +410,7 @@
 checkPolygon(api.Polygon o) {
   buildCounterPolygon++;
   if (buildCounterPolygon < 3) {
-    checkUnnamed1441(o.coordinates);
+    checkUnnamed1038(o.coordinates);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterPolygon--;
@@ -414,43 +449,43 @@
   buildCounterPolygonStyle--;
 }
 
-buildUnnamed1442() {
+buildUnnamed1039() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1442(core.List<core.String> o) {
+checkUnnamed1039(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1443() {
+buildUnnamed1040() {
   var o = new core.List<core.Object>();
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   return o;
 }
 
-checkUnnamed1443(core.List<core.Object> o) {
+checkUnnamed1040(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted4 = (o[0]) as core.Map; unittest.expect(casted4, unittest.hasLength(3)); unittest.expect(casted4["list"], unittest.equals([1, 2, 3])); unittest.expect(casted4["bool"], unittest.equals(true)); unittest.expect(casted4["string"], unittest.equals('foo')); 
   var casted5 = (o[1]) as core.Map; unittest.expect(casted5, unittest.hasLength(3)); unittest.expect(casted5["list"], unittest.equals([1, 2, 3])); unittest.expect(casted5["bool"], unittest.equals(true)); unittest.expect(casted5["string"], unittest.equals('foo')); 
 }
 
-buildUnnamed1444() {
+buildUnnamed1041() {
   var o = new core.List<core.List<core.Object>>();
-  o.add(buildUnnamed1443());
-  o.add(buildUnnamed1443());
+  o.add(buildUnnamed1040());
+  o.add(buildUnnamed1040());
   return o;
 }
 
-checkUnnamed1444(core.List<core.List<core.Object>> o) {
+checkUnnamed1041(core.List<core.List<core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1443(o[0]);
-  checkUnnamed1443(o[1]);
+  checkUnnamed1040(o[0]);
+  checkUnnamed1040(o[1]);
 }
 
 core.int buildCounterSqlresponse = 0;
@@ -458,9 +493,9 @@
   var o = new api.Sqlresponse();
   buildCounterSqlresponse++;
   if (buildCounterSqlresponse < 3) {
-    o.columns = buildUnnamed1442();
+    o.columns = buildUnnamed1039();
     o.kind = "foo";
-    o.rows = buildUnnamed1444();
+    o.rows = buildUnnamed1041();
   }
   buildCounterSqlresponse--;
   return o;
@@ -469,21 +504,21 @@
 checkSqlresponse(api.Sqlresponse o) {
   buildCounterSqlresponse++;
   if (buildCounterSqlresponse < 3) {
-    checkUnnamed1442(o.columns);
+    checkUnnamed1039(o.columns);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1444(o.rows);
+    checkUnnamed1041(o.rows);
   }
   buildCounterSqlresponse--;
 }
 
-buildUnnamed1445() {
+buildUnnamed1042() {
   var o = new core.List<api.Bucket>();
   o.add(buildBucket());
   o.add(buildBucket());
   return o;
 }
 
-checkUnnamed1445(core.List<api.Bucket> o) {
+checkUnnamed1042(core.List<api.Bucket> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBucket(o[0]);
   checkBucket(o[1]);
@@ -510,14 +545,14 @@
   buildCounterStyleFunctionGradientColors--;
 }
 
-buildUnnamed1446() {
+buildUnnamed1043() {
   var o = new core.List<api.StyleFunctionGradientColors>();
   o.add(buildStyleFunctionGradientColors());
   o.add(buildStyleFunctionGradientColors());
   return o;
 }
 
-checkUnnamed1446(core.List<api.StyleFunctionGradientColors> o) {
+checkUnnamed1043(core.List<api.StyleFunctionGradientColors> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStyleFunctionGradientColors(o[0]);
   checkStyleFunctionGradientColors(o[1]);
@@ -528,7 +563,7 @@
   var o = new api.StyleFunctionGradient();
   buildCounterStyleFunctionGradient++;
   if (buildCounterStyleFunctionGradient < 3) {
-    o.colors = buildUnnamed1446();
+    o.colors = buildUnnamed1043();
     o.max = 42.0;
     o.min = 42.0;
   }
@@ -539,7 +574,7 @@
 checkStyleFunctionGradient(api.StyleFunctionGradient o) {
   buildCounterStyleFunctionGradient++;
   if (buildCounterStyleFunctionGradient < 3) {
-    checkUnnamed1446(o.colors);
+    checkUnnamed1043(o.colors);
     unittest.expect(o.max, unittest.equals(42.0));
     unittest.expect(o.min, unittest.equals(42.0));
   }
@@ -551,7 +586,7 @@
   var o = new api.StyleFunction();
   buildCounterStyleFunction++;
   if (buildCounterStyleFunction < 3) {
-    o.buckets = buildUnnamed1445();
+    o.buckets = buildUnnamed1042();
     o.columnName = "foo";
     o.gradient = buildStyleFunctionGradient();
     o.kind = "foo";
@@ -563,7 +598,7 @@
 checkStyleFunction(api.StyleFunction o) {
   buildCounterStyleFunction++;
   if (buildCounterStyleFunction < 3) {
-    checkUnnamed1445(o.buckets);
+    checkUnnamed1042(o.buckets);
     unittest.expect(o.columnName, unittest.equals('foo'));
     checkStyleFunctionGradient(o.gradient);
     unittest.expect(o.kind, unittest.equals('foo'));
@@ -602,14 +637,14 @@
   buildCounterStyleSetting--;
 }
 
-buildUnnamed1447() {
+buildUnnamed1044() {
   var o = new core.List<api.StyleSetting>();
   o.add(buildStyleSetting());
   o.add(buildStyleSetting());
   return o;
 }
 
-checkUnnamed1447(core.List<api.StyleSetting> o) {
+checkUnnamed1044(core.List<api.StyleSetting> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStyleSetting(o[0]);
   checkStyleSetting(o[1]);
@@ -620,7 +655,7 @@
   var o = new api.StyleSettingList();
   buildCounterStyleSettingList++;
   if (buildCounterStyleSettingList < 3) {
-    o.items = buildUnnamed1447();
+    o.items = buildUnnamed1044();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
@@ -632,7 +667,7 @@
 checkStyleSettingList(api.StyleSettingList o) {
   buildCounterStyleSettingList++;
   if (buildCounterStyleSettingList < 3) {
-    checkUnnamed1447(o.items);
+    checkUnnamed1044(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -640,27 +675,27 @@
   buildCounterStyleSettingList--;
 }
 
-buildUnnamed1448() {
+buildUnnamed1045() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1448(core.List<core.String> o) {
+checkUnnamed1045(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1449() {
+buildUnnamed1046() {
   var o = new core.List<api.Column>();
   o.add(buildColumn());
   o.add(buildColumn());
   return o;
 }
 
-checkUnnamed1449(core.List<api.Column> o) {
+checkUnnamed1046(core.List<api.Column> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkColumn(o[0]);
   checkColumn(o[1]);
@@ -673,8 +708,8 @@
   if (buildCounterTable < 3) {
     o.attribution = "foo";
     o.attributionLink = "foo";
-    o.baseTableIds = buildUnnamed1448();
-    o.columns = buildUnnamed1449();
+    o.baseTableIds = buildUnnamed1045();
+    o.columns = buildUnnamed1046();
     o.description = "foo";
     o.isExportable = true;
     o.kind = "foo";
@@ -691,8 +726,8 @@
   if (buildCounterTable < 3) {
     unittest.expect(o.attribution, unittest.equals('foo'));
     unittest.expect(o.attributionLink, unittest.equals('foo'));
-    checkUnnamed1448(o.baseTableIds);
-    checkUnnamed1449(o.columns);
+    checkUnnamed1045(o.baseTableIds);
+    checkUnnamed1046(o.columns);
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.isExportable, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
@@ -703,14 +738,14 @@
   buildCounterTable--;
 }
 
-buildUnnamed1450() {
+buildUnnamed1047() {
   var o = new core.List<api.Table>();
   o.add(buildTable());
   o.add(buildTable());
   return o;
 }
 
-checkUnnamed1450(core.List<api.Table> o) {
+checkUnnamed1047(core.List<api.Table> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTable(o[0]);
   checkTable(o[1]);
@@ -721,7 +756,7 @@
   var o = new api.TableList();
   buildCounterTableList++;
   if (buildCounterTableList < 3) {
-    o.items = buildUnnamed1450();
+    o.items = buildUnnamed1047();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -732,7 +767,7 @@
 checkTableList(api.TableList o) {
   buildCounterTableList++;
   if (buildCounterTableList < 3) {
-    checkUnnamed1450(o.items);
+    checkUnnamed1047(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -766,14 +801,14 @@
   buildCounterTask--;
 }
 
-buildUnnamed1451() {
+buildUnnamed1048() {
   var o = new core.List<api.Task>();
   o.add(buildTask());
   o.add(buildTask());
   return o;
 }
 
-checkUnnamed1451(core.List<api.Task> o) {
+checkUnnamed1048(core.List<api.Task> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTask(o[0]);
   checkTask(o[1]);
@@ -784,7 +819,7 @@
   var o = new api.TaskList();
   buildCounterTaskList++;
   if (buildCounterTaskList < 3) {
-    o.items = buildUnnamed1451();
+    o.items = buildUnnamed1048();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
@@ -796,7 +831,7 @@
 checkTaskList(api.TaskList o) {
   buildCounterTaskList++;
   if (buildCounterTaskList < 3) {
-    checkUnnamed1451(o.items);
+    checkUnnamed1048(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -804,14 +839,14 @@
   buildCounterTaskList--;
 }
 
-buildUnnamed1452() {
+buildUnnamed1049() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1452(core.List<core.String> o) {
+checkUnnamed1049(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -822,7 +857,7 @@
   var o = new api.Template();
   buildCounterTemplate++;
   if (buildCounterTemplate < 3) {
-    o.automaticColumnNames = buildUnnamed1452();
+    o.automaticColumnNames = buildUnnamed1049();
     o.body = "foo";
     o.kind = "foo";
     o.name = "foo";
@@ -836,7 +871,7 @@
 checkTemplate(api.Template o) {
   buildCounterTemplate++;
   if (buildCounterTemplate < 3) {
-    checkUnnamed1452(o.automaticColumnNames);
+    checkUnnamed1049(o.automaticColumnNames);
     unittest.expect(o.body, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
@@ -846,14 +881,14 @@
   buildCounterTemplate--;
 }
 
-buildUnnamed1453() {
+buildUnnamed1050() {
   var o = new core.List<api.Template>();
   o.add(buildTemplate());
   o.add(buildTemplate());
   return o;
 }
 
-checkUnnamed1453(core.List<api.Template> o) {
+checkUnnamed1050(core.List<api.Template> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTemplate(o[0]);
   checkTemplate(o[1]);
@@ -864,7 +899,7 @@
   var o = new api.TemplateList();
   buildCounterTemplateList++;
   if (buildCounterTemplateList < 3) {
-    o.items = buildUnnamed1453();
+    o.items = buildUnnamed1050();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
@@ -876,7 +911,7 @@
 checkTemplateList(api.TemplateList o) {
   buildCounterTemplateList++;
   if (buildCounterTemplateList < 3) {
-    checkUnnamed1453(o.items);
+    checkUnnamed1050(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -1105,7 +1140,7 @@
   unittest.group("resource-ColumnResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ColumnResourceApi res = new api.FusiontablesApi(mock).column;
       var arg_tableId = "foo";
       var arg_columnId = "foo";
@@ -1153,14 +1188,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_tableId, arg_columnId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ColumnResourceApi res = new api.FusiontablesApi(mock).column;
       var arg_tableId = "foo";
       var arg_columnId = "foo";
@@ -1208,7 +1243,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildColumn());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_tableId, arg_columnId).then(unittest.expectAsync(((api.Column response) {
         checkColumn(response);
@@ -1217,7 +1252,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ColumnResourceApi res = new api.FusiontablesApi(mock).column;
       var arg_request = buildColumn();
       var arg_tableId = "foo";
@@ -1265,7 +1300,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildColumn());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_tableId).then(unittest.expectAsync(((api.Column response) {
         checkColumn(response);
@@ -1274,7 +1309,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ColumnResourceApi res = new api.FusiontablesApi(mock).column;
       var arg_tableId = "foo";
       var arg_maxResults = 42;
@@ -1322,7 +1357,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildColumnList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_tableId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.ColumnList response) {
         checkColumnList(response);
@@ -1331,7 +1366,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ColumnResourceApi res = new api.FusiontablesApi(mock).column;
       var arg_request = buildColumn();
       var arg_tableId = "foo";
@@ -1383,7 +1418,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildColumn());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_tableId, arg_columnId).then(unittest.expectAsync(((api.Column response) {
         checkColumn(response);
@@ -1392,7 +1427,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ColumnResourceApi res = new api.FusiontablesApi(mock).column;
       var arg_request = buildColumn();
       var arg_tableId = "foo";
@@ -1444,7 +1479,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildColumn());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_tableId, arg_columnId).then(unittest.expectAsync(((api.Column response) {
         checkColumn(response);
@@ -1459,7 +1494,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.QueryResourceApi res = new api.FusiontablesApi(mock).query;
       var arg_sql_1 = "foo";
       var arg_hdrs = true;
@@ -1501,7 +1536,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSqlresponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.sql(arg_sql_1, hdrs: arg_hdrs, typed: arg_typed).then(unittest.expectAsync(((api.Sqlresponse response) {
         checkSqlresponse(response);
@@ -1512,7 +1547,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.QueryResourceApi res = new api.FusiontablesApi(mock).query;
       var arg_sql_1 = "foo";
       var arg_hdrs = true;
@@ -1554,7 +1589,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSqlresponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.sqlGet(arg_sql_1, hdrs: arg_hdrs, typed: arg_typed).then(unittest.expectAsync(((api.Sqlresponse response) {
         checkSqlresponse(response);
@@ -1567,7 +1602,7 @@
   unittest.group("resource-StyleResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.StyleResourceApi res = new api.FusiontablesApi(mock).style;
       var arg_tableId = "foo";
       var arg_styleId = 42;
@@ -1615,14 +1650,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_tableId, arg_styleId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.StyleResourceApi res = new api.FusiontablesApi(mock).style;
       var arg_tableId = "foo";
       var arg_styleId = 42;
@@ -1670,7 +1705,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildStyleSetting());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_tableId, arg_styleId).then(unittest.expectAsync(((api.StyleSetting response) {
         checkStyleSetting(response);
@@ -1679,7 +1714,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.StyleResourceApi res = new api.FusiontablesApi(mock).style;
       var arg_request = buildStyleSetting();
       var arg_tableId = "foo";
@@ -1727,7 +1762,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildStyleSetting());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_tableId).then(unittest.expectAsync(((api.StyleSetting response) {
         checkStyleSetting(response);
@@ -1736,7 +1771,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.StyleResourceApi res = new api.FusiontablesApi(mock).style;
       var arg_tableId = "foo";
       var arg_maxResults = 42;
@@ -1784,7 +1819,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildStyleSettingList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_tableId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.StyleSettingList response) {
         checkStyleSettingList(response);
@@ -1793,7 +1828,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.StyleResourceApi res = new api.FusiontablesApi(mock).style;
       var arg_request = buildStyleSetting();
       var arg_tableId = "foo";
@@ -1845,7 +1880,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildStyleSetting());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_tableId, arg_styleId).then(unittest.expectAsync(((api.StyleSetting response) {
         checkStyleSetting(response);
@@ -1854,7 +1889,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.StyleResourceApi res = new api.FusiontablesApi(mock).style;
       var arg_request = buildStyleSetting();
       var arg_tableId = "foo";
@@ -1906,7 +1941,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildStyleSetting());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_tableId, arg_styleId).then(unittest.expectAsync(((api.StyleSetting response) {
         checkStyleSetting(response);
@@ -1919,7 +1954,7 @@
   unittest.group("resource-TableResourceApi", () {
     unittest.test("method--copy", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TableResourceApi res = new api.FusiontablesApi(mock).table;
       var arg_tableId = "foo";
       var arg_copyPresentation = true;
@@ -1965,7 +2000,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTable());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.copy(arg_tableId, copyPresentation: arg_copyPresentation).then(unittest.expectAsync(((api.Table response) {
         checkTable(response);
@@ -1974,7 +2009,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TableResourceApi res = new api.FusiontablesApi(mock).table;
       var arg_tableId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2014,14 +2049,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_tableId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TableResourceApi res = new api.FusiontablesApi(mock).table;
       var arg_tableId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2061,7 +2096,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTable());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_tableId).then(unittest.expectAsync(((api.Table response) {
         checkTable(response);
@@ -2072,7 +2107,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TableResourceApi res = new api.FusiontablesApi(mock).table;
       var arg_tableId = "foo";
       var arg_delimiter = "foo";
@@ -2126,7 +2161,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildImport());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.importRows(arg_tableId, delimiter: arg_delimiter, encoding: arg_encoding, endLine: arg_endLine, isStrict: arg_isStrict, startLine: arg_startLine).then(unittest.expectAsync(((api.Import response) {
         checkImport(response);
@@ -2137,7 +2172,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TableResourceApi res = new api.FusiontablesApi(mock).table;
       var arg_name = "foo";
       var arg_delimiter = "foo";
@@ -2179,7 +2214,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTable());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.importTable(arg_name, delimiter: arg_delimiter, encoding: arg_encoding).then(unittest.expectAsync(((api.Table response) {
         checkTable(response);
@@ -2188,7 +2223,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TableResourceApi res = new api.FusiontablesApi(mock).table;
       var arg_request = buildTable();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2228,7 +2263,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTable());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request).then(unittest.expectAsync(((api.Table response) {
         checkTable(response);
@@ -2237,7 +2272,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TableResourceApi res = new api.FusiontablesApi(mock).table;
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
@@ -2277,7 +2312,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTableList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.TableList response) {
         checkTableList(response);
@@ -2286,7 +2321,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TableResourceApi res = new api.FusiontablesApi(mock).table;
       var arg_request = buildTable();
       var arg_tableId = "foo";
@@ -2332,7 +2367,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTable());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_tableId, replaceViewDefinition: arg_replaceViewDefinition).then(unittest.expectAsync(((api.Table response) {
         checkTable(response);
@@ -2341,7 +2376,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TableResourceApi res = new api.FusiontablesApi(mock).table;
       var arg_request = buildTable();
       var arg_tableId = "foo";
@@ -2387,7 +2422,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTable());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_tableId, replaceViewDefinition: arg_replaceViewDefinition).then(unittest.expectAsync(((api.Table response) {
         checkTable(response);
@@ -2400,7 +2435,7 @@
   unittest.group("resource-TaskResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TaskResourceApi res = new api.FusiontablesApi(mock).task;
       var arg_tableId = "foo";
       var arg_taskId = "foo";
@@ -2448,14 +2483,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_tableId, arg_taskId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TaskResourceApi res = new api.FusiontablesApi(mock).task;
       var arg_tableId = "foo";
       var arg_taskId = "foo";
@@ -2503,7 +2538,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTask());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_tableId, arg_taskId).then(unittest.expectAsync(((api.Task response) {
         checkTask(response);
@@ -2512,7 +2547,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TaskResourceApi res = new api.FusiontablesApi(mock).task;
       var arg_tableId = "foo";
       var arg_maxResults = 42;
@@ -2562,7 +2597,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTaskList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_tableId, maxResults: arg_maxResults, pageToken: arg_pageToken, startIndex: arg_startIndex).then(unittest.expectAsync(((api.TaskList response) {
         checkTaskList(response);
@@ -2575,7 +2610,7 @@
   unittest.group("resource-TemplateResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TemplateResourceApi res = new api.FusiontablesApi(mock).template;
       var arg_tableId = "foo";
       var arg_templateId = 42;
@@ -2623,14 +2658,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_tableId, arg_templateId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TemplateResourceApi res = new api.FusiontablesApi(mock).template;
       var arg_tableId = "foo";
       var arg_templateId = 42;
@@ -2678,7 +2713,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTemplate());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_tableId, arg_templateId).then(unittest.expectAsync(((api.Template response) {
         checkTemplate(response);
@@ -2687,7 +2722,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TemplateResourceApi res = new api.FusiontablesApi(mock).template;
       var arg_request = buildTemplate();
       var arg_tableId = "foo";
@@ -2735,7 +2770,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTemplate());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_tableId).then(unittest.expectAsync(((api.Template response) {
         checkTemplate(response);
@@ -2744,7 +2779,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TemplateResourceApi res = new api.FusiontablesApi(mock).template;
       var arg_tableId = "foo";
       var arg_maxResults = 42;
@@ -2792,7 +2827,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTemplateList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_tableId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.TemplateList response) {
         checkTemplateList(response);
@@ -2801,7 +2836,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TemplateResourceApi res = new api.FusiontablesApi(mock).template;
       var arg_request = buildTemplate();
       var arg_tableId = "foo";
@@ -2853,7 +2888,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTemplate());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_tableId, arg_templateId).then(unittest.expectAsync(((api.Template response) {
         checkTemplate(response);
@@ -2862,7 +2897,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TemplateResourceApi res = new api.FusiontablesApi(mock).template;
       var arg_request = buildTemplate();
       var arg_tableId = "foo";
@@ -2914,7 +2949,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTemplate());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_tableId, arg_templateId).then(unittest.expectAsync(((api.Template response) {
         checkTemplate(response);
diff --git a/generated/googleapis/test/fusiontables/v2_test.dart b/generated/googleapis/test/fusiontables/v2_test.dart
index 8e8c2d1..96b5077 100644
--- a/generated/googleapis/test/fusiontables/v2_test.dart
+++ b/generated/googleapis/test/fusiontables/v2_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/fusiontables/v2.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterBucket = 0;
 buildBucket() {
@@ -66,14 +101,14 @@
   buildCounterColumnBaseColumn--;
 }
 
-buildUnnamed598() {
+buildUnnamed1051() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed598(core.List<core.String> o) {
+checkUnnamed1051(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -94,7 +129,7 @@
     o.kind = "foo";
     o.name = "foo";
     o.type = "foo";
-    o.validValues = buildUnnamed598();
+    o.validValues = buildUnnamed1051();
     o.validateData = true;
   }
   buildCounterColumn--;
@@ -114,20 +149,20 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
-    checkUnnamed598(o.validValues);
+    checkUnnamed1051(o.validValues);
     unittest.expect(o.validateData, unittest.isTrue);
   }
   buildCounterColumn--;
 }
 
-buildUnnamed599() {
+buildUnnamed1052() {
   var o = new core.List<api.Column>();
   o.add(buildColumn());
   o.add(buildColumn());
   return o;
 }
 
-checkUnnamed599(core.List<api.Column> o) {
+checkUnnamed1052(core.List<api.Column> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkColumn(o[0]);
   checkColumn(o[1]);
@@ -138,7 +173,7 @@
   var o = new api.ColumnList();
   buildCounterColumnList++;
   if (buildCounterColumnList < 3) {
-    o.items = buildUnnamed599();
+    o.items = buildUnnamed1052();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
@@ -150,7 +185,7 @@
 checkColumnList(api.ColumnList o) {
   buildCounterColumnList++;
   if (buildCounterColumnList < 3) {
-    checkUnnamed599(o.items);
+    checkUnnamed1052(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -158,14 +193,14 @@
   buildCounterColumnList--;
 }
 
-buildUnnamed600() {
+buildUnnamed1053() {
   var o = new core.List<core.Object>();
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   return o;
 }
 
-checkUnnamed600(core.List<core.Object> o) {
+checkUnnamed1053(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o[0]) as core.Map; unittest.expect(casted1, unittest.hasLength(3)); unittest.expect(casted1["list"], unittest.equals([1, 2, 3])); unittest.expect(casted1["bool"], unittest.equals(true)); unittest.expect(casted1["string"], unittest.equals('foo')); 
   var casted2 = (o[1]) as core.Map; unittest.expect(casted2, unittest.hasLength(3)); unittest.expect(casted2["list"], unittest.equals([1, 2, 3])); unittest.expect(casted2["bool"], unittest.equals(true)); unittest.expect(casted2["string"], unittest.equals('foo')); 
@@ -176,7 +211,7 @@
   var o = new api.Geometry();
   buildCounterGeometry++;
   if (buildCounterGeometry < 3) {
-    o.geometries = buildUnnamed600();
+    o.geometries = buildUnnamed1053();
     o.geometry = {'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'};
     o.type = "foo";
   }
@@ -187,7 +222,7 @@
 checkGeometry(api.Geometry o) {
   buildCounterGeometry++;
   if (buildCounterGeometry < 3) {
-    checkUnnamed600(o.geometries);
+    checkUnnamed1053(o.geometries);
     var casted3 = (o.geometry) as core.Map; unittest.expect(casted3, unittest.hasLength(3)); unittest.expect(casted3["list"], unittest.equals([1, 2, 3])); unittest.expect(casted3["bool"], unittest.equals(true)); unittest.expect(casted3["string"], unittest.equals('foo')); 
     unittest.expect(o.type, unittest.equals('foo'));
   }
@@ -215,30 +250,30 @@
   buildCounterImport--;
 }
 
-buildUnnamed601() {
+buildUnnamed1054() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed601(core.List<core.double> o) {
+checkUnnamed1054(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed602() {
+buildUnnamed1055() {
   var o = new core.List<core.List<core.double>>();
-  o.add(buildUnnamed601());
-  o.add(buildUnnamed601());
+  o.add(buildUnnamed1054());
+  o.add(buildUnnamed1054());
   return o;
 }
 
-checkUnnamed602(core.List<core.List<core.double>> o) {
+checkUnnamed1055(core.List<core.List<core.double>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed601(o[0]);
-  checkUnnamed601(o[1]);
+  checkUnnamed1054(o[0]);
+  checkUnnamed1054(o[1]);
 }
 
 core.int buildCounterLine = 0;
@@ -246,7 +281,7 @@
   var o = new api.Line();
   buildCounterLine++;
   if (buildCounterLine < 3) {
-    o.coordinates = buildUnnamed602();
+    o.coordinates = buildUnnamed1055();
     o.type = "foo";
   }
   buildCounterLine--;
@@ -256,7 +291,7 @@
 checkLine(api.Line o) {
   buildCounterLine++;
   if (buildCounterLine < 3) {
-    checkUnnamed602(o.coordinates);
+    checkUnnamed1055(o.coordinates);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterLine--;
@@ -289,14 +324,14 @@
   buildCounterLineStyle--;
 }
 
-buildUnnamed603() {
+buildUnnamed1056() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed603(core.List<core.double> o) {
+checkUnnamed1056(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
@@ -307,7 +342,7 @@
   var o = new api.Point();
   buildCounterPoint++;
   if (buildCounterPoint < 3) {
-    o.coordinates = buildUnnamed603();
+    o.coordinates = buildUnnamed1056();
     o.type = "foo";
   }
   buildCounterPoint--;
@@ -317,7 +352,7 @@
 checkPoint(api.Point o) {
   buildCounterPoint++;
   if (buildCounterPoint < 3) {
-    checkUnnamed603(o.coordinates);
+    checkUnnamed1056(o.coordinates);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterPoint--;
@@ -344,43 +379,43 @@
   buildCounterPointStyle--;
 }
 
-buildUnnamed604() {
+buildUnnamed1057() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed604(core.List<core.double> o) {
+checkUnnamed1057(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed605() {
+buildUnnamed1058() {
   var o = new core.List<core.List<core.double>>();
-  o.add(buildUnnamed604());
-  o.add(buildUnnamed604());
+  o.add(buildUnnamed1057());
+  o.add(buildUnnamed1057());
   return o;
 }
 
-checkUnnamed605(core.List<core.List<core.double>> o) {
+checkUnnamed1058(core.List<core.List<core.double>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed604(o[0]);
-  checkUnnamed604(o[1]);
+  checkUnnamed1057(o[0]);
+  checkUnnamed1057(o[1]);
 }
 
-buildUnnamed606() {
+buildUnnamed1059() {
   var o = new core.List<core.List<core.List<core.double>>>();
-  o.add(buildUnnamed605());
-  o.add(buildUnnamed605());
+  o.add(buildUnnamed1058());
+  o.add(buildUnnamed1058());
   return o;
 }
 
-checkUnnamed606(core.List<core.List<core.List<core.double>>> o) {
+checkUnnamed1059(core.List<core.List<core.List<core.double>>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed605(o[0]);
-  checkUnnamed605(o[1]);
+  checkUnnamed1058(o[0]);
+  checkUnnamed1058(o[1]);
 }
 
 core.int buildCounterPolygon = 0;
@@ -388,7 +423,7 @@
   var o = new api.Polygon();
   buildCounterPolygon++;
   if (buildCounterPolygon < 3) {
-    o.coordinates = buildUnnamed606();
+    o.coordinates = buildUnnamed1059();
     o.type = "foo";
   }
   buildCounterPolygon--;
@@ -398,7 +433,7 @@
 checkPolygon(api.Polygon o) {
   buildCounterPolygon++;
   if (buildCounterPolygon < 3) {
-    checkUnnamed606(o.coordinates);
+    checkUnnamed1059(o.coordinates);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterPolygon--;
@@ -437,43 +472,43 @@
   buildCounterPolygonStyle--;
 }
 
-buildUnnamed607() {
+buildUnnamed1060() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed607(core.List<core.String> o) {
+checkUnnamed1060(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed608() {
+buildUnnamed1061() {
   var o = new core.List<core.Object>();
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   return o;
 }
 
-checkUnnamed608(core.List<core.Object> o) {
+checkUnnamed1061(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted4 = (o[0]) as core.Map; unittest.expect(casted4, unittest.hasLength(3)); unittest.expect(casted4["list"], unittest.equals([1, 2, 3])); unittest.expect(casted4["bool"], unittest.equals(true)); unittest.expect(casted4["string"], unittest.equals('foo')); 
   var casted5 = (o[1]) as core.Map; unittest.expect(casted5, unittest.hasLength(3)); unittest.expect(casted5["list"], unittest.equals([1, 2, 3])); unittest.expect(casted5["bool"], unittest.equals(true)); unittest.expect(casted5["string"], unittest.equals('foo')); 
 }
 
-buildUnnamed609() {
+buildUnnamed1062() {
   var o = new core.List<core.List<core.Object>>();
-  o.add(buildUnnamed608());
-  o.add(buildUnnamed608());
+  o.add(buildUnnamed1061());
+  o.add(buildUnnamed1061());
   return o;
 }
 
-checkUnnamed609(core.List<core.List<core.Object>> o) {
+checkUnnamed1062(core.List<core.List<core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed608(o[0]);
-  checkUnnamed608(o[1]);
+  checkUnnamed1061(o[0]);
+  checkUnnamed1061(o[1]);
 }
 
 core.int buildCounterSqlresponse = 0;
@@ -481,9 +516,9 @@
   var o = new api.Sqlresponse();
   buildCounterSqlresponse++;
   if (buildCounterSqlresponse < 3) {
-    o.columns = buildUnnamed607();
+    o.columns = buildUnnamed1060();
     o.kind = "foo";
-    o.rows = buildUnnamed609();
+    o.rows = buildUnnamed1062();
   }
   buildCounterSqlresponse--;
   return o;
@@ -492,21 +527,21 @@
 checkSqlresponse(api.Sqlresponse o) {
   buildCounterSqlresponse++;
   if (buildCounterSqlresponse < 3) {
-    checkUnnamed607(o.columns);
+    checkUnnamed1060(o.columns);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed609(o.rows);
+    checkUnnamed1062(o.rows);
   }
   buildCounterSqlresponse--;
 }
 
-buildUnnamed610() {
+buildUnnamed1063() {
   var o = new core.List<api.Bucket>();
   o.add(buildBucket());
   o.add(buildBucket());
   return o;
 }
 
-checkUnnamed610(core.List<api.Bucket> o) {
+checkUnnamed1063(core.List<api.Bucket> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBucket(o[0]);
   checkBucket(o[1]);
@@ -533,14 +568,14 @@
   buildCounterStyleFunctionGradientColors--;
 }
 
-buildUnnamed611() {
+buildUnnamed1064() {
   var o = new core.List<api.StyleFunctionGradientColors>();
   o.add(buildStyleFunctionGradientColors());
   o.add(buildStyleFunctionGradientColors());
   return o;
 }
 
-checkUnnamed611(core.List<api.StyleFunctionGradientColors> o) {
+checkUnnamed1064(core.List<api.StyleFunctionGradientColors> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStyleFunctionGradientColors(o[0]);
   checkStyleFunctionGradientColors(o[1]);
@@ -551,7 +586,7 @@
   var o = new api.StyleFunctionGradient();
   buildCounterStyleFunctionGradient++;
   if (buildCounterStyleFunctionGradient < 3) {
-    o.colors = buildUnnamed611();
+    o.colors = buildUnnamed1064();
     o.max = 42.0;
     o.min = 42.0;
   }
@@ -562,7 +597,7 @@
 checkStyleFunctionGradient(api.StyleFunctionGradient o) {
   buildCounterStyleFunctionGradient++;
   if (buildCounterStyleFunctionGradient < 3) {
-    checkUnnamed611(o.colors);
+    checkUnnamed1064(o.colors);
     unittest.expect(o.max, unittest.equals(42.0));
     unittest.expect(o.min, unittest.equals(42.0));
   }
@@ -574,7 +609,7 @@
   var o = new api.StyleFunction();
   buildCounterStyleFunction++;
   if (buildCounterStyleFunction < 3) {
-    o.buckets = buildUnnamed610();
+    o.buckets = buildUnnamed1063();
     o.columnName = "foo";
     o.gradient = buildStyleFunctionGradient();
     o.kind = "foo";
@@ -586,7 +621,7 @@
 checkStyleFunction(api.StyleFunction o) {
   buildCounterStyleFunction++;
   if (buildCounterStyleFunction < 3) {
-    checkUnnamed610(o.buckets);
+    checkUnnamed1063(o.buckets);
     unittest.expect(o.columnName, unittest.equals('foo'));
     checkStyleFunctionGradient(o.gradient);
     unittest.expect(o.kind, unittest.equals('foo'));
@@ -625,14 +660,14 @@
   buildCounterStyleSetting--;
 }
 
-buildUnnamed612() {
+buildUnnamed1065() {
   var o = new core.List<api.StyleSetting>();
   o.add(buildStyleSetting());
   o.add(buildStyleSetting());
   return o;
 }
 
-checkUnnamed612(core.List<api.StyleSetting> o) {
+checkUnnamed1065(core.List<api.StyleSetting> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStyleSetting(o[0]);
   checkStyleSetting(o[1]);
@@ -643,7 +678,7 @@
   var o = new api.StyleSettingList();
   buildCounterStyleSettingList++;
   if (buildCounterStyleSettingList < 3) {
-    o.items = buildUnnamed612();
+    o.items = buildUnnamed1065();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
@@ -655,7 +690,7 @@
 checkStyleSettingList(api.StyleSettingList o) {
   buildCounterStyleSettingList++;
   if (buildCounterStyleSettingList < 3) {
-    checkUnnamed612(o.items);
+    checkUnnamed1065(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -663,27 +698,27 @@
   buildCounterStyleSettingList--;
 }
 
-buildUnnamed613() {
+buildUnnamed1066() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed613(core.List<core.String> o) {
+checkUnnamed1066(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed614() {
+buildUnnamed1067() {
   var o = new core.List<api.Column>();
   o.add(buildColumn());
   o.add(buildColumn());
   return o;
 }
 
-checkUnnamed614(core.List<api.Column> o) {
+checkUnnamed1067(core.List<api.Column> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkColumn(o[0]);
   checkColumn(o[1]);
@@ -696,9 +731,9 @@
   if (buildCounterTable < 3) {
     o.attribution = "foo";
     o.attributionLink = "foo";
-    o.baseTableIds = buildUnnamed613();
+    o.baseTableIds = buildUnnamed1066();
     o.columnPropertiesJsonSchema = "foo";
-    o.columns = buildUnnamed614();
+    o.columns = buildUnnamed1067();
     o.description = "foo";
     o.isExportable = true;
     o.kind = "foo";
@@ -717,9 +752,9 @@
   if (buildCounterTable < 3) {
     unittest.expect(o.attribution, unittest.equals('foo'));
     unittest.expect(o.attributionLink, unittest.equals('foo'));
-    checkUnnamed613(o.baseTableIds);
+    checkUnnamed1066(o.baseTableIds);
     unittest.expect(o.columnPropertiesJsonSchema, unittest.equals('foo'));
-    checkUnnamed614(o.columns);
+    checkUnnamed1067(o.columns);
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.isExportable, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
@@ -732,14 +767,14 @@
   buildCounterTable--;
 }
 
-buildUnnamed615() {
+buildUnnamed1068() {
   var o = new core.List<api.Table>();
   o.add(buildTable());
   o.add(buildTable());
   return o;
 }
 
-checkUnnamed615(core.List<api.Table> o) {
+checkUnnamed1068(core.List<api.Table> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTable(o[0]);
   checkTable(o[1]);
@@ -750,7 +785,7 @@
   var o = new api.TableList();
   buildCounterTableList++;
   if (buildCounterTableList < 3) {
-    o.items = buildUnnamed615();
+    o.items = buildUnnamed1068();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -761,7 +796,7 @@
 checkTableList(api.TableList o) {
   buildCounterTableList++;
   if (buildCounterTableList < 3) {
-    checkUnnamed615(o.items);
+    checkUnnamed1068(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -795,14 +830,14 @@
   buildCounterTask--;
 }
 
-buildUnnamed616() {
+buildUnnamed1069() {
   var o = new core.List<api.Task>();
   o.add(buildTask());
   o.add(buildTask());
   return o;
 }
 
-checkUnnamed616(core.List<api.Task> o) {
+checkUnnamed1069(core.List<api.Task> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTask(o[0]);
   checkTask(o[1]);
@@ -813,7 +848,7 @@
   var o = new api.TaskList();
   buildCounterTaskList++;
   if (buildCounterTaskList < 3) {
-    o.items = buildUnnamed616();
+    o.items = buildUnnamed1069();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
@@ -825,7 +860,7 @@
 checkTaskList(api.TaskList o) {
   buildCounterTaskList++;
   if (buildCounterTaskList < 3) {
-    checkUnnamed616(o.items);
+    checkUnnamed1069(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -833,14 +868,14 @@
   buildCounterTaskList--;
 }
 
-buildUnnamed617() {
+buildUnnamed1070() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed617(core.List<core.String> o) {
+checkUnnamed1070(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -851,7 +886,7 @@
   var o = new api.Template();
   buildCounterTemplate++;
   if (buildCounterTemplate < 3) {
-    o.automaticColumnNames = buildUnnamed617();
+    o.automaticColumnNames = buildUnnamed1070();
     o.body = "foo";
     o.kind = "foo";
     o.name = "foo";
@@ -865,7 +900,7 @@
 checkTemplate(api.Template o) {
   buildCounterTemplate++;
   if (buildCounterTemplate < 3) {
-    checkUnnamed617(o.automaticColumnNames);
+    checkUnnamed1070(o.automaticColumnNames);
     unittest.expect(o.body, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
@@ -875,14 +910,14 @@
   buildCounterTemplate--;
 }
 
-buildUnnamed618() {
+buildUnnamed1071() {
   var o = new core.List<api.Template>();
   o.add(buildTemplate());
   o.add(buildTemplate());
   return o;
 }
 
-checkUnnamed618(core.List<api.Template> o) {
+checkUnnamed1071(core.List<api.Template> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTemplate(o[0]);
   checkTemplate(o[1]);
@@ -893,7 +928,7 @@
   var o = new api.TemplateList();
   buildCounterTemplateList++;
   if (buildCounterTemplateList < 3) {
-    o.items = buildUnnamed618();
+    o.items = buildUnnamed1071();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
@@ -905,7 +940,7 @@
 checkTemplateList(api.TemplateList o) {
   buildCounterTemplateList++;
   if (buildCounterTemplateList < 3) {
-    checkUnnamed618(o.items);
+    checkUnnamed1071(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -1134,7 +1169,7 @@
   unittest.group("resource-ColumnResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ColumnResourceApi res = new api.FusiontablesApi(mock).column;
       var arg_tableId = "foo";
       var arg_columnId = "foo";
@@ -1182,14 +1217,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_tableId, arg_columnId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ColumnResourceApi res = new api.FusiontablesApi(mock).column;
       var arg_tableId = "foo";
       var arg_columnId = "foo";
@@ -1237,7 +1272,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildColumn());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_tableId, arg_columnId).then(unittest.expectAsync(((api.Column response) {
         checkColumn(response);
@@ -1246,7 +1281,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ColumnResourceApi res = new api.FusiontablesApi(mock).column;
       var arg_request = buildColumn();
       var arg_tableId = "foo";
@@ -1294,7 +1329,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildColumn());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_tableId).then(unittest.expectAsync(((api.Column response) {
         checkColumn(response);
@@ -1303,7 +1338,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ColumnResourceApi res = new api.FusiontablesApi(mock).column;
       var arg_tableId = "foo";
       var arg_maxResults = 42;
@@ -1351,7 +1386,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildColumnList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_tableId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.ColumnList response) {
         checkColumnList(response);
@@ -1360,7 +1395,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ColumnResourceApi res = new api.FusiontablesApi(mock).column;
       var arg_request = buildColumn();
       var arg_tableId = "foo";
@@ -1412,7 +1447,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildColumn());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_tableId, arg_columnId).then(unittest.expectAsync(((api.Column response) {
         checkColumn(response);
@@ -1421,7 +1456,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ColumnResourceApi res = new api.FusiontablesApi(mock).column;
       var arg_request = buildColumn();
       var arg_tableId = "foo";
@@ -1473,7 +1508,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildColumn());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_tableId, arg_columnId).then(unittest.expectAsync(((api.Column response) {
         checkColumn(response);
@@ -1488,7 +1523,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.QueryResourceApi res = new api.FusiontablesApi(mock).query;
       var arg_sql_1 = "foo";
       var arg_hdrs = true;
@@ -1530,7 +1565,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSqlresponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.sql(arg_sql_1, hdrs: arg_hdrs, typed: arg_typed).then(unittest.expectAsync(((api.Sqlresponse response) {
         checkSqlresponse(response);
@@ -1541,7 +1576,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.QueryResourceApi res = new api.FusiontablesApi(mock).query;
       var arg_sql_1 = "foo";
       var arg_hdrs = true;
@@ -1583,7 +1618,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSqlresponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.sqlGet(arg_sql_1, hdrs: arg_hdrs, typed: arg_typed).then(unittest.expectAsync(((api.Sqlresponse response) {
         checkSqlresponse(response);
@@ -1596,7 +1631,7 @@
   unittest.group("resource-StyleResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.StyleResourceApi res = new api.FusiontablesApi(mock).style;
       var arg_tableId = "foo";
       var arg_styleId = 42;
@@ -1644,14 +1679,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_tableId, arg_styleId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.StyleResourceApi res = new api.FusiontablesApi(mock).style;
       var arg_tableId = "foo";
       var arg_styleId = 42;
@@ -1699,7 +1734,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildStyleSetting());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_tableId, arg_styleId).then(unittest.expectAsync(((api.StyleSetting response) {
         checkStyleSetting(response);
@@ -1708,7 +1743,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.StyleResourceApi res = new api.FusiontablesApi(mock).style;
       var arg_request = buildStyleSetting();
       var arg_tableId = "foo";
@@ -1756,7 +1791,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildStyleSetting());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_tableId).then(unittest.expectAsync(((api.StyleSetting response) {
         checkStyleSetting(response);
@@ -1765,7 +1800,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.StyleResourceApi res = new api.FusiontablesApi(mock).style;
       var arg_tableId = "foo";
       var arg_maxResults = 42;
@@ -1813,7 +1848,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildStyleSettingList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_tableId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.StyleSettingList response) {
         checkStyleSettingList(response);
@@ -1822,7 +1857,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.StyleResourceApi res = new api.FusiontablesApi(mock).style;
       var arg_request = buildStyleSetting();
       var arg_tableId = "foo";
@@ -1874,7 +1909,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildStyleSetting());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_tableId, arg_styleId).then(unittest.expectAsync(((api.StyleSetting response) {
         checkStyleSetting(response);
@@ -1883,7 +1918,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.StyleResourceApi res = new api.FusiontablesApi(mock).style;
       var arg_request = buildStyleSetting();
       var arg_tableId = "foo";
@@ -1935,7 +1970,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildStyleSetting());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_tableId, arg_styleId).then(unittest.expectAsync(((api.StyleSetting response) {
         checkStyleSetting(response);
@@ -1948,7 +1983,7 @@
   unittest.group("resource-TableResourceApi", () {
     unittest.test("method--copy", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TableResourceApi res = new api.FusiontablesApi(mock).table;
       var arg_tableId = "foo";
       var arg_copyPresentation = true;
@@ -1994,7 +2029,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTable());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.copy(arg_tableId, copyPresentation: arg_copyPresentation).then(unittest.expectAsync(((api.Table response) {
         checkTable(response);
@@ -2003,7 +2038,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TableResourceApi res = new api.FusiontablesApi(mock).table;
       var arg_tableId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2043,14 +2078,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_tableId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TableResourceApi res = new api.FusiontablesApi(mock).table;
       var arg_tableId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2090,7 +2125,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTable());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_tableId).then(unittest.expectAsync(((api.Table response) {
         checkTable(response);
@@ -2101,7 +2136,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TableResourceApi res = new api.FusiontablesApi(mock).table;
       var arg_tableId = "foo";
       var arg_delimiter = "foo";
@@ -2155,7 +2190,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildImport());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.importRows(arg_tableId, delimiter: arg_delimiter, encoding: arg_encoding, endLine: arg_endLine, isStrict: arg_isStrict, startLine: arg_startLine).then(unittest.expectAsync(((api.Import response) {
         checkImport(response);
@@ -2166,7 +2201,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TableResourceApi res = new api.FusiontablesApi(mock).table;
       var arg_name = "foo";
       var arg_delimiter = "foo";
@@ -2208,7 +2243,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTable());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.importTable(arg_name, delimiter: arg_delimiter, encoding: arg_encoding).then(unittest.expectAsync(((api.Table response) {
         checkTable(response);
@@ -2217,7 +2252,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TableResourceApi res = new api.FusiontablesApi(mock).table;
       var arg_request = buildTable();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2257,7 +2292,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTable());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request).then(unittest.expectAsync(((api.Table response) {
         checkTable(response);
@@ -2266,7 +2301,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TableResourceApi res = new api.FusiontablesApi(mock).table;
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
@@ -2306,7 +2341,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTableList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.TableList response) {
         checkTableList(response);
@@ -2315,7 +2350,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TableResourceApi res = new api.FusiontablesApi(mock).table;
       var arg_request = buildTable();
       var arg_tableId = "foo";
@@ -2361,7 +2396,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTable());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_tableId, replaceViewDefinition: arg_replaceViewDefinition).then(unittest.expectAsync(((api.Table response) {
         checkTable(response);
@@ -2372,7 +2407,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TableResourceApi res = new api.FusiontablesApi(mock).table;
       var arg_tableId = "foo";
       var arg_delimiter = "foo";
@@ -2426,7 +2461,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTask());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.replaceRows(arg_tableId, delimiter: arg_delimiter, encoding: arg_encoding, endLine: arg_endLine, isStrict: arg_isStrict, startLine: arg_startLine).then(unittest.expectAsync(((api.Task response) {
         checkTask(response);
@@ -2435,7 +2470,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TableResourceApi res = new api.FusiontablesApi(mock).table;
       var arg_request = buildTable();
       var arg_tableId = "foo";
@@ -2481,7 +2516,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTable());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_tableId, replaceViewDefinition: arg_replaceViewDefinition).then(unittest.expectAsync(((api.Table response) {
         checkTable(response);
@@ -2494,7 +2529,7 @@
   unittest.group("resource-TaskResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TaskResourceApi res = new api.FusiontablesApi(mock).task;
       var arg_tableId = "foo";
       var arg_taskId = "foo";
@@ -2542,14 +2577,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_tableId, arg_taskId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TaskResourceApi res = new api.FusiontablesApi(mock).task;
       var arg_tableId = "foo";
       var arg_taskId = "foo";
@@ -2597,7 +2632,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTask());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_tableId, arg_taskId).then(unittest.expectAsync(((api.Task response) {
         checkTask(response);
@@ -2606,7 +2641,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TaskResourceApi res = new api.FusiontablesApi(mock).task;
       var arg_tableId = "foo";
       var arg_maxResults = 42;
@@ -2656,7 +2691,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTaskList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_tableId, maxResults: arg_maxResults, pageToken: arg_pageToken, startIndex: arg_startIndex).then(unittest.expectAsync(((api.TaskList response) {
         checkTaskList(response);
@@ -2669,7 +2704,7 @@
   unittest.group("resource-TemplateResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TemplateResourceApi res = new api.FusiontablesApi(mock).template;
       var arg_tableId = "foo";
       var arg_templateId = 42;
@@ -2717,14 +2752,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_tableId, arg_templateId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TemplateResourceApi res = new api.FusiontablesApi(mock).template;
       var arg_tableId = "foo";
       var arg_templateId = 42;
@@ -2772,7 +2807,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTemplate());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_tableId, arg_templateId).then(unittest.expectAsync(((api.Template response) {
         checkTemplate(response);
@@ -2781,7 +2816,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TemplateResourceApi res = new api.FusiontablesApi(mock).template;
       var arg_request = buildTemplate();
       var arg_tableId = "foo";
@@ -2829,7 +2864,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTemplate());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_tableId).then(unittest.expectAsync(((api.Template response) {
         checkTemplate(response);
@@ -2838,7 +2873,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TemplateResourceApi res = new api.FusiontablesApi(mock).template;
       var arg_tableId = "foo";
       var arg_maxResults = 42;
@@ -2886,7 +2921,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTemplateList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_tableId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.TemplateList response) {
         checkTemplateList(response);
@@ -2895,7 +2930,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TemplateResourceApi res = new api.FusiontablesApi(mock).template;
       var arg_request = buildTemplate();
       var arg_tableId = "foo";
@@ -2947,7 +2982,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTemplate());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_tableId, arg_templateId).then(unittest.expectAsync(((api.Template response) {
         checkTemplate(response);
@@ -2956,7 +2991,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TemplateResourceApi res = new api.FusiontablesApi(mock).template;
       var arg_request = buildTemplate();
       var arg_tableId = "foo";
@@ -3008,7 +3043,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTemplate());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_tableId, arg_templateId).then(unittest.expectAsync(((api.Template response) {
         checkTemplate(response);
diff --git a/generated/googleapis/test/games/v1_test.dart b/generated/googleapis/test/games/v1_test.dart
index 7a03cdd..f06f61e 100644
--- a/generated/googleapis/test/games/v1_test.dart
+++ b/generated/googleapis/test/games/v1_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/games/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterAchievementDefinition = 0;
 buildAchievementDefinition() {
@@ -59,14 +94,14 @@
   buildCounterAchievementDefinition--;
 }
 
-buildUnnamed20() {
+buildUnnamed1072() {
   var o = new core.List<api.AchievementDefinition>();
   o.add(buildAchievementDefinition());
   o.add(buildAchievementDefinition());
   return o;
 }
 
-checkUnnamed20(core.List<api.AchievementDefinition> o) {
+checkUnnamed1072(core.List<api.AchievementDefinition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAchievementDefinition(o[0]);
   checkAchievementDefinition(o[1]);
@@ -77,7 +112,7 @@
   var o = new api.AchievementDefinitionsListResponse();
   buildCounterAchievementDefinitionsListResponse++;
   if (buildCounterAchievementDefinitionsListResponse < 3) {
-    o.items = buildUnnamed20();
+    o.items = buildUnnamed1072();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -88,7 +123,7 @@
 checkAchievementDefinitionsListResponse(api.AchievementDefinitionsListResponse o) {
   buildCounterAchievementDefinitionsListResponse++;
   if (buildCounterAchievementDefinitionsListResponse < 3) {
-    checkUnnamed20(o.items);
+    checkUnnamed1072(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -183,14 +218,14 @@
   buildCounterAchievementUnlockResponse--;
 }
 
-buildUnnamed21() {
+buildUnnamed1073() {
   var o = new core.List<api.AchievementUpdateRequest>();
   o.add(buildAchievementUpdateRequest());
   o.add(buildAchievementUpdateRequest());
   return o;
 }
 
-checkUnnamed21(core.List<api.AchievementUpdateRequest> o) {
+checkUnnamed1073(core.List<api.AchievementUpdateRequest> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAchievementUpdateRequest(o[0]);
   checkAchievementUpdateRequest(o[1]);
@@ -202,7 +237,7 @@
   buildCounterAchievementUpdateMultipleRequest++;
   if (buildCounterAchievementUpdateMultipleRequest < 3) {
     o.kind = "foo";
-    o.updates = buildUnnamed21();
+    o.updates = buildUnnamed1073();
   }
   buildCounterAchievementUpdateMultipleRequest--;
   return o;
@@ -212,19 +247,19 @@
   buildCounterAchievementUpdateMultipleRequest++;
   if (buildCounterAchievementUpdateMultipleRequest < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed21(o.updates);
+    checkUnnamed1073(o.updates);
   }
   buildCounterAchievementUpdateMultipleRequest--;
 }
 
-buildUnnamed22() {
+buildUnnamed1074() {
   var o = new core.List<api.AchievementUpdateResponse>();
   o.add(buildAchievementUpdateResponse());
   o.add(buildAchievementUpdateResponse());
   return o;
 }
 
-checkUnnamed22(core.List<api.AchievementUpdateResponse> o) {
+checkUnnamed1074(core.List<api.AchievementUpdateResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAchievementUpdateResponse(o[0]);
   checkAchievementUpdateResponse(o[1]);
@@ -236,7 +271,7 @@
   buildCounterAchievementUpdateMultipleResponse++;
   if (buildCounterAchievementUpdateMultipleResponse < 3) {
     o.kind = "foo";
-    o.updatedAchievements = buildUnnamed22();
+    o.updatedAchievements = buildUnnamed1074();
   }
   buildCounterAchievementUpdateMultipleResponse--;
   return o;
@@ -246,7 +281,7 @@
   buildCounterAchievementUpdateMultipleResponse++;
   if (buildCounterAchievementUpdateMultipleResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed22(o.updatedAchievements);
+    checkUnnamed1074(o.updatedAchievements);
   }
   buildCounterAchievementUpdateMultipleResponse--;
 }
@@ -357,40 +392,40 @@
   buildCounterAnonymousPlayer--;
 }
 
-buildUnnamed23() {
+buildUnnamed1075() {
   var o = new core.List<api.ImageAsset>();
   o.add(buildImageAsset());
   o.add(buildImageAsset());
   return o;
 }
 
-checkUnnamed23(core.List<api.ImageAsset> o) {
+checkUnnamed1075(core.List<api.ImageAsset> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkImageAsset(o[0]);
   checkImageAsset(o[1]);
 }
 
-buildUnnamed24() {
+buildUnnamed1076() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed24(core.List<core.String> o) {
+checkUnnamed1076(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed25() {
+buildUnnamed1077() {
   var o = new core.List<api.Instance>();
   o.add(buildInstance());
   o.add(buildInstance());
   return o;
 }
 
-checkUnnamed25(core.List<api.Instance> o) {
+checkUnnamed1077(core.List<api.Instance> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstance(o[0]);
   checkInstance(o[1]);
@@ -402,13 +437,13 @@
   buildCounterApplication++;
   if (buildCounterApplication < 3) {
     o.achievementCount = 42;
-    o.assets = buildUnnamed23();
+    o.assets = buildUnnamed1075();
     o.author = "foo";
     o.category = buildApplicationCategory();
     o.description = "foo";
-    o.enabledFeatures = buildUnnamed24();
+    o.enabledFeatures = buildUnnamed1076();
     o.id = "foo";
-    o.instances = buildUnnamed25();
+    o.instances = buildUnnamed1077();
     o.kind = "foo";
     o.lastUpdatedTimestamp = "foo";
     o.leaderboardCount = 42;
@@ -423,13 +458,13 @@
   buildCounterApplication++;
   if (buildCounterApplication < 3) {
     unittest.expect(o.achievementCount, unittest.equals(42));
-    checkUnnamed23(o.assets);
+    checkUnnamed1075(o.assets);
     unittest.expect(o.author, unittest.equals('foo'));
     checkApplicationCategory(o.category);
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed24(o.enabledFeatures);
+    checkUnnamed1076(o.enabledFeatures);
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed25(o.instances);
+    checkUnnamed1077(o.instances);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.lastUpdatedTimestamp, unittest.equals('foo'));
     unittest.expect(o.leaderboardCount, unittest.equals(42));
@@ -485,14 +520,14 @@
   buildCounterCategory--;
 }
 
-buildUnnamed26() {
+buildUnnamed1078() {
   var o = new core.List<api.Category>();
   o.add(buildCategory());
   o.add(buildCategory());
   return o;
 }
 
-checkUnnamed26(core.List<api.Category> o) {
+checkUnnamed1078(core.List<api.Category> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCategory(o[0]);
   checkCategory(o[1]);
@@ -503,7 +538,7 @@
   var o = new api.CategoryListResponse();
   buildCounterCategoryListResponse++;
   if (buildCounterCategoryListResponse < 3) {
-    o.items = buildUnnamed26();
+    o.items = buildUnnamed1078();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -514,7 +549,7 @@
 checkCategoryListResponse(api.CategoryListResponse o) {
   buildCounterCategoryListResponse++;
   if (buildCounterCategoryListResponse < 3) {
-    checkUnnamed26(o.items);
+    checkUnnamed1078(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -565,14 +600,14 @@
   buildCounterEventChild--;
 }
 
-buildUnnamed27() {
+buildUnnamed1079() {
   var o = new core.List<api.EventChild>();
   o.add(buildEventChild());
   o.add(buildEventChild());
   return o;
 }
 
-checkUnnamed27(core.List<api.EventChild> o) {
+checkUnnamed1079(core.List<api.EventChild> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventChild(o[0]);
   checkEventChild(o[1]);
@@ -583,7 +618,7 @@
   var o = new api.EventDefinition();
   buildCounterEventDefinition++;
   if (buildCounterEventDefinition < 3) {
-    o.childEvents = buildUnnamed27();
+    o.childEvents = buildUnnamed1079();
     o.description = "foo";
     o.displayName = "foo";
     o.id = "foo";
@@ -599,7 +634,7 @@
 checkEventDefinition(api.EventDefinition o) {
   buildCounterEventDefinition++;
   if (buildCounterEventDefinition < 3) {
-    checkUnnamed27(o.childEvents);
+    checkUnnamed1079(o.childEvents);
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
@@ -611,14 +646,14 @@
   buildCounterEventDefinition--;
 }
 
-buildUnnamed28() {
+buildUnnamed1080() {
   var o = new core.List<api.EventDefinition>();
   o.add(buildEventDefinition());
   o.add(buildEventDefinition());
   return o;
 }
 
-checkUnnamed28(core.List<api.EventDefinition> o) {
+checkUnnamed1080(core.List<api.EventDefinition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventDefinition(o[0]);
   checkEventDefinition(o[1]);
@@ -629,7 +664,7 @@
   var o = new api.EventDefinitionListResponse();
   buildCounterEventDefinitionListResponse++;
   if (buildCounterEventDefinitionListResponse < 3) {
-    o.items = buildUnnamed28();
+    o.items = buildUnnamed1080();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -640,7 +675,7 @@
 checkEventDefinitionListResponse(api.EventDefinitionListResponse o) {
   buildCounterEventDefinitionListResponse++;
   if (buildCounterEventDefinitionListResponse < 3) {
-    checkUnnamed28(o.items);
+    checkUnnamed1080(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -670,14 +705,14 @@
   buildCounterEventPeriodRange--;
 }
 
-buildUnnamed29() {
+buildUnnamed1081() {
   var o = new core.List<api.EventUpdateRequest>();
   o.add(buildEventUpdateRequest());
   o.add(buildEventUpdateRequest());
   return o;
 }
 
-checkUnnamed29(core.List<api.EventUpdateRequest> o) {
+checkUnnamed1081(core.List<api.EventUpdateRequest> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventUpdateRequest(o[0]);
   checkEventUpdateRequest(o[1]);
@@ -690,7 +725,7 @@
   if (buildCounterEventPeriodUpdate < 3) {
     o.kind = "foo";
     o.timePeriod = buildEventPeriodRange();
-    o.updates = buildUnnamed29();
+    o.updates = buildUnnamed1081();
   }
   buildCounterEventPeriodUpdate--;
   return o;
@@ -701,7 +736,7 @@
   if (buildCounterEventPeriodUpdate < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     checkEventPeriodRange(o.timePeriod);
-    checkUnnamed29(o.updates);
+    checkUnnamed1081(o.updates);
   }
   buildCounterEventPeriodUpdate--;
 }
@@ -729,14 +764,14 @@
   buildCounterEventRecordFailure--;
 }
 
-buildUnnamed30() {
+buildUnnamed1082() {
   var o = new core.List<api.EventPeriodUpdate>();
   o.add(buildEventPeriodUpdate());
   o.add(buildEventPeriodUpdate());
   return o;
 }
 
-checkUnnamed30(core.List<api.EventPeriodUpdate> o) {
+checkUnnamed1082(core.List<api.EventPeriodUpdate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventPeriodUpdate(o[0]);
   checkEventPeriodUpdate(o[1]);
@@ -750,7 +785,7 @@
     o.currentTimeMillis = "foo";
     o.kind = "foo";
     o.requestId = "foo";
-    o.timePeriods = buildUnnamed30();
+    o.timePeriods = buildUnnamed1082();
   }
   buildCounterEventRecordRequest--;
   return o;
@@ -762,7 +797,7 @@
     unittest.expect(o.currentTimeMillis, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.requestId, unittest.equals('foo'));
-    checkUnnamed30(o.timePeriods);
+    checkUnnamed1082(o.timePeriods);
   }
   buildCounterEventRecordRequest--;
 }
@@ -790,40 +825,40 @@
   buildCounterEventUpdateRequest--;
 }
 
-buildUnnamed31() {
+buildUnnamed1083() {
   var o = new core.List<api.EventBatchRecordFailure>();
   o.add(buildEventBatchRecordFailure());
   o.add(buildEventBatchRecordFailure());
   return o;
 }
 
-checkUnnamed31(core.List<api.EventBatchRecordFailure> o) {
+checkUnnamed1083(core.List<api.EventBatchRecordFailure> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventBatchRecordFailure(o[0]);
   checkEventBatchRecordFailure(o[1]);
 }
 
-buildUnnamed32() {
+buildUnnamed1084() {
   var o = new core.List<api.EventRecordFailure>();
   o.add(buildEventRecordFailure());
   o.add(buildEventRecordFailure());
   return o;
 }
 
-checkUnnamed32(core.List<api.EventRecordFailure> o) {
+checkUnnamed1084(core.List<api.EventRecordFailure> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventRecordFailure(o[0]);
   checkEventRecordFailure(o[1]);
 }
 
-buildUnnamed33() {
+buildUnnamed1085() {
   var o = new core.List<api.PlayerEvent>();
   o.add(buildPlayerEvent());
   o.add(buildPlayerEvent());
   return o;
 }
 
-checkUnnamed33(core.List<api.PlayerEvent> o) {
+checkUnnamed1085(core.List<api.PlayerEvent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayerEvent(o[0]);
   checkPlayerEvent(o[1]);
@@ -834,10 +869,10 @@
   var o = new api.EventUpdateResponse();
   buildCounterEventUpdateResponse++;
   if (buildCounterEventUpdateResponse < 3) {
-    o.batchFailures = buildUnnamed31();
-    o.eventFailures = buildUnnamed32();
+    o.batchFailures = buildUnnamed1083();
+    o.eventFailures = buildUnnamed1084();
     o.kind = "foo";
-    o.playerEvents = buildUnnamed33();
+    o.playerEvents = buildUnnamed1085();
   }
   buildCounterEventUpdateResponse--;
   return o;
@@ -846,10 +881,10 @@
 checkEventUpdateResponse(api.EventUpdateResponse o) {
   buildCounterEventUpdateResponse++;
   if (buildCounterEventUpdateResponse < 3) {
-    checkUnnamed31(o.batchFailures);
-    checkUnnamed32(o.eventFailures);
+    checkUnnamed1083(o.batchFailures);
+    checkUnnamed1084(o.eventFailures);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed33(o.playerEvents);
+    checkUnnamed1085(o.playerEvents);
   }
   buildCounterEventUpdateResponse--;
 }
@@ -1103,14 +1138,14 @@
   buildCounterLeaderboardEntry--;
 }
 
-buildUnnamed34() {
+buildUnnamed1086() {
   var o = new core.List<api.Leaderboard>();
   o.add(buildLeaderboard());
   o.add(buildLeaderboard());
   return o;
 }
 
-checkUnnamed34(core.List<api.Leaderboard> o) {
+checkUnnamed1086(core.List<api.Leaderboard> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLeaderboard(o[0]);
   checkLeaderboard(o[1]);
@@ -1121,7 +1156,7 @@
   var o = new api.LeaderboardListResponse();
   buildCounterLeaderboardListResponse++;
   if (buildCounterLeaderboardListResponse < 3) {
-    o.items = buildUnnamed34();
+    o.items = buildUnnamed1086();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1132,7 +1167,7 @@
 checkLeaderboardListResponse(api.LeaderboardListResponse o) {
   buildCounterLeaderboardListResponse++;
   if (buildCounterLeaderboardListResponse < 3) {
-    checkUnnamed34(o.items);
+    checkUnnamed1086(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1166,14 +1201,14 @@
   buildCounterLeaderboardScoreRank--;
 }
 
-buildUnnamed35() {
+buildUnnamed1087() {
   var o = new core.List<api.LeaderboardEntry>();
   o.add(buildLeaderboardEntry());
   o.add(buildLeaderboardEntry());
   return o;
 }
 
-checkUnnamed35(core.List<api.LeaderboardEntry> o) {
+checkUnnamed1087(core.List<api.LeaderboardEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLeaderboardEntry(o[0]);
   checkLeaderboardEntry(o[1]);
@@ -1184,7 +1219,7 @@
   var o = new api.LeaderboardScores();
   buildCounterLeaderboardScores++;
   if (buildCounterLeaderboardScores < 3) {
-    o.items = buildUnnamed35();
+    o.items = buildUnnamed1087();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.numScores = "foo";
@@ -1198,7 +1233,7 @@
 checkLeaderboardScores(api.LeaderboardScores o) {
   buildCounterLeaderboardScores++;
   if (buildCounterLeaderboardScores < 3) {
-    checkUnnamed35(o.items);
+    checkUnnamed1087(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.numScores, unittest.equals('foo'));
@@ -1208,14 +1243,14 @@
   buildCounterLeaderboardScores--;
 }
 
-buildUnnamed36() {
+buildUnnamed1088() {
   var o = new core.List<api.PlayerLevel>();
   o.add(buildPlayerLevel());
   o.add(buildPlayerLevel());
   return o;
 }
 
-checkUnnamed36(core.List<api.PlayerLevel> o) {
+checkUnnamed1088(core.List<api.PlayerLevel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayerLevel(o[0]);
   checkPlayerLevel(o[1]);
@@ -1228,7 +1263,7 @@
   if (buildCounterMetagameConfig < 3) {
     o.currentVersion = 42;
     o.kind = "foo";
-    o.playerLevels = buildUnnamed36();
+    o.playerLevels = buildUnnamed1088();
   }
   buildCounterMetagameConfig--;
   return o;
@@ -1239,7 +1274,7 @@
   if (buildCounterMetagameConfig < 3) {
     unittest.expect(o.currentVersion, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed36(o.playerLevels);
+    checkUnnamed1088(o.playerLevels);
   }
   buildCounterMetagameConfig--;
 }
@@ -1468,14 +1503,14 @@
   buildCounterPlayerAchievement--;
 }
 
-buildUnnamed37() {
+buildUnnamed1089() {
   var o = new core.List<api.PlayerAchievement>();
   o.add(buildPlayerAchievement());
   o.add(buildPlayerAchievement());
   return o;
 }
 
-checkUnnamed37(core.List<api.PlayerAchievement> o) {
+checkUnnamed1089(core.List<api.PlayerAchievement> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayerAchievement(o[0]);
   checkPlayerAchievement(o[1]);
@@ -1486,7 +1521,7 @@
   var o = new api.PlayerAchievementListResponse();
   buildCounterPlayerAchievementListResponse++;
   if (buildCounterPlayerAchievementListResponse < 3) {
-    o.items = buildUnnamed37();
+    o.items = buildUnnamed1089();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1497,7 +1532,7 @@
 checkPlayerAchievementListResponse(api.PlayerAchievementListResponse o) {
   buildCounterPlayerAchievementListResponse++;
   if (buildCounterPlayerAchievementListResponse < 3) {
-    checkUnnamed37(o.items);
+    checkUnnamed1089(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1531,14 +1566,14 @@
   buildCounterPlayerEvent--;
 }
 
-buildUnnamed38() {
+buildUnnamed1090() {
   var o = new core.List<api.PlayerEvent>();
   o.add(buildPlayerEvent());
   o.add(buildPlayerEvent());
   return o;
 }
 
-checkUnnamed38(core.List<api.PlayerEvent> o) {
+checkUnnamed1090(core.List<api.PlayerEvent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayerEvent(o[0]);
   checkPlayerEvent(o[1]);
@@ -1549,7 +1584,7 @@
   var o = new api.PlayerEventListResponse();
   buildCounterPlayerEventListResponse++;
   if (buildCounterPlayerEventListResponse < 3) {
-    o.items = buildUnnamed38();
+    o.items = buildUnnamed1090();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1560,7 +1595,7 @@
 checkPlayerEventListResponse(api.PlayerEventListResponse o) {
   buildCounterPlayerEventListResponse++;
   if (buildCounterPlayerEventListResponse < 3) {
-    checkUnnamed38(o.items);
+    checkUnnamed1090(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1629,14 +1664,14 @@
   buildCounterPlayerLeaderboardScore--;
 }
 
-buildUnnamed39() {
+buildUnnamed1091() {
   var o = new core.List<api.PlayerLeaderboardScore>();
   o.add(buildPlayerLeaderboardScore());
   o.add(buildPlayerLeaderboardScore());
   return o;
 }
 
-checkUnnamed39(core.List<api.PlayerLeaderboardScore> o) {
+checkUnnamed1091(core.List<api.PlayerLeaderboardScore> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayerLeaderboardScore(o[0]);
   checkPlayerLeaderboardScore(o[1]);
@@ -1647,7 +1682,7 @@
   var o = new api.PlayerLeaderboardScoreListResponse();
   buildCounterPlayerLeaderboardScoreListResponse++;
   if (buildCounterPlayerLeaderboardScoreListResponse < 3) {
-    o.items = buildUnnamed39();
+    o.items = buildUnnamed1091();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.player = buildPlayer();
@@ -1659,7 +1694,7 @@
 checkPlayerLeaderboardScoreListResponse(api.PlayerLeaderboardScoreListResponse o) {
   buildCounterPlayerLeaderboardScoreListResponse++;
   if (buildCounterPlayerLeaderboardScoreListResponse < 3) {
-    checkUnnamed39(o.items);
+    checkUnnamed1091(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPlayer(o.player);
@@ -1692,14 +1727,14 @@
   buildCounterPlayerLevel--;
 }
 
-buildUnnamed40() {
+buildUnnamed1092() {
   var o = new core.List<api.Player>();
   o.add(buildPlayer());
   o.add(buildPlayer());
   return o;
 }
 
-checkUnnamed40(core.List<api.Player> o) {
+checkUnnamed1092(core.List<api.Player> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayer(o[0]);
   checkPlayer(o[1]);
@@ -1710,7 +1745,7 @@
   var o = new api.PlayerListResponse();
   buildCounterPlayerListResponse++;
   if (buildCounterPlayerListResponse < 3) {
-    o.items = buildUnnamed40();
+    o.items = buildUnnamed1092();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1721,7 +1756,7 @@
 checkPlayerListResponse(api.PlayerListResponse o) {
   buildCounterPlayerListResponse++;
   if (buildCounterPlayerListResponse < 3) {
-    checkUnnamed40(o.items);
+    checkUnnamed1092(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1755,14 +1790,14 @@
   buildCounterPlayerScore--;
 }
 
-buildUnnamed41() {
+buildUnnamed1093() {
   var o = new core.List<api.PlayerScoreResponse>();
   o.add(buildPlayerScoreResponse());
   o.add(buildPlayerScoreResponse());
   return o;
 }
 
-checkUnnamed41(core.List<api.PlayerScoreResponse> o) {
+checkUnnamed1093(core.List<api.PlayerScoreResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayerScoreResponse(o[0]);
   checkPlayerScoreResponse(o[1]);
@@ -1774,7 +1809,7 @@
   buildCounterPlayerScoreListResponse++;
   if (buildCounterPlayerScoreListResponse < 3) {
     o.kind = "foo";
-    o.submittedScores = buildUnnamed41();
+    o.submittedScores = buildUnnamed1093();
   }
   buildCounterPlayerScoreListResponse--;
   return o;
@@ -1784,32 +1819,32 @@
   buildCounterPlayerScoreListResponse++;
   if (buildCounterPlayerScoreListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed41(o.submittedScores);
+    checkUnnamed1093(o.submittedScores);
   }
   buildCounterPlayerScoreListResponse--;
 }
 
-buildUnnamed42() {
+buildUnnamed1094() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed42(core.List<core.String> o) {
+checkUnnamed1094(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed43() {
+buildUnnamed1095() {
   var o = new core.List<api.PlayerScore>();
   o.add(buildPlayerScore());
   o.add(buildPlayerScore());
   return o;
 }
 
-checkUnnamed43(core.List<api.PlayerScore> o) {
+checkUnnamed1095(core.List<api.PlayerScore> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayerScore(o[0]);
   checkPlayerScore(o[1]);
@@ -1820,12 +1855,12 @@
   var o = new api.PlayerScoreResponse();
   buildCounterPlayerScoreResponse++;
   if (buildCounterPlayerScoreResponse < 3) {
-    o.beatenScoreTimeSpans = buildUnnamed42();
+    o.beatenScoreTimeSpans = buildUnnamed1094();
     o.formattedScore = "foo";
     o.kind = "foo";
     o.leaderboardId = "foo";
     o.scoreTag = "foo";
-    o.unbeatenScores = buildUnnamed43();
+    o.unbeatenScores = buildUnnamed1095();
   }
   buildCounterPlayerScoreResponse--;
   return o;
@@ -1834,24 +1869,24 @@
 checkPlayerScoreResponse(api.PlayerScoreResponse o) {
   buildCounterPlayerScoreResponse++;
   if (buildCounterPlayerScoreResponse < 3) {
-    checkUnnamed42(o.beatenScoreTimeSpans);
+    checkUnnamed1094(o.beatenScoreTimeSpans);
     unittest.expect(o.formattedScore, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.leaderboardId, unittest.equals('foo'));
     unittest.expect(o.scoreTag, unittest.equals('foo'));
-    checkUnnamed43(o.unbeatenScores);
+    checkUnnamed1095(o.unbeatenScores);
   }
   buildCounterPlayerScoreResponse--;
 }
 
-buildUnnamed44() {
+buildUnnamed1096() {
   var o = new core.List<api.ScoreSubmission>();
   o.add(buildScoreSubmission());
   o.add(buildScoreSubmission());
   return o;
 }
 
-checkUnnamed44(core.List<api.ScoreSubmission> o) {
+checkUnnamed1096(core.List<api.ScoreSubmission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkScoreSubmission(o[0]);
   checkScoreSubmission(o[1]);
@@ -1863,7 +1898,7 @@
   buildCounterPlayerScoreSubmissionList++;
   if (buildCounterPlayerScoreSubmissionList < 3) {
     o.kind = "foo";
-    o.scores = buildUnnamed44();
+    o.scores = buildUnnamed1096();
   }
   buildCounterPlayerScoreSubmissionList--;
   return o;
@@ -1873,7 +1908,7 @@
   buildCounterPlayerScoreSubmissionList++;
   if (buildCounterPlayerScoreSubmissionList < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed44(o.scores);
+    checkUnnamed1096(o.scores);
   }
   buildCounterPlayerScoreSubmissionList--;
 }
@@ -1945,14 +1980,14 @@
   buildCounterPushTokenId--;
 }
 
-buildUnnamed45() {
+buildUnnamed1097() {
   var o = new core.List<api.QuestMilestone>();
   o.add(buildQuestMilestone());
   o.add(buildQuestMilestone());
   return o;
 }
 
-checkUnnamed45(core.List<api.QuestMilestone> o) {
+checkUnnamed1097(core.List<api.QuestMilestone> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuestMilestone(o[0]);
   checkQuestMilestone(o[1]);
@@ -1974,7 +2009,7 @@
     o.isDefaultIconUrl = true;
     o.kind = "foo";
     o.lastUpdatedTimestampMillis = "foo";
-    o.milestones = buildUnnamed45();
+    o.milestones = buildUnnamed1097();
     o.name = "foo";
     o.notifyTimestampMillis = "foo";
     o.startTimestampMillis = "foo";
@@ -1998,7 +2033,7 @@
     unittest.expect(o.isDefaultIconUrl, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.lastUpdatedTimestampMillis, unittest.equals('foo'));
-    checkUnnamed45(o.milestones);
+    checkUnnamed1097(o.milestones);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.notifyTimestampMillis, unittest.equals('foo'));
     unittest.expect(o.startTimestampMillis, unittest.equals('foo'));
@@ -2057,14 +2092,14 @@
   buildCounterQuestCriterion--;
 }
 
-buildUnnamed46() {
+buildUnnamed1098() {
   var o = new core.List<api.Quest>();
   o.add(buildQuest());
   o.add(buildQuest());
   return o;
 }
 
-checkUnnamed46(core.List<api.Quest> o) {
+checkUnnamed1098(core.List<api.Quest> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuest(o[0]);
   checkQuest(o[1]);
@@ -2075,7 +2110,7 @@
   var o = new api.QuestListResponse();
   buildCounterQuestListResponse++;
   if (buildCounterQuestListResponse < 3) {
-    o.items = buildUnnamed46();
+    o.items = buildUnnamed1098();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -2086,21 +2121,21 @@
 checkQuestListResponse(api.QuestListResponse o) {
   buildCounterQuestListResponse++;
   if (buildCounterQuestListResponse < 3) {
-    checkUnnamed46(o.items);
+    checkUnnamed1098(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterQuestListResponse--;
 }
 
-buildUnnamed47() {
+buildUnnamed1099() {
   var o = new core.List<api.QuestCriterion>();
   o.add(buildQuestCriterion());
   o.add(buildQuestCriterion());
   return o;
 }
 
-checkUnnamed47(core.List<api.QuestCriterion> o) {
+checkUnnamed1099(core.List<api.QuestCriterion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuestCriterion(o[0]);
   checkQuestCriterion(o[1]);
@@ -2112,7 +2147,7 @@
   buildCounterQuestMilestone++;
   if (buildCounterQuestMilestone < 3) {
     o.completionRewardData = "foo";
-    o.criteria = buildUnnamed47();
+    o.criteria = buildUnnamed1099();
     o.id = "foo";
     o.kind = "foo";
     o.state = "foo";
@@ -2125,7 +2160,7 @@
   buildCounterQuestMilestone++;
   if (buildCounterQuestMilestone < 3) {
     unittest.expect(o.completionRewardData, unittest.equals('foo'));
-    checkUnnamed47(o.criteria);
+    checkUnnamed1099(o.criteria);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.state, unittest.equals('foo'));
@@ -2156,14 +2191,14 @@
   buildCounterRevisionCheckResponse--;
 }
 
-buildUnnamed48() {
+buildUnnamed1100() {
   var o = new core.List<api.RoomParticipant>();
   o.add(buildRoomParticipant());
   o.add(buildRoomParticipant());
   return o;
 }
 
-checkUnnamed48(core.List<api.RoomParticipant> o) {
+checkUnnamed1100(core.List<api.RoomParticipant> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRoomParticipant(o[0]);
   checkRoomParticipant(o[1]);
@@ -2182,7 +2217,7 @@
     o.inviterId = "foo";
     o.kind = "foo";
     o.lastUpdateDetails = buildRoomModification();
-    o.participants = buildUnnamed48();
+    o.participants = buildUnnamed1100();
     o.roomId = "foo";
     o.roomStatusVersion = 42;
     o.status = "foo";
@@ -2203,7 +2238,7 @@
     unittest.expect(o.inviterId, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     checkRoomModification(o.lastUpdateDetails);
-    checkUnnamed48(o.participants);
+    checkUnnamed1100(o.participants);
     unittest.expect(o.roomId, unittest.equals('foo'));
     unittest.expect(o.roomStatusVersion, unittest.equals(42));
     unittest.expect(o.status, unittest.equals('foo'));
@@ -2279,27 +2314,27 @@
   buildCounterRoomClientAddress--;
 }
 
-buildUnnamed49() {
+buildUnnamed1101() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed49(core.List<core.String> o) {
+checkUnnamed1101(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed50() {
+buildUnnamed1102() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed50(core.List<core.String> o) {
+checkUnnamed1102(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2311,9 +2346,9 @@
   buildCounterRoomCreateRequest++;
   if (buildCounterRoomCreateRequest < 3) {
     o.autoMatchingCriteria = buildRoomAutoMatchingCriteria();
-    o.capabilities = buildUnnamed49();
+    o.capabilities = buildUnnamed1101();
     o.clientAddress = buildRoomClientAddress();
-    o.invitedPlayerIds = buildUnnamed50();
+    o.invitedPlayerIds = buildUnnamed1102();
     o.kind = "foo";
     o.networkDiagnostics = buildNetworkDiagnostics();
     o.requestId = "foo";
@@ -2327,9 +2362,9 @@
   buildCounterRoomCreateRequest++;
   if (buildCounterRoomCreateRequest < 3) {
     checkRoomAutoMatchingCriteria(o.autoMatchingCriteria);
-    checkUnnamed49(o.capabilities);
+    checkUnnamed1101(o.capabilities);
     checkRoomClientAddress(o.clientAddress);
-    checkUnnamed50(o.invitedPlayerIds);
+    checkUnnamed1102(o.invitedPlayerIds);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkNetworkDiagnostics(o.networkDiagnostics);
     unittest.expect(o.requestId, unittest.equals('foo'));
@@ -2338,14 +2373,14 @@
   buildCounterRoomCreateRequest--;
 }
 
-buildUnnamed51() {
+buildUnnamed1103() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed51(core.List<core.String> o) {
+checkUnnamed1103(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2356,7 +2391,7 @@
   var o = new api.RoomJoinRequest();
   buildCounterRoomJoinRequest++;
   if (buildCounterRoomJoinRequest < 3) {
-    o.capabilities = buildUnnamed51();
+    o.capabilities = buildUnnamed1103();
     o.clientAddress = buildRoomClientAddress();
     o.kind = "foo";
     o.networkDiagnostics = buildNetworkDiagnostics();
@@ -2368,7 +2403,7 @@
 checkRoomJoinRequest(api.RoomJoinRequest o) {
   buildCounterRoomJoinRequest++;
   if (buildCounterRoomJoinRequest < 3) {
-    checkUnnamed51(o.capabilities);
+    checkUnnamed1103(o.capabilities);
     checkRoomClientAddress(o.clientAddress);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkNetworkDiagnostics(o.networkDiagnostics);
@@ -2376,14 +2411,14 @@
   buildCounterRoomJoinRequest--;
 }
 
-buildUnnamed52() {
+buildUnnamed1104() {
   var o = new core.List<api.PeerSessionDiagnostics>();
   o.add(buildPeerSessionDiagnostics());
   o.add(buildPeerSessionDiagnostics());
   return o;
 }
 
-checkUnnamed52(core.List<api.PeerSessionDiagnostics> o) {
+checkUnnamed1104(core.List<api.PeerSessionDiagnostics> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPeerSessionDiagnostics(o[0]);
   checkPeerSessionDiagnostics(o[1]);
@@ -2400,7 +2435,7 @@
     o.kind = "foo";
     o.networkOperatorCode = "foo";
     o.networkOperatorName = "foo";
-    o.peerSession = buildUnnamed52();
+    o.peerSession = buildUnnamed1104();
     o.socketsUsed = true;
   }
   buildCounterRoomLeaveDiagnostics--;
@@ -2416,7 +2451,7 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.networkOperatorCode, unittest.equals('foo'));
     unittest.expect(o.networkOperatorName, unittest.equals('foo'));
-    checkUnnamed52(o.peerSession);
+    checkUnnamed1104(o.peerSession);
     unittest.expect(o.socketsUsed, unittest.isTrue);
   }
   buildCounterRoomLeaveDiagnostics--;
@@ -2445,14 +2480,14 @@
   buildCounterRoomLeaveRequest--;
 }
 
-buildUnnamed53() {
+buildUnnamed1105() {
   var o = new core.List<api.Room>();
   o.add(buildRoom());
   o.add(buildRoom());
   return o;
 }
 
-checkUnnamed53(core.List<api.Room> o) {
+checkUnnamed1105(core.List<api.Room> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRoom(o[0]);
   checkRoom(o[1]);
@@ -2463,7 +2498,7 @@
   var o = new api.RoomList();
   buildCounterRoomList++;
   if (buildCounterRoomList < 3) {
-    o.items = buildUnnamed53();
+    o.items = buildUnnamed1105();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -2474,7 +2509,7 @@
 checkRoomList(api.RoomList o) {
   buildCounterRoomList++;
   if (buildCounterRoomList < 3) {
-    checkUnnamed53(o.items);
+    checkUnnamed1105(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -2535,14 +2570,14 @@
   buildCounterRoomP2PStatus--;
 }
 
-buildUnnamed54() {
+buildUnnamed1106() {
   var o = new core.List<api.RoomP2PStatus>();
   o.add(buildRoomP2PStatus());
   o.add(buildRoomP2PStatus());
   return o;
 }
 
-checkUnnamed54(core.List<api.RoomP2PStatus> o) {
+checkUnnamed1106(core.List<api.RoomP2PStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRoomP2PStatus(o[0]);
   checkRoomP2PStatus(o[1]);
@@ -2554,7 +2589,7 @@
   buildCounterRoomP2PStatuses++;
   if (buildCounterRoomP2PStatuses < 3) {
     o.kind = "foo";
-    o.updates = buildUnnamed54();
+    o.updates = buildUnnamed1106();
   }
   buildCounterRoomP2PStatuses--;
   return o;
@@ -2564,19 +2599,19 @@
   buildCounterRoomP2PStatuses++;
   if (buildCounterRoomP2PStatuses < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed54(o.updates);
+    checkUnnamed1106(o.updates);
   }
   buildCounterRoomP2PStatuses--;
 }
 
-buildUnnamed55() {
+buildUnnamed1107() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed55(core.List<core.String> o) {
+checkUnnamed1107(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2589,7 +2624,7 @@
   if (buildCounterRoomParticipant < 3) {
     o.autoMatched = true;
     o.autoMatchedPlayer = buildAnonymousPlayer();
-    o.capabilities = buildUnnamed55();
+    o.capabilities = buildUnnamed1107();
     o.clientAddress = buildRoomClientAddress();
     o.connected = true;
     o.id = "foo";
@@ -2607,7 +2642,7 @@
   if (buildCounterRoomParticipant < 3) {
     unittest.expect(o.autoMatched, unittest.isTrue);
     checkAnonymousPlayer(o.autoMatchedPlayer);
-    checkUnnamed55(o.capabilities);
+    checkUnnamed1107(o.capabilities);
     checkRoomClientAddress(o.clientAddress);
     unittest.expect(o.connected, unittest.isTrue);
     unittest.expect(o.id, unittest.equals('foo'));
@@ -2619,14 +2654,14 @@
   buildCounterRoomParticipant--;
 }
 
-buildUnnamed56() {
+buildUnnamed1108() {
   var o = new core.List<api.RoomParticipant>();
   o.add(buildRoomParticipant());
   o.add(buildRoomParticipant());
   return o;
 }
 
-checkUnnamed56(core.List<api.RoomParticipant> o) {
+checkUnnamed1108(core.List<api.RoomParticipant> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRoomParticipant(o[0]);
   checkRoomParticipant(o[1]);
@@ -2639,7 +2674,7 @@
   if (buildCounterRoomStatus < 3) {
     o.autoMatchingStatus = buildRoomAutoMatchStatus();
     o.kind = "foo";
-    o.participants = buildUnnamed56();
+    o.participants = buildUnnamed1108();
     o.roomId = "foo";
     o.status = "foo";
     o.statusVersion = 42;
@@ -2653,7 +2688,7 @@
   if (buildCounterRoomStatus < 3) {
     checkRoomAutoMatchStatus(o.autoMatchingStatus);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed56(o.participants);
+    checkUnnamed1108(o.participants);
     unittest.expect(o.roomId, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.statusVersion, unittest.equals(42));
@@ -2754,14 +2789,14 @@
   buildCounterSnapshotImage--;
 }
 
-buildUnnamed57() {
+buildUnnamed1109() {
   var o = new core.List<api.Snapshot>();
   o.add(buildSnapshot());
   o.add(buildSnapshot());
   return o;
 }
 
-checkUnnamed57(core.List<api.Snapshot> o) {
+checkUnnamed1109(core.List<api.Snapshot> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSnapshot(o[0]);
   checkSnapshot(o[1]);
@@ -2772,7 +2807,7 @@
   var o = new api.SnapshotListResponse();
   buildCounterSnapshotListResponse++;
   if (buildCounterSnapshotListResponse < 3) {
-    o.items = buildUnnamed57();
+    o.items = buildUnnamed1109();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -2783,7 +2818,7 @@
 checkSnapshotListResponse(api.SnapshotListResponse o) {
   buildCounterSnapshotListResponse++;
   if (buildCounterSnapshotListResponse < 3) {
-    checkUnnamed57(o.items);
+    checkUnnamed1109(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -2815,27 +2850,27 @@
   buildCounterTurnBasedAutoMatchingCriteria--;
 }
 
-buildUnnamed58() {
+buildUnnamed1110() {
   var o = new core.List<api.TurnBasedMatchParticipant>();
   o.add(buildTurnBasedMatchParticipant());
   o.add(buildTurnBasedMatchParticipant());
   return o;
 }
 
-checkUnnamed58(core.List<api.TurnBasedMatchParticipant> o) {
+checkUnnamed1110(core.List<api.TurnBasedMatchParticipant> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTurnBasedMatchParticipant(o[0]);
   checkTurnBasedMatchParticipant(o[1]);
 }
 
-buildUnnamed59() {
+buildUnnamed1111() {
   var o = new core.List<api.ParticipantResult>();
   o.add(buildParticipantResult());
   o.add(buildParticipantResult());
   return o;
 }
 
-checkUnnamed59(core.List<api.ParticipantResult> o) {
+checkUnnamed1111(core.List<api.ParticipantResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParticipantResult(o[0]);
   checkParticipantResult(o[1]);
@@ -2857,11 +2892,11 @@
     o.matchId = "foo";
     o.matchNumber = 42;
     o.matchVersion = 42;
-    o.participants = buildUnnamed58();
+    o.participants = buildUnnamed1110();
     o.pendingParticipantId = "foo";
     o.previousMatchData = buildTurnBasedMatchData();
     o.rematchId = "foo";
-    o.results = buildUnnamed59();
+    o.results = buildUnnamed1111();
     o.status = "foo";
     o.userMatchStatus = "foo";
     o.variant = 42;
@@ -2885,11 +2920,11 @@
     unittest.expect(o.matchId, unittest.equals('foo'));
     unittest.expect(o.matchNumber, unittest.equals(42));
     unittest.expect(o.matchVersion, unittest.equals(42));
-    checkUnnamed58(o.participants);
+    checkUnnamed1110(o.participants);
     unittest.expect(o.pendingParticipantId, unittest.equals('foo'));
     checkTurnBasedMatchData(o.previousMatchData);
     unittest.expect(o.rematchId, unittest.equals('foo'));
-    checkUnnamed59(o.results);
+    checkUnnamed1111(o.results);
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.userMatchStatus, unittest.equals('foo'));
     unittest.expect(o.variant, unittest.equals(42));
@@ -2898,14 +2933,14 @@
   buildCounterTurnBasedMatch--;
 }
 
-buildUnnamed60() {
+buildUnnamed1112() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed60(core.List<core.String> o) {
+checkUnnamed1112(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2917,7 +2952,7 @@
   buildCounterTurnBasedMatchCreateRequest++;
   if (buildCounterTurnBasedMatchCreateRequest < 3) {
     o.autoMatchingCriteria = buildTurnBasedAutoMatchingCriteria();
-    o.invitedPlayerIds = buildUnnamed60();
+    o.invitedPlayerIds = buildUnnamed1112();
     o.kind = "foo";
     o.requestId = "foo";
     o.variant = 42;
@@ -2930,7 +2965,7 @@
   buildCounterTurnBasedMatchCreateRequest++;
   if (buildCounterTurnBasedMatchCreateRequest < 3) {
     checkTurnBasedAutoMatchingCriteria(o.autoMatchingCriteria);
-    checkUnnamed60(o.invitedPlayerIds);
+    checkUnnamed1112(o.invitedPlayerIds);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.requestId, unittest.equals('foo'));
     unittest.expect(o.variant, unittest.equals(42));
@@ -2982,14 +3017,14 @@
   buildCounterTurnBasedMatchDataRequest--;
 }
 
-buildUnnamed61() {
+buildUnnamed1113() {
   var o = new core.List<api.TurnBasedMatch>();
   o.add(buildTurnBasedMatch());
   o.add(buildTurnBasedMatch());
   return o;
 }
 
-checkUnnamed61(core.List<api.TurnBasedMatch> o) {
+checkUnnamed1113(core.List<api.TurnBasedMatch> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTurnBasedMatch(o[0]);
   checkTurnBasedMatch(o[1]);
@@ -3000,7 +3035,7 @@
   var o = new api.TurnBasedMatchList();
   buildCounterTurnBasedMatchList++;
   if (buildCounterTurnBasedMatchList < 3) {
-    o.items = buildUnnamed61();
+    o.items = buildUnnamed1113();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -3011,7 +3046,7 @@
 checkTurnBasedMatchList(api.TurnBasedMatchList o) {
   buildCounterTurnBasedMatchList++;
   if (buildCounterTurnBasedMatchList < 3) {
-    checkUnnamed61(o.items);
+    checkUnnamed1113(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -3093,14 +3128,14 @@
   buildCounterTurnBasedMatchRematch--;
 }
 
-buildUnnamed62() {
+buildUnnamed1114() {
   var o = new core.List<api.ParticipantResult>();
   o.add(buildParticipantResult());
   o.add(buildParticipantResult());
   return o;
 }
 
-checkUnnamed62(core.List<api.ParticipantResult> o) {
+checkUnnamed1114(core.List<api.ParticipantResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParticipantResult(o[0]);
   checkParticipantResult(o[1]);
@@ -3114,7 +3149,7 @@
     o.data = buildTurnBasedMatchDataRequest();
     o.kind = "foo";
     o.matchVersion = 42;
-    o.results = buildUnnamed62();
+    o.results = buildUnnamed1114();
   }
   buildCounterTurnBasedMatchResults--;
   return o;
@@ -3126,19 +3161,19 @@
     checkTurnBasedMatchDataRequest(o.data);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.matchVersion, unittest.equals(42));
-    checkUnnamed62(o.results);
+    checkUnnamed1114(o.results);
   }
   buildCounterTurnBasedMatchResults--;
 }
 
-buildUnnamed63() {
+buildUnnamed1115() {
   var o = new core.List<api.TurnBasedMatch>();
   o.add(buildTurnBasedMatch());
   o.add(buildTurnBasedMatch());
   return o;
 }
 
-checkUnnamed63(core.List<api.TurnBasedMatch> o) {
+checkUnnamed1115(core.List<api.TurnBasedMatch> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTurnBasedMatch(o[0]);
   checkTurnBasedMatch(o[1]);
@@ -3149,7 +3184,7 @@
   var o = new api.TurnBasedMatchSync();
   buildCounterTurnBasedMatchSync++;
   if (buildCounterTurnBasedMatchSync < 3) {
-    o.items = buildUnnamed63();
+    o.items = buildUnnamed1115();
     o.kind = "foo";
     o.moreAvailable = true;
     o.nextPageToken = "foo";
@@ -3161,7 +3196,7 @@
 checkTurnBasedMatchSync(api.TurnBasedMatchSync o) {
   buildCounterTurnBasedMatchSync++;
   if (buildCounterTurnBasedMatchSync < 3) {
-    checkUnnamed63(o.items);
+    checkUnnamed1115(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.moreAvailable, unittest.isTrue);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -3169,14 +3204,14 @@
   buildCounterTurnBasedMatchSync--;
 }
 
-buildUnnamed64() {
+buildUnnamed1116() {
   var o = new core.List<api.ParticipantResult>();
   o.add(buildParticipantResult());
   o.add(buildParticipantResult());
   return o;
 }
 
-checkUnnamed64(core.List<api.ParticipantResult> o) {
+checkUnnamed1116(core.List<api.ParticipantResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParticipantResult(o[0]);
   checkParticipantResult(o[1]);
@@ -3191,7 +3226,7 @@
     o.kind = "foo";
     o.matchVersion = 42;
     o.pendingParticipantId = "foo";
-    o.results = buildUnnamed64();
+    o.results = buildUnnamed1116();
   }
   buildCounterTurnBasedMatchTurn--;
   return o;
@@ -3204,7 +3239,7 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.matchVersion, unittest.equals(42));
     unittest.expect(o.pendingParticipantId, unittest.equals('foo'));
-    checkUnnamed64(o.results);
+    checkUnnamed1116(o.results);
   }
   buildCounterTurnBasedMatchTurn--;
 }
@@ -4096,7 +4131,7 @@
   unittest.group("resource-AchievementDefinitionsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AchievementDefinitionsResourceApi res = new api.GamesApi(mock).achievementDefinitions;
       var arg_language = "foo";
       var arg_maxResults = 42;
@@ -4138,7 +4173,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAchievementDefinitionsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.AchievementDefinitionsListResponse response) {
         checkAchievementDefinitionsListResponse(response);
@@ -4151,7 +4186,7 @@
   unittest.group("resource-AchievementsResourceApi", () {
     unittest.test("method--increment", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AchievementsResourceApi res = new api.GamesApi(mock).achievements;
       var arg_achievementId = "foo";
       var arg_stepsToIncrement = 42;
@@ -4199,7 +4234,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAchievementIncrementResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.increment(arg_achievementId, arg_stepsToIncrement, requestId: arg_requestId).then(unittest.expectAsync(((api.AchievementIncrementResponse response) {
         checkAchievementIncrementResponse(response);
@@ -4208,7 +4243,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AchievementsResourceApi res = new api.GamesApi(mock).achievements;
       var arg_playerId = "foo";
       var arg_language = "foo";
@@ -4260,7 +4295,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlayerAchievementListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_playerId, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken, state: arg_state).then(unittest.expectAsync(((api.PlayerAchievementListResponse response) {
         checkPlayerAchievementListResponse(response);
@@ -4269,7 +4304,7 @@
 
     unittest.test("method--reveal", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AchievementsResourceApi res = new api.GamesApi(mock).achievements;
       var arg_achievementId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -4313,7 +4348,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAchievementRevealResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.reveal(arg_achievementId).then(unittest.expectAsync(((api.AchievementRevealResponse response) {
         checkAchievementRevealResponse(response);
@@ -4322,7 +4357,7 @@
 
     unittest.test("method--setStepsAtLeast", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AchievementsResourceApi res = new api.GamesApi(mock).achievements;
       var arg_achievementId = "foo";
       var arg_steps = 42;
@@ -4368,7 +4403,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAchievementSetStepsAtLeastResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.setStepsAtLeast(arg_achievementId, arg_steps).then(unittest.expectAsync(((api.AchievementSetStepsAtLeastResponse response) {
         checkAchievementSetStepsAtLeastResponse(response);
@@ -4377,7 +4412,7 @@
 
     unittest.test("method--unlock", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AchievementsResourceApi res = new api.GamesApi(mock).achievements;
       var arg_achievementId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -4421,7 +4456,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAchievementUnlockResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.unlock(arg_achievementId).then(unittest.expectAsync(((api.AchievementUnlockResponse response) {
         checkAchievementUnlockResponse(response);
@@ -4430,7 +4465,7 @@
 
     unittest.test("method--updateMultiple", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AchievementsResourceApi res = new api.GamesApi(mock).achievements;
       var arg_request = buildAchievementUpdateMultipleRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -4470,7 +4505,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAchievementUpdateMultipleResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.updateMultiple(arg_request).then(unittest.expectAsync(((api.AchievementUpdateMultipleResponse response) {
         checkAchievementUpdateMultipleResponse(response);
@@ -4483,7 +4518,7 @@
   unittest.group("resource-ApplicationsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ApplicationsResourceApi res = new api.GamesApi(mock).applications;
       var arg_applicationId = "foo";
       var arg_language = "foo";
@@ -4527,7 +4562,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildApplication());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_applicationId, language: arg_language, platformType: arg_platformType).then(unittest.expectAsync(((api.Application response) {
         checkApplication(response);
@@ -4536,7 +4571,7 @@
 
     unittest.test("method--played", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ApplicationsResourceApi res = new api.GamesApi(mock).applications;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -4572,7 +4607,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.played().then(unittest.expectAsync((_) {}));
     });
@@ -4583,7 +4618,7 @@
   unittest.group("resource-EventsResourceApi", () {
     unittest.test("method--listByPlayer", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EventsResourceApi res = new api.GamesApi(mock).events;
       var arg_language = "foo";
       var arg_maxResults = 42;
@@ -4625,7 +4660,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlayerEventListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.listByPlayer(language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.PlayerEventListResponse response) {
         checkPlayerEventListResponse(response);
@@ -4634,7 +4669,7 @@
 
     unittest.test("method--listDefinitions", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EventsResourceApi res = new api.GamesApi(mock).events;
       var arg_language = "foo";
       var arg_maxResults = 42;
@@ -4676,7 +4711,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEventDefinitionListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.listDefinitions(language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.EventDefinitionListResponse response) {
         checkEventDefinitionListResponse(response);
@@ -4685,7 +4720,7 @@
 
     unittest.test("method--record", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EventsResourceApi res = new api.GamesApi(mock).events;
       var arg_request = buildEventRecordRequest();
       var arg_language = "foo";
@@ -4727,7 +4762,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildEventUpdateResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.record(arg_request, language: arg_language).then(unittest.expectAsync(((api.EventUpdateResponse response) {
         checkEventUpdateResponse(response);
@@ -4740,7 +4775,7 @@
   unittest.group("resource-LeaderboardsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LeaderboardsResourceApi res = new api.GamesApi(mock).leaderboards;
       var arg_leaderboardId = "foo";
       var arg_language = "foo";
@@ -4782,7 +4817,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLeaderboard());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_leaderboardId, language: arg_language).then(unittest.expectAsync(((api.Leaderboard response) {
         checkLeaderboard(response);
@@ -4791,7 +4826,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LeaderboardsResourceApi res = new api.GamesApi(mock).leaderboards;
       var arg_language = "foo";
       var arg_maxResults = 42;
@@ -4833,7 +4868,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLeaderboardListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.LeaderboardListResponse response) {
         checkLeaderboardListResponse(response);
@@ -4846,7 +4881,7 @@
   unittest.group("resource-MetagameResourceApi", () {
     unittest.test("method--getMetagameConfig", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MetagameResourceApi res = new api.GamesApi(mock).metagame;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -4882,7 +4917,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMetagameConfig());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.getMetagameConfig().then(unittest.expectAsync(((api.MetagameConfig response) {
         checkMetagameConfig(response);
@@ -4891,7 +4926,7 @@
 
     unittest.test("method--listCategoriesByPlayer", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MetagameResourceApi res = new api.GamesApi(mock).metagame;
       var arg_playerId = "foo";
       var arg_collection = "foo";
@@ -4945,7 +4980,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCategoryListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.listCategoriesByPlayer(arg_playerId, arg_collection, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.CategoryListResponse response) {
         checkCategoryListResponse(response);
@@ -4958,7 +4993,7 @@
   unittest.group("resource-PlayersResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlayersResourceApi res = new api.GamesApi(mock).players;
       var arg_playerId = "foo";
       var arg_language = "foo";
@@ -5000,7 +5035,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlayer());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_playerId, language: arg_language).then(unittest.expectAsync(((api.Player response) {
         checkPlayer(response);
@@ -5009,7 +5044,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlayersResourceApi res = new api.GamesApi(mock).players;
       var arg_collection = "foo";
       var arg_language = "foo";
@@ -5055,7 +5090,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlayerListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_collection, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.PlayerListResponse response) {
         checkPlayerListResponse(response);
@@ -5068,7 +5103,7 @@
   unittest.group("resource-PushtokensResourceApi", () {
     unittest.test("method--remove", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PushtokensResourceApi res = new api.GamesApi(mock).pushtokens;
       var arg_request = buildPushTokenId();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -5108,14 +5143,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.remove(arg_request).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PushtokensResourceApi res = new api.GamesApi(mock).pushtokens;
       var arg_request = buildPushToken();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -5155,7 +5190,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request).then(unittest.expectAsync((_) {}));
     });
@@ -5166,7 +5201,7 @@
   unittest.group("resource-QuestMilestonesResourceApi", () {
     unittest.test("method--claim", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.QuestMilestonesResourceApi res = new api.GamesApi(mock).questMilestones;
       var arg_questId = "foo";
       var arg_milestoneId = "foo";
@@ -5220,7 +5255,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.claim(arg_questId, arg_milestoneId, arg_requestId).then(unittest.expectAsync((_) {}));
     });
@@ -5231,7 +5266,7 @@
   unittest.group("resource-QuestsResourceApi", () {
     unittest.test("method--accept", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.QuestsResourceApi res = new api.GamesApi(mock).quests;
       var arg_questId = "foo";
       var arg_language = "foo";
@@ -5277,7 +5312,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildQuest());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.accept(arg_questId, language: arg_language).then(unittest.expectAsync(((api.Quest response) {
         checkQuest(response);
@@ -5286,7 +5321,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.QuestsResourceApi res = new api.GamesApi(mock).quests;
       var arg_playerId = "foo";
       var arg_language = "foo";
@@ -5336,7 +5371,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildQuestListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_playerId, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.QuestListResponse response) {
         checkQuestListResponse(response);
@@ -5349,7 +5384,7 @@
   unittest.group("resource-RevisionsResourceApi", () {
     unittest.test("method--check", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RevisionsResourceApi res = new api.GamesApi(mock).revisions;
       var arg_clientRevision = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -5387,7 +5422,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRevisionCheckResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.check(arg_clientRevision).then(unittest.expectAsync(((api.RevisionCheckResponse response) {
         checkRevisionCheckResponse(response);
@@ -5400,7 +5435,7 @@
   unittest.group("resource-RoomsResourceApi", () {
     unittest.test("method--create", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RoomsResourceApi res = new api.GamesApi(mock).rooms;
       var arg_request = buildRoomCreateRequest();
       var arg_language = "foo";
@@ -5442,7 +5477,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRoom());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.create(arg_request, language: arg_language).then(unittest.expectAsync(((api.Room response) {
         checkRoom(response);
@@ -5451,7 +5486,7 @@
 
     unittest.test("method--decline", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RoomsResourceApi res = new api.GamesApi(mock).rooms;
       var arg_roomId = "foo";
       var arg_language = "foo";
@@ -5497,7 +5532,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRoom());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.decline(arg_roomId, language: arg_language).then(unittest.expectAsync(((api.Room response) {
         checkRoom(response);
@@ -5506,7 +5541,7 @@
 
     unittest.test("method--dismiss", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RoomsResourceApi res = new api.GamesApi(mock).rooms;
       var arg_roomId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -5550,14 +5585,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.dismiss(arg_roomId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RoomsResourceApi res = new api.GamesApi(mock).rooms;
       var arg_roomId = "foo";
       var arg_language = "foo";
@@ -5599,7 +5634,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRoom());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_roomId, language: arg_language).then(unittest.expectAsync(((api.Room response) {
         checkRoom(response);
@@ -5608,7 +5643,7 @@
 
     unittest.test("method--join", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RoomsResourceApi res = new api.GamesApi(mock).rooms;
       var arg_request = buildRoomJoinRequest();
       var arg_roomId = "foo";
@@ -5658,7 +5693,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRoom());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.join(arg_request, arg_roomId, language: arg_language).then(unittest.expectAsync(((api.Room response) {
         checkRoom(response);
@@ -5667,7 +5702,7 @@
 
     unittest.test("method--leave", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RoomsResourceApi res = new api.GamesApi(mock).rooms;
       var arg_request = buildRoomLeaveRequest();
       var arg_roomId = "foo";
@@ -5717,7 +5752,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRoom());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.leave(arg_request, arg_roomId, language: arg_language).then(unittest.expectAsync(((api.Room response) {
         checkRoom(response);
@@ -5726,7 +5761,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RoomsResourceApi res = new api.GamesApi(mock).rooms;
       var arg_language = "foo";
       var arg_maxResults = 42;
@@ -5768,7 +5803,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRoomList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.RoomList response) {
         checkRoomList(response);
@@ -5777,7 +5812,7 @@
 
     unittest.test("method--reportStatus", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RoomsResourceApi res = new api.GamesApi(mock).rooms;
       var arg_request = buildRoomP2PStatuses();
       var arg_roomId = "foo";
@@ -5827,7 +5862,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRoomStatus());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.reportStatus(arg_request, arg_roomId, language: arg_language).then(unittest.expectAsync(((api.RoomStatus response) {
         checkRoomStatus(response);
@@ -5840,7 +5875,7 @@
   unittest.group("resource-ScoresResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ScoresResourceApi res = new api.GamesApi(mock).scores;
       var arg_playerId = "foo";
       var arg_leaderboardId = "foo";
@@ -5904,7 +5939,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlayerLeaderboardScoreListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_playerId, arg_leaderboardId, arg_timeSpan, includeRankType: arg_includeRankType, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.PlayerLeaderboardScoreListResponse response) {
         checkPlayerLeaderboardScoreListResponse(response);
@@ -5913,7 +5948,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ScoresResourceApi res = new api.GamesApi(mock).scores;
       var arg_leaderboardId = "foo";
       var arg_collection = "foo";
@@ -5969,7 +6004,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLeaderboardScores());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_leaderboardId, arg_collection, arg_timeSpan, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.LeaderboardScores response) {
         checkLeaderboardScores(response);
@@ -5978,7 +6013,7 @@
 
     unittest.test("method--listWindow", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ScoresResourceApi res = new api.GamesApi(mock).scores;
       var arg_leaderboardId = "foo";
       var arg_collection = "foo";
@@ -6038,7 +6073,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLeaderboardScores());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.listWindow(arg_leaderboardId, arg_collection, arg_timeSpan, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken, resultsAbove: arg_resultsAbove, returnTopIfAbsent: arg_returnTopIfAbsent).then(unittest.expectAsync(((api.LeaderboardScores response) {
         checkLeaderboardScores(response);
@@ -6047,7 +6082,7 @@
 
     unittest.test("method--submit", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ScoresResourceApi res = new api.GamesApi(mock).scores;
       var arg_leaderboardId = "foo";
       var arg_score = "foo";
@@ -6097,7 +6132,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlayerScoreResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.submit(arg_leaderboardId, arg_score, language: arg_language, scoreTag: arg_scoreTag).then(unittest.expectAsync(((api.PlayerScoreResponse response) {
         checkPlayerScoreResponse(response);
@@ -6106,7 +6141,7 @@
 
     unittest.test("method--submitMultiple", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ScoresResourceApi res = new api.GamesApi(mock).scores;
       var arg_request = buildPlayerScoreSubmissionList();
       var arg_language = "foo";
@@ -6148,7 +6183,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlayerScoreListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.submitMultiple(arg_request, language: arg_language).then(unittest.expectAsync(((api.PlayerScoreListResponse response) {
         checkPlayerScoreListResponse(response);
@@ -6161,7 +6196,7 @@
   unittest.group("resource-SnapshotsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SnapshotsResourceApi res = new api.GamesApi(mock).snapshots;
       var arg_snapshotId = "foo";
       var arg_language = "foo";
@@ -6203,7 +6238,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSnapshot());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_snapshotId, language: arg_language).then(unittest.expectAsync(((api.Snapshot response) {
         checkSnapshot(response);
@@ -6212,7 +6247,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SnapshotsResourceApi res = new api.GamesApi(mock).snapshots;
       var arg_playerId = "foo";
       var arg_language = "foo";
@@ -6262,7 +6297,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSnapshotListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_playerId, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.SnapshotListResponse response) {
         checkSnapshotListResponse(response);
@@ -6275,7 +6310,7 @@
   unittest.group("resource-TurnBasedMatchesResourceApi", () {
     unittest.test("method--cancel", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_matchId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -6319,14 +6354,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.cancel(arg_matchId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--create", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_request = buildTurnBasedMatchCreateRequest();
       var arg_language = "foo";
@@ -6368,7 +6403,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTurnBasedMatch());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.create(arg_request, language: arg_language).then(unittest.expectAsync(((api.TurnBasedMatch response) {
         checkTurnBasedMatch(response);
@@ -6377,7 +6412,7 @@
 
     unittest.test("method--decline", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_matchId = "foo";
       var arg_language = "foo";
@@ -6423,7 +6458,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTurnBasedMatch());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.decline(arg_matchId, language: arg_language).then(unittest.expectAsync(((api.TurnBasedMatch response) {
         checkTurnBasedMatch(response);
@@ -6432,7 +6467,7 @@
 
     unittest.test("method--dismiss", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_matchId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -6476,14 +6511,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.dismiss(arg_matchId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--finish", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_request = buildTurnBasedMatchResults();
       var arg_matchId = "foo";
@@ -6533,7 +6568,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTurnBasedMatch());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.finish(arg_request, arg_matchId, language: arg_language).then(unittest.expectAsync(((api.TurnBasedMatch response) {
         checkTurnBasedMatch(response);
@@ -6542,7 +6577,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_matchId = "foo";
       var arg_includeMatchData = true;
@@ -6586,7 +6621,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTurnBasedMatch());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_matchId, includeMatchData: arg_includeMatchData, language: arg_language).then(unittest.expectAsync(((api.TurnBasedMatch response) {
         checkTurnBasedMatch(response);
@@ -6595,7 +6630,7 @@
 
     unittest.test("method--join", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_matchId = "foo";
       var arg_language = "foo";
@@ -6641,7 +6676,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTurnBasedMatch());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.join(arg_matchId, language: arg_language).then(unittest.expectAsync(((api.TurnBasedMatch response) {
         checkTurnBasedMatch(response);
@@ -6650,7 +6685,7 @@
 
     unittest.test("method--leave", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_matchId = "foo";
       var arg_language = "foo";
@@ -6696,7 +6731,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTurnBasedMatch());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.leave(arg_matchId, language: arg_language).then(unittest.expectAsync(((api.TurnBasedMatch response) {
         checkTurnBasedMatch(response);
@@ -6705,7 +6740,7 @@
 
     unittest.test("method--leaveTurn", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_matchId = "foo";
       var arg_matchVersion = 42;
@@ -6755,7 +6790,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTurnBasedMatch());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.leaveTurn(arg_matchId, arg_matchVersion, language: arg_language, pendingParticipantId: arg_pendingParticipantId).then(unittest.expectAsync(((api.TurnBasedMatch response) {
         checkTurnBasedMatch(response);
@@ -6764,7 +6799,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_includeMatchData = true;
       var arg_language = "foo";
@@ -6810,7 +6845,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTurnBasedMatchList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(includeMatchData: arg_includeMatchData, language: arg_language, maxCompletedMatches: arg_maxCompletedMatches, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.TurnBasedMatchList response) {
         checkTurnBasedMatchList(response);
@@ -6819,7 +6854,7 @@
 
     unittest.test("method--rematch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_matchId = "foo";
       var arg_language = "foo";
@@ -6867,7 +6902,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTurnBasedMatchRematch());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.rematch(arg_matchId, language: arg_language, requestId: arg_requestId).then(unittest.expectAsync(((api.TurnBasedMatchRematch response) {
         checkTurnBasedMatchRematch(response);
@@ -6876,7 +6911,7 @@
 
     unittest.test("method--sync", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_includeMatchData = true;
       var arg_language = "foo";
@@ -6922,7 +6957,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTurnBasedMatchSync());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.sync(includeMatchData: arg_includeMatchData, language: arg_language, maxCompletedMatches: arg_maxCompletedMatches, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.TurnBasedMatchSync response) {
         checkTurnBasedMatchSync(response);
@@ -6931,7 +6966,7 @@
 
     unittest.test("method--takeTurn", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesApi(mock).turnBasedMatches;
       var arg_request = buildTurnBasedMatchTurn();
       var arg_matchId = "foo";
@@ -6981,7 +7016,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTurnBasedMatch());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.takeTurn(arg_request, arg_matchId, language: arg_language).then(unittest.expectAsync(((api.TurnBasedMatch response) {
         checkTurnBasedMatch(response);
diff --git a/generated/googleapis/test/gamesconfiguration/v1configuration_test.dart b/generated/googleapis/test/gamesconfiguration/v1configuration_test.dart
index 03e4a2e..a831283 100644
--- a/generated/googleapis/test/gamesconfiguration/v1configuration_test.dart
+++ b/generated/googleapis/test/gamesconfiguration/v1configuration_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/gamesconfiguration/v1configuration.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterAchievementConfiguration = 0;
 buildAchievementConfiguration() {
@@ -78,14 +113,14 @@
   buildCounterAchievementConfigurationDetail--;
 }
 
-buildUnnamed733() {
+buildUnnamed1117() {
   var o = new core.List<api.AchievementConfiguration>();
   o.add(buildAchievementConfiguration());
   o.add(buildAchievementConfiguration());
   return o;
 }
 
-checkUnnamed733(core.List<api.AchievementConfiguration> o) {
+checkUnnamed1117(core.List<api.AchievementConfiguration> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAchievementConfiguration(o[0]);
   checkAchievementConfiguration(o[1]);
@@ -96,7 +131,7 @@
   var o = new api.AchievementConfigurationListResponse();
   buildCounterAchievementConfigurationListResponse++;
   if (buildCounterAchievementConfigurationListResponse < 3) {
-    o.items = buildUnnamed733();
+    o.items = buildUnnamed1117();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -107,7 +142,7 @@
 checkAchievementConfigurationListResponse(api.AchievementConfigurationListResponse o) {
   buildCounterAchievementConfigurationListResponse++;
   if (buildCounterAchievementConfigurationListResponse < 3) {
-    checkUnnamed733(o.items);
+    checkUnnamed1117(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -253,14 +288,14 @@
   buildCounterLeaderboardConfigurationDetail--;
 }
 
-buildUnnamed734() {
+buildUnnamed1118() {
   var o = new core.List<api.LeaderboardConfiguration>();
   o.add(buildLeaderboardConfiguration());
   o.add(buildLeaderboardConfiguration());
   return o;
 }
 
-checkUnnamed734(core.List<api.LeaderboardConfiguration> o) {
+checkUnnamed1118(core.List<api.LeaderboardConfiguration> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLeaderboardConfiguration(o[0]);
   checkLeaderboardConfiguration(o[1]);
@@ -271,7 +306,7 @@
   var o = new api.LeaderboardConfigurationListResponse();
   buildCounterLeaderboardConfigurationListResponse++;
   if (buildCounterLeaderboardConfigurationListResponse < 3) {
-    o.items = buildUnnamed734();
+    o.items = buildUnnamed1118();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -282,7 +317,7 @@
 checkLeaderboardConfigurationListResponse(api.LeaderboardConfigurationListResponse o) {
   buildCounterLeaderboardConfigurationListResponse++;
   if (buildCounterLeaderboardConfigurationListResponse < 3) {
-    checkUnnamed734(o.items);
+    checkUnnamed1118(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -312,14 +347,14 @@
   buildCounterLocalizedString--;
 }
 
-buildUnnamed735() {
+buildUnnamed1119() {
   var o = new core.List<api.LocalizedString>();
   o.add(buildLocalizedString());
   o.add(buildLocalizedString());
   return o;
 }
 
-checkUnnamed735(core.List<api.LocalizedString> o) {
+checkUnnamed1119(core.List<api.LocalizedString> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLocalizedString(o[0]);
   checkLocalizedString(o[1]);
@@ -331,7 +366,7 @@
   buildCounterLocalizedStringBundle++;
   if (buildCounterLocalizedStringBundle < 3) {
     o.kind = "foo";
-    o.translations = buildUnnamed735();
+    o.translations = buildUnnamed1119();
   }
   buildCounterLocalizedStringBundle--;
   return o;
@@ -341,7 +376,7 @@
   buildCounterLocalizedStringBundle++;
   if (buildCounterLocalizedStringBundle < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed735(o.translations);
+    checkUnnamed1119(o.translations);
   }
   buildCounterLocalizedStringBundle--;
 }
@@ -450,7 +485,7 @@
   unittest.group("resource-AchievementConfigurationsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AchievementConfigurationsResourceApi res = new api.GamesConfigurationApi(mock).achievementConfigurations;
       var arg_achievementId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -490,14 +525,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_achievementId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AchievementConfigurationsResourceApi res = new api.GamesConfigurationApi(mock).achievementConfigurations;
       var arg_achievementId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -537,7 +572,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAchievementConfiguration());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_achievementId).then(unittest.expectAsync(((api.AchievementConfiguration response) {
         checkAchievementConfiguration(response);
@@ -546,7 +581,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AchievementConfigurationsResourceApi res = new api.GamesConfigurationApi(mock).achievementConfigurations;
       var arg_request = buildAchievementConfiguration();
       var arg_applicationId = "foo";
@@ -594,7 +629,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAchievementConfiguration());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_applicationId).then(unittest.expectAsync(((api.AchievementConfiguration response) {
         checkAchievementConfiguration(response);
@@ -603,7 +638,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AchievementConfigurationsResourceApi res = new api.GamesConfigurationApi(mock).achievementConfigurations;
       var arg_applicationId = "foo";
       var arg_maxResults = 42;
@@ -651,7 +686,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAchievementConfigurationListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_applicationId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.AchievementConfigurationListResponse response) {
         checkAchievementConfigurationListResponse(response);
@@ -660,7 +695,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AchievementConfigurationsResourceApi res = new api.GamesConfigurationApi(mock).achievementConfigurations;
       var arg_request = buildAchievementConfiguration();
       var arg_achievementId = "foo";
@@ -704,7 +739,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAchievementConfiguration());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_achievementId).then(unittest.expectAsync(((api.AchievementConfiguration response) {
         checkAchievementConfiguration(response);
@@ -713,7 +748,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AchievementConfigurationsResourceApi res = new api.GamesConfigurationApi(mock).achievementConfigurations;
       var arg_request = buildAchievementConfiguration();
       var arg_achievementId = "foo";
@@ -757,7 +792,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAchievementConfiguration());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_achievementId).then(unittest.expectAsync(((api.AchievementConfiguration response) {
         checkAchievementConfiguration(response);
@@ -772,7 +807,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ImageConfigurationsResourceApi res = new api.GamesConfigurationApi(mock).imageConfigurations;
       var arg_resourceId = "foo";
       var arg_imageType = "foo";
@@ -820,7 +855,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildImageConfiguration());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.upload(arg_resourceId, arg_imageType).then(unittest.expectAsync(((api.ImageConfiguration response) {
         checkImageConfiguration(response);
@@ -833,7 +868,7 @@
   unittest.group("resource-LeaderboardConfigurationsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LeaderboardConfigurationsResourceApi res = new api.GamesConfigurationApi(mock).leaderboardConfigurations;
       var arg_leaderboardId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -873,14 +908,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_leaderboardId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LeaderboardConfigurationsResourceApi res = new api.GamesConfigurationApi(mock).leaderboardConfigurations;
       var arg_leaderboardId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -920,7 +955,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLeaderboardConfiguration());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_leaderboardId).then(unittest.expectAsync(((api.LeaderboardConfiguration response) {
         checkLeaderboardConfiguration(response);
@@ -929,7 +964,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LeaderboardConfigurationsResourceApi res = new api.GamesConfigurationApi(mock).leaderboardConfigurations;
       var arg_request = buildLeaderboardConfiguration();
       var arg_applicationId = "foo";
@@ -977,7 +1012,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLeaderboardConfiguration());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_applicationId).then(unittest.expectAsync(((api.LeaderboardConfiguration response) {
         checkLeaderboardConfiguration(response);
@@ -986,7 +1021,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LeaderboardConfigurationsResourceApi res = new api.GamesConfigurationApi(mock).leaderboardConfigurations;
       var arg_applicationId = "foo";
       var arg_maxResults = 42;
@@ -1034,7 +1069,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLeaderboardConfigurationListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_applicationId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.LeaderboardConfigurationListResponse response) {
         checkLeaderboardConfigurationListResponse(response);
@@ -1043,7 +1078,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LeaderboardConfigurationsResourceApi res = new api.GamesConfigurationApi(mock).leaderboardConfigurations;
       var arg_request = buildLeaderboardConfiguration();
       var arg_leaderboardId = "foo";
@@ -1087,7 +1122,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLeaderboardConfiguration());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_leaderboardId).then(unittest.expectAsync(((api.LeaderboardConfiguration response) {
         checkLeaderboardConfiguration(response);
@@ -1096,7 +1131,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LeaderboardConfigurationsResourceApi res = new api.GamesConfigurationApi(mock).leaderboardConfigurations;
       var arg_request = buildLeaderboardConfiguration();
       var arg_leaderboardId = "foo";
@@ -1140,7 +1175,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLeaderboardConfiguration());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_leaderboardId).then(unittest.expectAsync(((api.LeaderboardConfiguration response) {
         checkLeaderboardConfiguration(response);
diff --git a/generated/googleapis/test/gamesmanagement/v1management_test.dart b/generated/googleapis/test/gamesmanagement/v1management_test.dart
index 58a6eaf..ce6ac59 100644
--- a/generated/googleapis/test/gamesmanagement/v1management_test.dart
+++ b/generated/googleapis/test/gamesmanagement/v1management_test.dart
@@ -8,22 +8,57 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/gamesmanagement/v1management.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
 
-buildUnnamed725() {
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+buildUnnamed1120() {
   var o = new core.List<api.AchievementResetResponse>();
   o.add(buildAchievementResetResponse());
   o.add(buildAchievementResetResponse());
   return o;
 }
 
-checkUnnamed725(core.List<api.AchievementResetResponse> o) {
+checkUnnamed1120(core.List<api.AchievementResetResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAchievementResetResponse(o[0]);
   checkAchievementResetResponse(o[1]);
@@ -35,7 +70,7 @@
   buildCounterAchievementResetAllResponse++;
   if (buildCounterAchievementResetAllResponse < 3) {
     o.kind = "foo";
-    o.results = buildUnnamed725();
+    o.results = buildUnnamed1120();
   }
   buildCounterAchievementResetAllResponse--;
   return o;
@@ -45,19 +80,19 @@
   buildCounterAchievementResetAllResponse++;
   if (buildCounterAchievementResetAllResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed725(o.results);
+    checkUnnamed1120(o.results);
   }
   buildCounterAchievementResetAllResponse--;
 }
 
-buildUnnamed726() {
+buildUnnamed1121() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed726(core.List<core.String> o) {
+checkUnnamed1121(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -68,7 +103,7 @@
   var o = new api.AchievementResetMultipleForAllRequest();
   buildCounterAchievementResetMultipleForAllRequest++;
   if (buildCounterAchievementResetMultipleForAllRequest < 3) {
-    o.achievementIds = buildUnnamed726();
+    o.achievementIds = buildUnnamed1121();
     o.kind = "foo";
   }
   buildCounterAchievementResetMultipleForAllRequest--;
@@ -78,7 +113,7 @@
 checkAchievementResetMultipleForAllRequest(api.AchievementResetMultipleForAllRequest o) {
   buildCounterAchievementResetMultipleForAllRequest++;
   if (buildCounterAchievementResetMultipleForAllRequest < 3) {
-    checkUnnamed726(o.achievementIds);
+    checkUnnamed1121(o.achievementIds);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAchievementResetMultipleForAllRequest--;
@@ -109,14 +144,14 @@
   buildCounterAchievementResetResponse--;
 }
 
-buildUnnamed727() {
+buildUnnamed1122() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed727(core.List<core.String> o) {
+checkUnnamed1122(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -127,7 +162,7 @@
   var o = new api.EventsResetMultipleForAllRequest();
   buildCounterEventsResetMultipleForAllRequest++;
   if (buildCounterEventsResetMultipleForAllRequest < 3) {
-    o.eventIds = buildUnnamed727();
+    o.eventIds = buildUnnamed1122();
     o.kind = "foo";
   }
   buildCounterEventsResetMultipleForAllRequest--;
@@ -137,7 +172,7 @@
 checkEventsResetMultipleForAllRequest(api.EventsResetMultipleForAllRequest o) {
   buildCounterEventsResetMultipleForAllRequest++;
   if (buildCounterEventsResetMultipleForAllRequest < 3) {
-    checkUnnamed727(o.eventIds);
+    checkUnnamed1122(o.eventIds);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterEventsResetMultipleForAllRequest--;
@@ -235,14 +270,14 @@
   buildCounterHiddenPlayer--;
 }
 
-buildUnnamed728() {
+buildUnnamed1123() {
   var o = new core.List<api.HiddenPlayer>();
   o.add(buildHiddenPlayer());
   o.add(buildHiddenPlayer());
   return o;
 }
 
-checkUnnamed728(core.List<api.HiddenPlayer> o) {
+checkUnnamed1123(core.List<api.HiddenPlayer> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHiddenPlayer(o[0]);
   checkHiddenPlayer(o[1]);
@@ -253,7 +288,7 @@
   var o = new api.HiddenPlayerList();
   buildCounterHiddenPlayerList++;
   if (buildCounterHiddenPlayerList < 3) {
-    o.items = buildUnnamed728();
+    o.items = buildUnnamed1123();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -264,7 +299,7 @@
 checkHiddenPlayerList(api.HiddenPlayerList o) {
   buildCounterHiddenPlayerList++;
   if (buildCounterHiddenPlayerList < 3) {
-    checkUnnamed728(o.items);
+    checkUnnamed1123(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -325,14 +360,14 @@
   buildCounterPlayer--;
 }
 
-buildUnnamed729() {
+buildUnnamed1124() {
   var o = new core.List<api.PlayerScoreResetResponse>();
   o.add(buildPlayerScoreResetResponse());
   o.add(buildPlayerScoreResetResponse());
   return o;
 }
 
-checkUnnamed729(core.List<api.PlayerScoreResetResponse> o) {
+checkUnnamed1124(core.List<api.PlayerScoreResetResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayerScoreResetResponse(o[0]);
   checkPlayerScoreResetResponse(o[1]);
@@ -344,7 +379,7 @@
   buildCounterPlayerScoreResetAllResponse++;
   if (buildCounterPlayerScoreResetAllResponse < 3) {
     o.kind = "foo";
-    o.results = buildUnnamed729();
+    o.results = buildUnnamed1124();
   }
   buildCounterPlayerScoreResetAllResponse--;
   return o;
@@ -354,19 +389,19 @@
   buildCounterPlayerScoreResetAllResponse++;
   if (buildCounterPlayerScoreResetAllResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed729(o.results);
+    checkUnnamed1124(o.results);
   }
   buildCounterPlayerScoreResetAllResponse--;
 }
 
-buildUnnamed730() {
+buildUnnamed1125() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed730(core.List<core.String> o) {
+checkUnnamed1125(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -379,7 +414,7 @@
   if (buildCounterPlayerScoreResetResponse < 3) {
     o.definitionId = "foo";
     o.kind = "foo";
-    o.resetScoreTimeSpans = buildUnnamed730();
+    o.resetScoreTimeSpans = buildUnnamed1125();
   }
   buildCounterPlayerScoreResetResponse--;
   return o;
@@ -390,19 +425,19 @@
   if (buildCounterPlayerScoreResetResponse < 3) {
     unittest.expect(o.definitionId, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed730(o.resetScoreTimeSpans);
+    checkUnnamed1125(o.resetScoreTimeSpans);
   }
   buildCounterPlayerScoreResetResponse--;
 }
 
-buildUnnamed731() {
+buildUnnamed1126() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed731(core.List<core.String> o) {
+checkUnnamed1126(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -414,7 +449,7 @@
   buildCounterQuestsResetMultipleForAllRequest++;
   if (buildCounterQuestsResetMultipleForAllRequest < 3) {
     o.kind = "foo";
-    o.questIds = buildUnnamed731();
+    o.questIds = buildUnnamed1126();
   }
   buildCounterQuestsResetMultipleForAllRequest--;
   return o;
@@ -424,19 +459,19 @@
   buildCounterQuestsResetMultipleForAllRequest++;
   if (buildCounterQuestsResetMultipleForAllRequest < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed731(o.questIds);
+    checkUnnamed1126(o.questIds);
   }
   buildCounterQuestsResetMultipleForAllRequest--;
 }
 
-buildUnnamed732() {
+buildUnnamed1127() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed732(core.List<core.String> o) {
+checkUnnamed1127(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -448,7 +483,7 @@
   buildCounterScoresResetMultipleForAllRequest++;
   if (buildCounterScoresResetMultipleForAllRequest < 3) {
     o.kind = "foo";
-    o.leaderboardIds = buildUnnamed732();
+    o.leaderboardIds = buildUnnamed1127();
   }
   buildCounterScoresResetMultipleForAllRequest--;
   return o;
@@ -458,7 +493,7 @@
   buildCounterScoresResetMultipleForAllRequest++;
   if (buildCounterScoresResetMultipleForAllRequest < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed732(o.leaderboardIds);
+    checkUnnamed1127(o.leaderboardIds);
   }
   buildCounterScoresResetMultipleForAllRequest--;
 }
@@ -603,7 +638,7 @@
   unittest.group("resource-AchievementsResourceApi", () {
     unittest.test("method--reset", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AchievementsResourceApi res = new api.GamesManagementApi(mock).achievements;
       var arg_achievementId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -647,7 +682,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAchievementResetResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.reset(arg_achievementId).then(unittest.expectAsync(((api.AchievementResetResponse response) {
         checkAchievementResetResponse(response);
@@ -656,7 +691,7 @@
 
     unittest.test("method--resetAll", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AchievementsResourceApi res = new api.GamesManagementApi(mock).achievements;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -692,7 +727,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAchievementResetAllResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.resetAll().then(unittest.expectAsync(((api.AchievementResetAllResponse response) {
         checkAchievementResetAllResponse(response);
@@ -701,7 +736,7 @@
 
     unittest.test("method--resetAllForAllPlayers", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AchievementsResourceApi res = new api.GamesManagementApi(mock).achievements;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -737,14 +772,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.resetAllForAllPlayers().then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--resetForAllPlayers", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AchievementsResourceApi res = new api.GamesManagementApi(mock).achievements;
       var arg_achievementId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -788,14 +823,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.resetForAllPlayers(arg_achievementId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--resetMultipleForAllPlayers", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AchievementsResourceApi res = new api.GamesManagementApi(mock).achievements;
       var arg_request = buildAchievementResetMultipleForAllRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -835,7 +870,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.resetMultipleForAllPlayers(arg_request).then(unittest.expectAsync((_) {}));
     });
@@ -846,7 +881,7 @@
   unittest.group("resource-ApplicationsResourceApi", () {
     unittest.test("method--listHidden", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ApplicationsResourceApi res = new api.GamesManagementApi(mock).applications;
       var arg_applicationId = "foo";
       var arg_maxResults = 42;
@@ -894,7 +929,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildHiddenPlayerList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.listHidden(arg_applicationId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.HiddenPlayerList response) {
         checkHiddenPlayerList(response);
@@ -907,7 +942,7 @@
   unittest.group("resource-EventsResourceApi", () {
     unittest.test("method--reset", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EventsResourceApi res = new api.GamesManagementApi(mock).events;
       var arg_eventId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -951,14 +986,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.reset(arg_eventId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--resetAll", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EventsResourceApi res = new api.GamesManagementApi(mock).events;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -994,14 +1029,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.resetAll().then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--resetAllForAllPlayers", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EventsResourceApi res = new api.GamesManagementApi(mock).events;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1037,14 +1072,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.resetAllForAllPlayers().then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--resetForAllPlayers", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EventsResourceApi res = new api.GamesManagementApi(mock).events;
       var arg_eventId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1088,14 +1123,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.resetForAllPlayers(arg_eventId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--resetMultipleForAllPlayers", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.EventsResourceApi res = new api.GamesManagementApi(mock).events;
       var arg_request = buildEventsResetMultipleForAllRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1135,7 +1170,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.resetMultipleForAllPlayers(arg_request).then(unittest.expectAsync((_) {}));
     });
@@ -1146,7 +1181,7 @@
   unittest.group("resource-PlayersResourceApi", () {
     unittest.test("method--hide", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlayersResourceApi res = new api.GamesManagementApi(mock).players;
       var arg_applicationId = "foo";
       var arg_playerId = "foo";
@@ -1194,14 +1229,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.hide(arg_applicationId, arg_playerId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--unhide", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlayersResourceApi res = new api.GamesManagementApi(mock).players;
       var arg_applicationId = "foo";
       var arg_playerId = "foo";
@@ -1249,7 +1284,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.unhide(arg_applicationId, arg_playerId).then(unittest.expectAsync((_) {}));
     });
@@ -1260,7 +1295,7 @@
   unittest.group("resource-QuestsResourceApi", () {
     unittest.test("method--reset", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.QuestsResourceApi res = new api.GamesManagementApi(mock).quests;
       var arg_questId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1304,14 +1339,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.reset(arg_questId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--resetAll", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.QuestsResourceApi res = new api.GamesManagementApi(mock).quests;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1347,14 +1382,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.resetAll().then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--resetAllForAllPlayers", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.QuestsResourceApi res = new api.GamesManagementApi(mock).quests;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1390,14 +1425,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.resetAllForAllPlayers().then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--resetForAllPlayers", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.QuestsResourceApi res = new api.GamesManagementApi(mock).quests;
       var arg_questId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1441,14 +1476,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.resetForAllPlayers(arg_questId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--resetMultipleForAllPlayers", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.QuestsResourceApi res = new api.GamesManagementApi(mock).quests;
       var arg_request = buildQuestsResetMultipleForAllRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1488,7 +1523,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.resetMultipleForAllPlayers(arg_request).then(unittest.expectAsync((_) {}));
     });
@@ -1499,7 +1534,7 @@
   unittest.group("resource-RoomsResourceApi", () {
     unittest.test("method--reset", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RoomsResourceApi res = new api.GamesManagementApi(mock).rooms;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1535,14 +1570,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.reset().then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--resetForAllPlayers", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RoomsResourceApi res = new api.GamesManagementApi(mock).rooms;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1578,7 +1613,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.resetForAllPlayers().then(unittest.expectAsync((_) {}));
     });
@@ -1589,7 +1624,7 @@
   unittest.group("resource-ScoresResourceApi", () {
     unittest.test("method--reset", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ScoresResourceApi res = new api.GamesManagementApi(mock).scores;
       var arg_leaderboardId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1633,7 +1668,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlayerScoreResetResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.reset(arg_leaderboardId).then(unittest.expectAsync(((api.PlayerScoreResetResponse response) {
         checkPlayerScoreResetResponse(response);
@@ -1642,7 +1677,7 @@
 
     unittest.test("method--resetAll", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ScoresResourceApi res = new api.GamesManagementApi(mock).scores;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1678,7 +1713,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlayerScoreResetAllResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.resetAll().then(unittest.expectAsync(((api.PlayerScoreResetAllResponse response) {
         checkPlayerScoreResetAllResponse(response);
@@ -1687,7 +1722,7 @@
 
     unittest.test("method--resetAllForAllPlayers", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ScoresResourceApi res = new api.GamesManagementApi(mock).scores;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1723,14 +1758,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.resetAllForAllPlayers().then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--resetForAllPlayers", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ScoresResourceApi res = new api.GamesManagementApi(mock).scores;
       var arg_leaderboardId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1774,14 +1809,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.resetForAllPlayers(arg_leaderboardId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--resetMultipleForAllPlayers", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ScoresResourceApi res = new api.GamesManagementApi(mock).scores;
       var arg_request = buildScoresResetMultipleForAllRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1821,7 +1856,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.resetMultipleForAllPlayers(arg_request).then(unittest.expectAsync((_) {}));
     });
@@ -1832,7 +1867,7 @@
   unittest.group("resource-TurnBasedMatchesResourceApi", () {
     unittest.test("method--reset", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesManagementApi(mock).turnBasedMatches;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1868,14 +1903,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.reset().then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--resetForAllPlayers", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TurnBasedMatchesResourceApi res = new api.GamesManagementApi(mock).turnBasedMatches;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1911,7 +1946,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.resetForAllPlayers().then(unittest.expectAsync((_) {}));
     });
diff --git a/generated/googleapis/test/gmail/v1_test.dart b/generated/googleapis/test/gmail/v1_test.dart
index 09681f6..8f7c0fd 100644
--- a/generated/googleapis/test/gmail/v1_test.dart
+++ b/generated/googleapis/test/gmail/v1_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/gmail/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterDraft = 0;
 buildDraft() {
@@ -37,66 +72,66 @@
   buildCounterDraft--;
 }
 
-buildUnnamed164() {
+buildUnnamed1128() {
   var o = new core.List<api.HistoryLabelAdded>();
   o.add(buildHistoryLabelAdded());
   o.add(buildHistoryLabelAdded());
   return o;
 }
 
-checkUnnamed164(core.List<api.HistoryLabelAdded> o) {
+checkUnnamed1128(core.List<api.HistoryLabelAdded> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHistoryLabelAdded(o[0]);
   checkHistoryLabelAdded(o[1]);
 }
 
-buildUnnamed165() {
+buildUnnamed1129() {
   var o = new core.List<api.HistoryLabelRemoved>();
   o.add(buildHistoryLabelRemoved());
   o.add(buildHistoryLabelRemoved());
   return o;
 }
 
-checkUnnamed165(core.List<api.HistoryLabelRemoved> o) {
+checkUnnamed1129(core.List<api.HistoryLabelRemoved> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHistoryLabelRemoved(o[0]);
   checkHistoryLabelRemoved(o[1]);
 }
 
-buildUnnamed166() {
+buildUnnamed1130() {
   var o = new core.List<api.Message>();
   o.add(buildMessage());
   o.add(buildMessage());
   return o;
 }
 
-checkUnnamed166(core.List<api.Message> o) {
+checkUnnamed1130(core.List<api.Message> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMessage(o[0]);
   checkMessage(o[1]);
 }
 
-buildUnnamed167() {
+buildUnnamed1131() {
   var o = new core.List<api.HistoryMessageAdded>();
   o.add(buildHistoryMessageAdded());
   o.add(buildHistoryMessageAdded());
   return o;
 }
 
-checkUnnamed167(core.List<api.HistoryMessageAdded> o) {
+checkUnnamed1131(core.List<api.HistoryMessageAdded> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHistoryMessageAdded(o[0]);
   checkHistoryMessageAdded(o[1]);
 }
 
-buildUnnamed168() {
+buildUnnamed1132() {
   var o = new core.List<api.HistoryMessageDeleted>();
   o.add(buildHistoryMessageDeleted());
   o.add(buildHistoryMessageDeleted());
   return o;
 }
 
-checkUnnamed168(core.List<api.HistoryMessageDeleted> o) {
+checkUnnamed1132(core.List<api.HistoryMessageDeleted> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHistoryMessageDeleted(o[0]);
   checkHistoryMessageDeleted(o[1]);
@@ -108,11 +143,11 @@
   buildCounterHistory++;
   if (buildCounterHistory < 3) {
     o.id = "foo";
-    o.labelsAdded = buildUnnamed164();
-    o.labelsRemoved = buildUnnamed165();
-    o.messages = buildUnnamed166();
-    o.messagesAdded = buildUnnamed167();
-    o.messagesDeleted = buildUnnamed168();
+    o.labelsAdded = buildUnnamed1128();
+    o.labelsRemoved = buildUnnamed1129();
+    o.messages = buildUnnamed1130();
+    o.messagesAdded = buildUnnamed1131();
+    o.messagesDeleted = buildUnnamed1132();
   }
   buildCounterHistory--;
   return o;
@@ -122,23 +157,23 @@
   buildCounterHistory++;
   if (buildCounterHistory < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed164(o.labelsAdded);
-    checkUnnamed165(o.labelsRemoved);
-    checkUnnamed166(o.messages);
-    checkUnnamed167(o.messagesAdded);
-    checkUnnamed168(o.messagesDeleted);
+    checkUnnamed1128(o.labelsAdded);
+    checkUnnamed1129(o.labelsRemoved);
+    checkUnnamed1130(o.messages);
+    checkUnnamed1131(o.messagesAdded);
+    checkUnnamed1132(o.messagesDeleted);
   }
   buildCounterHistory--;
 }
 
-buildUnnamed169() {
+buildUnnamed1133() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed169(core.List<core.String> o) {
+checkUnnamed1133(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -149,7 +184,7 @@
   var o = new api.HistoryLabelAdded();
   buildCounterHistoryLabelAdded++;
   if (buildCounterHistoryLabelAdded < 3) {
-    o.labelIds = buildUnnamed169();
+    o.labelIds = buildUnnamed1133();
     o.message = buildMessage();
   }
   buildCounterHistoryLabelAdded--;
@@ -159,20 +194,20 @@
 checkHistoryLabelAdded(api.HistoryLabelAdded o) {
   buildCounterHistoryLabelAdded++;
   if (buildCounterHistoryLabelAdded < 3) {
-    checkUnnamed169(o.labelIds);
+    checkUnnamed1133(o.labelIds);
     checkMessage(o.message);
   }
   buildCounterHistoryLabelAdded--;
 }
 
-buildUnnamed170() {
+buildUnnamed1134() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed170(core.List<core.String> o) {
+checkUnnamed1134(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -183,7 +218,7 @@
   var o = new api.HistoryLabelRemoved();
   buildCounterHistoryLabelRemoved++;
   if (buildCounterHistoryLabelRemoved < 3) {
-    o.labelIds = buildUnnamed170();
+    o.labelIds = buildUnnamed1134();
     o.message = buildMessage();
   }
   buildCounterHistoryLabelRemoved--;
@@ -193,7 +228,7 @@
 checkHistoryLabelRemoved(api.HistoryLabelRemoved o) {
   buildCounterHistoryLabelRemoved++;
   if (buildCounterHistoryLabelRemoved < 3) {
-    checkUnnamed170(o.labelIds);
+    checkUnnamed1134(o.labelIds);
     checkMessage(o.message);
   }
   buildCounterHistoryLabelRemoved--;
@@ -272,14 +307,14 @@
   buildCounterLabel--;
 }
 
-buildUnnamed171() {
+buildUnnamed1135() {
   var o = new core.List<api.Draft>();
   o.add(buildDraft());
   o.add(buildDraft());
   return o;
 }
 
-checkUnnamed171(core.List<api.Draft> o) {
+checkUnnamed1135(core.List<api.Draft> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDraft(o[0]);
   checkDraft(o[1]);
@@ -290,7 +325,7 @@
   var o = new api.ListDraftsResponse();
   buildCounterListDraftsResponse++;
   if (buildCounterListDraftsResponse < 3) {
-    o.drafts = buildUnnamed171();
+    o.drafts = buildUnnamed1135();
     o.nextPageToken = "foo";
     o.resultSizeEstimate = 42;
   }
@@ -301,21 +336,21 @@
 checkListDraftsResponse(api.ListDraftsResponse o) {
   buildCounterListDraftsResponse++;
   if (buildCounterListDraftsResponse < 3) {
-    checkUnnamed171(o.drafts);
+    checkUnnamed1135(o.drafts);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.resultSizeEstimate, unittest.equals(42));
   }
   buildCounterListDraftsResponse--;
 }
 
-buildUnnamed172() {
+buildUnnamed1136() {
   var o = new core.List<api.History>();
   o.add(buildHistory());
   o.add(buildHistory());
   return o;
 }
 
-checkUnnamed172(core.List<api.History> o) {
+checkUnnamed1136(core.List<api.History> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHistory(o[0]);
   checkHistory(o[1]);
@@ -326,7 +361,7 @@
   var o = new api.ListHistoryResponse();
   buildCounterListHistoryResponse++;
   if (buildCounterListHistoryResponse < 3) {
-    o.history = buildUnnamed172();
+    o.history = buildUnnamed1136();
     o.historyId = "foo";
     o.nextPageToken = "foo";
   }
@@ -337,21 +372,21 @@
 checkListHistoryResponse(api.ListHistoryResponse o) {
   buildCounterListHistoryResponse++;
   if (buildCounterListHistoryResponse < 3) {
-    checkUnnamed172(o.history);
+    checkUnnamed1136(o.history);
     unittest.expect(o.historyId, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListHistoryResponse--;
 }
 
-buildUnnamed173() {
+buildUnnamed1137() {
   var o = new core.List<api.Label>();
   o.add(buildLabel());
   o.add(buildLabel());
   return o;
 }
 
-checkUnnamed173(core.List<api.Label> o) {
+checkUnnamed1137(core.List<api.Label> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLabel(o[0]);
   checkLabel(o[1]);
@@ -362,7 +397,7 @@
   var o = new api.ListLabelsResponse();
   buildCounterListLabelsResponse++;
   if (buildCounterListLabelsResponse < 3) {
-    o.labels = buildUnnamed173();
+    o.labels = buildUnnamed1137();
   }
   buildCounterListLabelsResponse--;
   return o;
@@ -371,19 +406,19 @@
 checkListLabelsResponse(api.ListLabelsResponse o) {
   buildCounterListLabelsResponse++;
   if (buildCounterListLabelsResponse < 3) {
-    checkUnnamed173(o.labels);
+    checkUnnamed1137(o.labels);
   }
   buildCounterListLabelsResponse--;
 }
 
-buildUnnamed174() {
+buildUnnamed1138() {
   var o = new core.List<api.Message>();
   o.add(buildMessage());
   o.add(buildMessage());
   return o;
 }
 
-checkUnnamed174(core.List<api.Message> o) {
+checkUnnamed1138(core.List<api.Message> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMessage(o[0]);
   checkMessage(o[1]);
@@ -394,7 +429,7 @@
   var o = new api.ListMessagesResponse();
   buildCounterListMessagesResponse++;
   if (buildCounterListMessagesResponse < 3) {
-    o.messages = buildUnnamed174();
+    o.messages = buildUnnamed1138();
     o.nextPageToken = "foo";
     o.resultSizeEstimate = 42;
   }
@@ -405,21 +440,21 @@
 checkListMessagesResponse(api.ListMessagesResponse o) {
   buildCounterListMessagesResponse++;
   if (buildCounterListMessagesResponse < 3) {
-    checkUnnamed174(o.messages);
+    checkUnnamed1138(o.messages);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.resultSizeEstimate, unittest.equals(42));
   }
   buildCounterListMessagesResponse--;
 }
 
-buildUnnamed175() {
+buildUnnamed1139() {
   var o = new core.List<api.Thread>();
   o.add(buildThread());
   o.add(buildThread());
   return o;
 }
 
-checkUnnamed175(core.List<api.Thread> o) {
+checkUnnamed1139(core.List<api.Thread> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkThread(o[0]);
   checkThread(o[1]);
@@ -432,7 +467,7 @@
   if (buildCounterListThreadsResponse < 3) {
     o.nextPageToken = "foo";
     o.resultSizeEstimate = 42;
-    o.threads = buildUnnamed175();
+    o.threads = buildUnnamed1139();
   }
   buildCounterListThreadsResponse--;
   return o;
@@ -443,19 +478,19 @@
   if (buildCounterListThreadsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.resultSizeEstimate, unittest.equals(42));
-    checkUnnamed175(o.threads);
+    checkUnnamed1139(o.threads);
   }
   buildCounterListThreadsResponse--;
 }
 
-buildUnnamed176() {
+buildUnnamed1140() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed176(core.List<core.String> o) {
+checkUnnamed1140(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -468,7 +503,7 @@
   if (buildCounterMessage < 3) {
     o.historyId = "foo";
     o.id = "foo";
-    o.labelIds = buildUnnamed176();
+    o.labelIds = buildUnnamed1140();
     o.payload = buildMessagePart();
     o.raw = "foo";
     o.sizeEstimate = 42;
@@ -484,7 +519,7 @@
   if (buildCounterMessage < 3) {
     unittest.expect(o.historyId, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed176(o.labelIds);
+    checkUnnamed1140(o.labelIds);
     checkMessagePart(o.payload);
     unittest.expect(o.raw, unittest.equals('foo'));
     unittest.expect(o.sizeEstimate, unittest.equals(42));
@@ -494,27 +529,27 @@
   buildCounterMessage--;
 }
 
-buildUnnamed177() {
+buildUnnamed1141() {
   var o = new core.List<api.MessagePartHeader>();
   o.add(buildMessagePartHeader());
   o.add(buildMessagePartHeader());
   return o;
 }
 
-checkUnnamed177(core.List<api.MessagePartHeader> o) {
+checkUnnamed1141(core.List<api.MessagePartHeader> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMessagePartHeader(o[0]);
   checkMessagePartHeader(o[1]);
 }
 
-buildUnnamed178() {
+buildUnnamed1142() {
   var o = new core.List<api.MessagePart>();
   o.add(buildMessagePart());
   o.add(buildMessagePart());
   return o;
 }
 
-checkUnnamed178(core.List<api.MessagePart> o) {
+checkUnnamed1142(core.List<api.MessagePart> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMessagePart(o[0]);
   checkMessagePart(o[1]);
@@ -527,10 +562,10 @@
   if (buildCounterMessagePart < 3) {
     o.body = buildMessagePartBody();
     o.filename = "foo";
-    o.headers = buildUnnamed177();
+    o.headers = buildUnnamed1141();
     o.mimeType = "foo";
     o.partId = "foo";
-    o.parts = buildUnnamed178();
+    o.parts = buildUnnamed1142();
   }
   buildCounterMessagePart--;
   return o;
@@ -541,10 +576,10 @@
   if (buildCounterMessagePart < 3) {
     checkMessagePartBody(o.body);
     unittest.expect(o.filename, unittest.equals('foo'));
-    checkUnnamed177(o.headers);
+    checkUnnamed1141(o.headers);
     unittest.expect(o.mimeType, unittest.equals('foo'));
     unittest.expect(o.partId, unittest.equals('foo'));
-    checkUnnamed178(o.parts);
+    checkUnnamed1142(o.parts);
   }
   buildCounterMessagePart--;
 }
@@ -593,27 +628,27 @@
   buildCounterMessagePartHeader--;
 }
 
-buildUnnamed179() {
+buildUnnamed1143() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed179(core.List<core.String> o) {
+checkUnnamed1143(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed180() {
+buildUnnamed1144() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed180(core.List<core.String> o) {
+checkUnnamed1144(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -624,8 +659,8 @@
   var o = new api.ModifyMessageRequest();
   buildCounterModifyMessageRequest++;
   if (buildCounterModifyMessageRequest < 3) {
-    o.addLabelIds = buildUnnamed179();
-    o.removeLabelIds = buildUnnamed180();
+    o.addLabelIds = buildUnnamed1143();
+    o.removeLabelIds = buildUnnamed1144();
   }
   buildCounterModifyMessageRequest--;
   return o;
@@ -634,33 +669,33 @@
 checkModifyMessageRequest(api.ModifyMessageRequest o) {
   buildCounterModifyMessageRequest++;
   if (buildCounterModifyMessageRequest < 3) {
-    checkUnnamed179(o.addLabelIds);
-    checkUnnamed180(o.removeLabelIds);
+    checkUnnamed1143(o.addLabelIds);
+    checkUnnamed1144(o.removeLabelIds);
   }
   buildCounterModifyMessageRequest--;
 }
 
-buildUnnamed181() {
+buildUnnamed1145() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed181(core.List<core.String> o) {
+checkUnnamed1145(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed182() {
+buildUnnamed1146() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed182(core.List<core.String> o) {
+checkUnnamed1146(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -671,8 +706,8 @@
   var o = new api.ModifyThreadRequest();
   buildCounterModifyThreadRequest++;
   if (buildCounterModifyThreadRequest < 3) {
-    o.addLabelIds = buildUnnamed181();
-    o.removeLabelIds = buildUnnamed182();
+    o.addLabelIds = buildUnnamed1145();
+    o.removeLabelIds = buildUnnamed1146();
   }
   buildCounterModifyThreadRequest--;
   return o;
@@ -681,8 +716,8 @@
 checkModifyThreadRequest(api.ModifyThreadRequest o) {
   buildCounterModifyThreadRequest++;
   if (buildCounterModifyThreadRequest < 3) {
-    checkUnnamed181(o.addLabelIds);
-    checkUnnamed182(o.removeLabelIds);
+    checkUnnamed1145(o.addLabelIds);
+    checkUnnamed1146(o.removeLabelIds);
   }
   buildCounterModifyThreadRequest--;
 }
@@ -712,14 +747,14 @@
   buildCounterProfile--;
 }
 
-buildUnnamed183() {
+buildUnnamed1147() {
   var o = new core.List<api.Message>();
   o.add(buildMessage());
   o.add(buildMessage());
   return o;
 }
 
-checkUnnamed183(core.List<api.Message> o) {
+checkUnnamed1147(core.List<api.Message> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMessage(o[0]);
   checkMessage(o[1]);
@@ -732,7 +767,7 @@
   if (buildCounterThread < 3) {
     o.historyId = "foo";
     o.id = "foo";
-    o.messages = buildUnnamed183();
+    o.messages = buildUnnamed1147();
     o.snippet = "foo";
   }
   buildCounterThread--;
@@ -744,59 +779,59 @@
   if (buildCounterThread < 3) {
     unittest.expect(o.historyId, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed183(o.messages);
+    checkUnnamed1147(o.messages);
     unittest.expect(o.snippet, unittest.equals('foo'));
   }
   buildCounterThread--;
 }
 
-buildUnnamed184() {
+buildUnnamed1148() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed184(core.List<core.String> o) {
+checkUnnamed1148(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed185() {
+buildUnnamed1149() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed185(core.List<core.String> o) {
+checkUnnamed1149(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed186() {
+buildUnnamed1150() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed186(core.List<core.String> o) {
+checkUnnamed1150(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed187() {
+buildUnnamed1151() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed187(core.List<core.String> o) {
+checkUnnamed1151(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -987,7 +1022,7 @@
   unittest.group("resource-UsersResourceApi", () {
     unittest.test("method--getProfile", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersResourceApi res = new api.GmailApi(mock).users;
       var arg_userId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1020,7 +1055,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProfile());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.getProfile(arg_userId).then(unittest.expectAsync(((api.Profile response) {
         checkProfile(response);
@@ -1035,7 +1070,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersDraftsResourceApi res = new api.GmailApi(mock).users.drafts;
       var arg_request = buildDraft();
       var arg_userId = "foo";
@@ -1072,7 +1107,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDraft());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.create(arg_request, arg_userId).then(unittest.expectAsync(((api.Draft response) {
         checkDraft(response);
@@ -1081,7 +1116,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersDraftsResourceApi res = new api.GmailApi(mock).users.drafts;
       var arg_userId = "foo";
       var arg_id = "foo";
@@ -1115,14 +1150,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_userId, arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersDraftsResourceApi res = new api.GmailApi(mock).users.drafts;
       var arg_userId = "foo";
       var arg_id = "foo";
@@ -1158,7 +1193,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDraft());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_userId, arg_id, format: arg_format).then(unittest.expectAsync(((api.Draft response) {
         checkDraft(response);
@@ -1167,7 +1202,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersDraftsResourceApi res = new api.GmailApi(mock).users.drafts;
       var arg_userId = "foo";
       var arg_maxResults = 42;
@@ -1204,7 +1239,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListDraftsResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.ListDraftsResponse response) {
         checkListDraftsResponse(response);
@@ -1215,7 +1250,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersDraftsResourceApi res = new api.GmailApi(mock).users.drafts;
       var arg_request = buildDraft();
       var arg_userId = "foo";
@@ -1252,7 +1287,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMessage());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.send(arg_request, arg_userId).then(unittest.expectAsync(((api.Message response) {
         checkMessage(response);
@@ -1263,7 +1298,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersDraftsResourceApi res = new api.GmailApi(mock).users.drafts;
       var arg_request = buildDraft();
       var arg_userId = "foo";
@@ -1301,7 +1336,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDraft());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_userId, arg_id).then(unittest.expectAsync(((api.Draft response) {
         checkDraft(response);
@@ -1314,7 +1349,7 @@
   unittest.group("resource-UsersHistoryResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersHistoryResourceApi res = new api.GmailApi(mock).users.history;
       var arg_userId = "foo";
       var arg_labelId = "foo";
@@ -1355,7 +1390,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListHistoryResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userId, labelId: arg_labelId, maxResults: arg_maxResults, pageToken: arg_pageToken, startHistoryId: arg_startHistoryId).then(unittest.expectAsync(((api.ListHistoryResponse response) {
         checkListHistoryResponse(response);
@@ -1368,7 +1403,7 @@
   unittest.group("resource-UsersLabelsResourceApi", () {
     unittest.test("method--create", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersLabelsResourceApi res = new api.GmailApi(mock).users.labels;
       var arg_request = buildLabel();
       var arg_userId = "foo";
@@ -1405,7 +1440,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLabel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.create(arg_request, arg_userId).then(unittest.expectAsync(((api.Label response) {
         checkLabel(response);
@@ -1414,7 +1449,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersLabelsResourceApi res = new api.GmailApi(mock).users.labels;
       var arg_userId = "foo";
       var arg_id = "foo";
@@ -1448,14 +1483,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_userId, arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersLabelsResourceApi res = new api.GmailApi(mock).users.labels;
       var arg_userId = "foo";
       var arg_id = "foo";
@@ -1489,7 +1524,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLabel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_userId, arg_id).then(unittest.expectAsync(((api.Label response) {
         checkLabel(response);
@@ -1498,7 +1533,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersLabelsResourceApi res = new api.GmailApi(mock).users.labels;
       var arg_userId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1531,7 +1566,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListLabelsResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userId).then(unittest.expectAsync(((api.ListLabelsResponse response) {
         checkListLabelsResponse(response);
@@ -1540,7 +1575,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersLabelsResourceApi res = new api.GmailApi(mock).users.labels;
       var arg_request = buildLabel();
       var arg_userId = "foo";
@@ -1578,7 +1613,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLabel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_userId, arg_id).then(unittest.expectAsync(((api.Label response) {
         checkLabel(response);
@@ -1587,7 +1622,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersLabelsResourceApi res = new api.GmailApi(mock).users.labels;
       var arg_request = buildLabel();
       var arg_userId = "foo";
@@ -1625,7 +1660,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLabel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_userId, arg_id).then(unittest.expectAsync(((api.Label response) {
         checkLabel(response);
@@ -1638,7 +1673,7 @@
   unittest.group("resource-UsersMessagesResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersMessagesResourceApi res = new api.GmailApi(mock).users.messages;
       var arg_userId = "foo";
       var arg_id = "foo";
@@ -1672,19 +1707,19 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_userId, arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersMessagesResourceApi res = new api.GmailApi(mock).users.messages;
       var arg_userId = "foo";
       var arg_id = "foo";
       var arg_format = "foo";
-      var arg_metadataHeaders = buildUnnamed184();
+      var arg_metadataHeaders = buildUnnamed1148();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -1717,7 +1752,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMessage());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_userId, arg_id, format: arg_format, metadataHeaders: arg_metadataHeaders).then(unittest.expectAsync(((api.Message response) {
         checkMessage(response);
@@ -1728,7 +1763,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersMessagesResourceApi res = new api.GmailApi(mock).users.messages;
       var arg_request = buildMessage();
       var arg_userId = "foo";
@@ -1773,7 +1808,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMessage());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.import(arg_request, arg_userId, deleted: arg_deleted, internalDateSource: arg_internalDateSource, neverMarkSpam: arg_neverMarkSpam, processForCalendar: arg_processForCalendar).then(unittest.expectAsync(((api.Message response) {
         checkMessage(response);
@@ -1784,10 +1819,11 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersMessagesResourceApi res = new api.GmailApi(mock).users.messages;
       var arg_request = buildMessage();
       var arg_userId = "foo";
+      var arg_deleted = true;
       var arg_internalDateSource = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var obj = new api.Message.fromJson(json);
@@ -1816,6 +1852,7 @@
             addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
           }
         }
+        unittest.expect(queryMap["deleted"].first, unittest.equals("$arg_deleted"));
         unittest.expect(queryMap["internalDateSource"].first, unittest.equals(arg_internalDateSource));
 
 
@@ -1823,20 +1860,20 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMessage());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.insert(arg_request, arg_userId, internalDateSource: arg_internalDateSource).then(unittest.expectAsync(((api.Message response) {
+      res.insert(arg_request, arg_userId, deleted: arg_deleted, internalDateSource: arg_internalDateSource).then(unittest.expectAsync(((api.Message response) {
         checkMessage(response);
       })));
     });
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersMessagesResourceApi res = new api.GmailApi(mock).users.messages;
       var arg_userId = "foo";
       var arg_includeSpamTrash = true;
-      var arg_labelIds = buildUnnamed185();
+      var arg_labelIds = buildUnnamed1149();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_q = "foo";
@@ -1875,7 +1912,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListMessagesResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userId, includeSpamTrash: arg_includeSpamTrash, labelIds: arg_labelIds, maxResults: arg_maxResults, pageToken: arg_pageToken, q: arg_q).then(unittest.expectAsync(((api.ListMessagesResponse response) {
         checkListMessagesResponse(response);
@@ -1884,7 +1921,7 @@
 
     unittest.test("method--modify", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersMessagesResourceApi res = new api.GmailApi(mock).users.messages;
       var arg_request = buildModifyMessageRequest();
       var arg_userId = "foo";
@@ -1922,7 +1959,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMessage());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.modify(arg_request, arg_userId, arg_id).then(unittest.expectAsync(((api.Message response) {
         checkMessage(response);
@@ -1933,7 +1970,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersMessagesResourceApi res = new api.GmailApi(mock).users.messages;
       var arg_request = buildMessage();
       var arg_userId = "foo";
@@ -1970,7 +2007,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMessage());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.send(arg_request, arg_userId).then(unittest.expectAsync(((api.Message response) {
         checkMessage(response);
@@ -1979,7 +2016,7 @@
 
     unittest.test("method--trash", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersMessagesResourceApi res = new api.GmailApi(mock).users.messages;
       var arg_userId = "foo";
       var arg_id = "foo";
@@ -2013,7 +2050,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMessage());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.trash(arg_userId, arg_id).then(unittest.expectAsync(((api.Message response) {
         checkMessage(response);
@@ -2022,7 +2059,7 @@
 
     unittest.test("method--untrash", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersMessagesResourceApi res = new api.GmailApi(mock).users.messages;
       var arg_userId = "foo";
       var arg_id = "foo";
@@ -2056,7 +2093,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMessage());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.untrash(arg_userId, arg_id).then(unittest.expectAsync(((api.Message response) {
         checkMessage(response);
@@ -2069,7 +2106,7 @@
   unittest.group("resource-UsersMessagesAttachmentsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersMessagesAttachmentsResourceApi res = new api.GmailApi(mock).users.messages.attachments;
       var arg_userId = "foo";
       var arg_messageId = "foo";
@@ -2104,7 +2141,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMessagePartBody());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_userId, arg_messageId, arg_id).then(unittest.expectAsync(((api.MessagePartBody response) {
         checkMessagePartBody(response);
@@ -2117,7 +2154,7 @@
   unittest.group("resource-UsersThreadsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersThreadsResourceApi res = new api.GmailApi(mock).users.threads;
       var arg_userId = "foo";
       var arg_id = "foo";
@@ -2151,19 +2188,19 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_userId, arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersThreadsResourceApi res = new api.GmailApi(mock).users.threads;
       var arg_userId = "foo";
       var arg_id = "foo";
       var arg_format = "foo";
-      var arg_metadataHeaders = buildUnnamed186();
+      var arg_metadataHeaders = buildUnnamed1150();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -2196,7 +2233,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildThread());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_userId, arg_id, format: arg_format, metadataHeaders: arg_metadataHeaders).then(unittest.expectAsync(((api.Thread response) {
         checkThread(response);
@@ -2205,11 +2242,11 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersThreadsResourceApi res = new api.GmailApi(mock).users.threads;
       var arg_userId = "foo";
       var arg_includeSpamTrash = true;
-      var arg_labelIds = buildUnnamed187();
+      var arg_labelIds = buildUnnamed1151();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_q = "foo";
@@ -2248,7 +2285,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListThreadsResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userId, includeSpamTrash: arg_includeSpamTrash, labelIds: arg_labelIds, maxResults: arg_maxResults, pageToken: arg_pageToken, q: arg_q).then(unittest.expectAsync(((api.ListThreadsResponse response) {
         checkListThreadsResponse(response);
@@ -2257,7 +2294,7 @@
 
     unittest.test("method--modify", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersThreadsResourceApi res = new api.GmailApi(mock).users.threads;
       var arg_request = buildModifyThreadRequest();
       var arg_userId = "foo";
@@ -2295,7 +2332,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildThread());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.modify(arg_request, arg_userId, arg_id).then(unittest.expectAsync(((api.Thread response) {
         checkThread(response);
@@ -2304,7 +2341,7 @@
 
     unittest.test("method--trash", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersThreadsResourceApi res = new api.GmailApi(mock).users.threads;
       var arg_userId = "foo";
       var arg_id = "foo";
@@ -2338,7 +2375,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildThread());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.trash(arg_userId, arg_id).then(unittest.expectAsync(((api.Thread response) {
         checkThread(response);
@@ -2347,7 +2384,7 @@
 
     unittest.test("method--untrash", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UsersThreadsResourceApi res = new api.GmailApi(mock).users.threads;
       var arg_userId = "foo";
       var arg_id = "foo";
@@ -2381,7 +2418,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildThread());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.untrash(arg_userId, arg_id).then(unittest.expectAsync(((api.Thread response) {
         checkThread(response);
diff --git a/generated/googleapis/test/groupsmigration/v1_test.dart b/generated/googleapis/test/groupsmigration/v1_test.dart
index bcf6d73..04ab387 100644
--- a/generated/googleapis/test/groupsmigration/v1_test.dart
+++ b/generated/googleapis/test/groupsmigration/v1_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/groupsmigration/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterGroups = 0;
 buildGroups() {
@@ -53,7 +88,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ArchiveResourceApi res = new api.GroupsmigrationApi(mock).archive;
       var arg_groupId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -86,7 +121,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGroups());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_groupId).then(unittest.expectAsync(((api.Groups response) {
         checkGroups(response);
diff --git a/generated/googleapis/test/groupssettings/v1_test.dart b/generated/googleapis/test/groupssettings/v1_test.dart
index 69bfd14..ad5fe08 100644
--- a/generated/googleapis/test/groupssettings/v1_test.dart
+++ b/generated/googleapis/test/groupssettings/v1_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/groupssettings/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterGroups = 0;
 buildGroups() {
@@ -103,7 +138,7 @@
   unittest.group("resource-GroupsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GroupsResourceApi res = new api.GroupssettingsApi(mock).groups;
       var arg_groupUniqueId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -136,7 +171,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGroups());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_groupUniqueId).then(unittest.expectAsync(((api.Groups response) {
         checkGroups(response);
@@ -145,7 +180,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GroupsResourceApi res = new api.GroupssettingsApi(mock).groups;
       var arg_request = buildGroups();
       var arg_groupUniqueId = "foo";
@@ -182,7 +217,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGroups());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_groupUniqueId).then(unittest.expectAsync(((api.Groups response) {
         checkGroups(response);
@@ -191,7 +226,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GroupsResourceApi res = new api.GroupssettingsApi(mock).groups;
       var arg_request = buildGroups();
       var arg_groupUniqueId = "foo";
@@ -228,7 +263,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGroups());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_groupUniqueId).then(unittest.expectAsync(((api.Groups response) {
         checkGroups(response);
diff --git a/generated/googleapis/test/identitytoolkit/v3_test.dart b/generated/googleapis/test/identitytoolkit/v3_test.dart
index 0310e77..896daa1 100644
--- a/generated/googleapis/test/identitytoolkit/v3_test.dart
+++ b/generated/googleapis/test/identitytoolkit/v3_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/identitytoolkit/v3.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterCreateAuthUriResponse = 0;
 buildCreateAuthUriResponse() {
@@ -64,14 +99,14 @@
   buildCounterDeleteAccountResponse--;
 }
 
-buildUnnamed1333() {
+buildUnnamed1152() {
   var o = new core.List<api.UserInfo>();
   o.add(buildUserInfo());
   o.add(buildUserInfo());
   return o;
 }
 
-checkUnnamed1333(core.List<api.UserInfo> o) {
+checkUnnamed1152(core.List<api.UserInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserInfo(o[0]);
   checkUserInfo(o[1]);
@@ -84,7 +119,7 @@
   if (buildCounterDownloadAccountResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.users = buildUnnamed1333();
+    o.users = buildUnnamed1152();
   }
   buildCounterDownloadAccountResponse--;
   return o;
@@ -95,19 +130,19 @@
   if (buildCounterDownloadAccountResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1333(o.users);
+    checkUnnamed1152(o.users);
   }
   buildCounterDownloadAccountResponse--;
 }
 
-buildUnnamed1334() {
+buildUnnamed1153() {
   var o = new core.List<api.UserInfo>();
   o.add(buildUserInfo());
   o.add(buildUserInfo());
   return o;
 }
 
-checkUnnamed1334(core.List<api.UserInfo> o) {
+checkUnnamed1153(core.List<api.UserInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserInfo(o[0]);
   checkUserInfo(o[1]);
@@ -119,7 +154,7 @@
   buildCounterGetAccountInfoResponse++;
   if (buildCounterGetAccountInfoResponse < 3) {
     o.kind = "foo";
-    o.users = buildUnnamed1334();
+    o.users = buildUnnamed1153();
   }
   buildCounterGetAccountInfoResponse--;
   return o;
@@ -129,7 +164,7 @@
   buildCounterGetAccountInfoResponse++;
   if (buildCounterGetAccountInfoResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1334(o.users);
+    checkUnnamed1153(o.users);
   }
   buildCounterGetAccountInfoResponse--;
 }
@@ -228,27 +263,27 @@
   buildCounterIdentitytoolkitRelyingpartyDownloadAccountRequest--;
 }
 
-buildUnnamed1335() {
+buildUnnamed1154() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1335(core.List<core.String> o) {
+checkUnnamed1154(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1336() {
+buildUnnamed1155() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1336(core.List<core.String> o) {
+checkUnnamed1155(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -259,9 +294,9 @@
   var o = new api.IdentitytoolkitRelyingpartyGetAccountInfoRequest();
   buildCounterIdentitytoolkitRelyingpartyGetAccountInfoRequest++;
   if (buildCounterIdentitytoolkitRelyingpartyGetAccountInfoRequest < 3) {
-    o.email = buildUnnamed1335();
+    o.email = buildUnnamed1154();
     o.idToken = "foo";
-    o.localId = buildUnnamed1336();
+    o.localId = buildUnnamed1155();
   }
   buildCounterIdentitytoolkitRelyingpartyGetAccountInfoRequest--;
   return o;
@@ -270,9 +305,9 @@
 checkIdentitytoolkitRelyingpartyGetAccountInfoRequest(api.IdentitytoolkitRelyingpartyGetAccountInfoRequest o) {
   buildCounterIdentitytoolkitRelyingpartyGetAccountInfoRequest++;
   if (buildCounterIdentitytoolkitRelyingpartyGetAccountInfoRequest < 3) {
-    checkUnnamed1335(o.email);
+    checkUnnamed1154(o.email);
     unittest.expect(o.idToken, unittest.equals('foo'));
-    checkUnnamed1336(o.localId);
+    checkUnnamed1155(o.localId);
   }
   buildCounterIdentitytoolkitRelyingpartyGetAccountInfoRequest--;
 }
@@ -315,14 +350,14 @@
   buildCounterIdentitytoolkitRelyingpartyResetPasswordRequest--;
 }
 
-buildUnnamed1337() {
+buildUnnamed1156() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1337(core.List<core.String> o) {
+checkUnnamed1156(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -342,7 +377,7 @@
     o.localId = "foo";
     o.oobCode = "foo";
     o.password = "foo";
-    o.provider = buildUnnamed1337();
+    o.provider = buildUnnamed1156();
     o.upgradeToFederatedLogin = true;
   }
   buildCounterIdentitytoolkitRelyingpartySetAccountInfoRequest--;
@@ -361,20 +396,20 @@
     unittest.expect(o.localId, unittest.equals('foo'));
     unittest.expect(o.oobCode, unittest.equals('foo'));
     unittest.expect(o.password, unittest.equals('foo'));
-    checkUnnamed1337(o.provider);
+    checkUnnamed1156(o.provider);
     unittest.expect(o.upgradeToFederatedLogin, unittest.isTrue);
   }
   buildCounterIdentitytoolkitRelyingpartySetAccountInfoRequest--;
 }
 
-buildUnnamed1338() {
+buildUnnamed1157() {
   var o = new core.List<api.UserInfo>();
   o.add(buildUserInfo());
   o.add(buildUserInfo());
   return o;
 }
 
-checkUnnamed1338(core.List<api.UserInfo> o) {
+checkUnnamed1157(core.List<api.UserInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserInfo(o[0]);
   checkUserInfo(o[1]);
@@ -390,7 +425,7 @@
     o.rounds = 42;
     o.saltSeparator = "foo";
     o.signerKey = "foo";
-    o.users = buildUnnamed1338();
+    o.users = buildUnnamed1157();
   }
   buildCounterIdentitytoolkitRelyingpartyUploadAccountRequest--;
   return o;
@@ -404,7 +439,7 @@
     unittest.expect(o.rounds, unittest.equals(42));
     unittest.expect(o.saltSeparator, unittest.equals('foo'));
     unittest.expect(o.signerKey, unittest.equals('foo'));
-    checkUnnamed1338(o.users);
+    checkUnnamed1157(o.users);
   }
   buildCounterIdentitytoolkitRelyingpartyUploadAccountRequest--;
 }
@@ -536,14 +571,14 @@
   buildCounterSetAccountInfoResponseProviderUserInfo--;
 }
 
-buildUnnamed1339() {
+buildUnnamed1158() {
   var o = new core.List<api.SetAccountInfoResponseProviderUserInfo>();
   o.add(buildSetAccountInfoResponseProviderUserInfo());
   o.add(buildSetAccountInfoResponseProviderUserInfo());
   return o;
 }
 
-checkUnnamed1339(core.List<api.SetAccountInfoResponseProviderUserInfo> o) {
+checkUnnamed1158(core.List<api.SetAccountInfoResponseProviderUserInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSetAccountInfoResponseProviderUserInfo(o[0]);
   checkSetAccountInfoResponseProviderUserInfo(o[1]);
@@ -558,7 +593,7 @@
     o.email = "foo";
     o.idToken = "foo";
     o.kind = "foo";
-    o.providerUserInfo = buildUnnamed1339();
+    o.providerUserInfo = buildUnnamed1158();
   }
   buildCounterSetAccountInfoResponse--;
   return o;
@@ -571,7 +606,7 @@
     unittest.expect(o.email, unittest.equals('foo'));
     unittest.expect(o.idToken, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1339(o.providerUserInfo);
+    checkUnnamed1158(o.providerUserInfo);
   }
   buildCounterSetAccountInfoResponse--;
 }
@@ -597,14 +632,14 @@
   buildCounterUploadAccountResponseError--;
 }
 
-buildUnnamed1340() {
+buildUnnamed1159() {
   var o = new core.List<api.UploadAccountResponseError>();
   o.add(buildUploadAccountResponseError());
   o.add(buildUploadAccountResponseError());
   return o;
 }
 
-checkUnnamed1340(core.List<api.UploadAccountResponseError> o) {
+checkUnnamed1159(core.List<api.UploadAccountResponseError> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUploadAccountResponseError(o[0]);
   checkUploadAccountResponseError(o[1]);
@@ -615,7 +650,7 @@
   var o = new api.UploadAccountResponse();
   buildCounterUploadAccountResponse++;
   if (buildCounterUploadAccountResponse < 3) {
-    o.error = buildUnnamed1340();
+    o.error = buildUnnamed1159();
     o.kind = "foo";
   }
   buildCounterUploadAccountResponse--;
@@ -625,7 +660,7 @@
 checkUploadAccountResponse(api.UploadAccountResponse o) {
   buildCounterUploadAccountResponse++;
   if (buildCounterUploadAccountResponse < 3) {
-    checkUnnamed1340(o.error);
+    checkUnnamed1159(o.error);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterUploadAccountResponse--;
@@ -656,14 +691,14 @@
   buildCounterUserInfoProviderUserInfo--;
 }
 
-buildUnnamed1341() {
+buildUnnamed1160() {
   var o = new core.List<api.UserInfoProviderUserInfo>();
   o.add(buildUserInfoProviderUserInfo());
   o.add(buildUserInfoProviderUserInfo());
   return o;
 }
 
-checkUnnamed1341(core.List<api.UserInfoProviderUserInfo> o) {
+checkUnnamed1160(core.List<api.UserInfoProviderUserInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserInfoProviderUserInfo(o[0]);
   checkUserInfoProviderUserInfo(o[1]);
@@ -681,7 +716,7 @@
     o.passwordHash = "foo";
     o.passwordUpdatedAt = 42.0;
     o.photoUrl = "foo";
-    o.providerUserInfo = buildUnnamed1341();
+    o.providerUserInfo = buildUnnamed1160();
     o.salt = "foo";
     o.version = 42;
   }
@@ -699,21 +734,21 @@
     unittest.expect(o.passwordHash, unittest.equals('foo'));
     unittest.expect(o.passwordUpdatedAt, unittest.equals(42.0));
     unittest.expect(o.photoUrl, unittest.equals('foo'));
-    checkUnnamed1341(o.providerUserInfo);
+    checkUnnamed1160(o.providerUserInfo);
     unittest.expect(o.salt, unittest.equals('foo'));
     unittest.expect(o.version, unittest.equals(42));
   }
   buildCounterUserInfo--;
 }
 
-buildUnnamed1342() {
+buildUnnamed1161() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1342(core.List<core.String> o) {
+checkUnnamed1161(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -750,7 +785,7 @@
     o.photoUrl = "foo";
     o.providerId = "foo";
     o.timeZone = "foo";
-    o.verifiedProvider = buildUnnamed1342();
+    o.verifiedProvider = buildUnnamed1161();
   }
   buildCounterVerifyAssertionResponse--;
   return o;
@@ -785,7 +820,7 @@
     unittest.expect(o.photoUrl, unittest.equals('foo'));
     unittest.expect(o.providerId, unittest.equals('foo'));
     unittest.expect(o.timeZone, unittest.equals('foo'));
-    checkUnnamed1342(o.verifiedProvider);
+    checkUnnamed1161(o.verifiedProvider);
   }
   buildCounterVerifyAssertionResponse--;
 }
@@ -1051,7 +1086,7 @@
   unittest.group("resource-RelyingpartyResourceApi", () {
     unittest.test("method--createAuthUri", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RelyingpartyResourceApi res = new api.IdentitytoolkitApi(mock).relyingparty;
       var arg_request = buildIdentitytoolkitRelyingpartyCreateAuthUriRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1091,7 +1126,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreateAuthUriResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.createAuthUri(arg_request).then(unittest.expectAsync(((api.CreateAuthUriResponse response) {
         checkCreateAuthUriResponse(response);
@@ -1100,7 +1135,7 @@
 
     unittest.test("method--deleteAccount", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RelyingpartyResourceApi res = new api.IdentitytoolkitApi(mock).relyingparty;
       var arg_request = buildIdentitytoolkitRelyingpartyDeleteAccountRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1140,7 +1175,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDeleteAccountResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.deleteAccount(arg_request).then(unittest.expectAsync(((api.DeleteAccountResponse response) {
         checkDeleteAccountResponse(response);
@@ -1149,7 +1184,7 @@
 
     unittest.test("method--downloadAccount", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RelyingpartyResourceApi res = new api.IdentitytoolkitApi(mock).relyingparty;
       var arg_request = buildIdentitytoolkitRelyingpartyDownloadAccountRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1189,7 +1224,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDownloadAccountResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.downloadAccount(arg_request).then(unittest.expectAsync(((api.DownloadAccountResponse response) {
         checkDownloadAccountResponse(response);
@@ -1198,7 +1233,7 @@
 
     unittest.test("method--getAccountInfo", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RelyingpartyResourceApi res = new api.IdentitytoolkitApi(mock).relyingparty;
       var arg_request = buildIdentitytoolkitRelyingpartyGetAccountInfoRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1238,7 +1273,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGetAccountInfoResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.getAccountInfo(arg_request).then(unittest.expectAsync(((api.GetAccountInfoResponse response) {
         checkGetAccountInfoResponse(response);
@@ -1247,7 +1282,7 @@
 
     unittest.test("method--getOobConfirmationCode", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RelyingpartyResourceApi res = new api.IdentitytoolkitApi(mock).relyingparty;
       var arg_request = buildRelyingparty();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1287,7 +1322,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGetOobConfirmationCodeResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.getOobConfirmationCode(arg_request).then(unittest.expectAsync(((api.GetOobConfirmationCodeResponse response) {
         checkGetOobConfirmationCodeResponse(response);
@@ -1296,7 +1331,7 @@
 
     unittest.test("method--getPublicKeys", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RelyingpartyResourceApi res = new api.IdentitytoolkitApi(mock).relyingparty;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1332,7 +1367,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildIdentitytoolkitRelyingpartyGetPublicKeysResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.getPublicKeys().then(unittest.expectAsync(((api.IdentitytoolkitRelyingpartyGetPublicKeysResponse response) {
         checkIdentitytoolkitRelyingpartyGetPublicKeysResponse(response);
@@ -1341,7 +1376,7 @@
 
     unittest.test("method--resetPassword", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RelyingpartyResourceApi res = new api.IdentitytoolkitApi(mock).relyingparty;
       var arg_request = buildIdentitytoolkitRelyingpartyResetPasswordRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1381,7 +1416,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildResetPasswordResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.resetPassword(arg_request).then(unittest.expectAsync(((api.ResetPasswordResponse response) {
         checkResetPasswordResponse(response);
@@ -1390,7 +1425,7 @@
 
     unittest.test("method--setAccountInfo", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RelyingpartyResourceApi res = new api.IdentitytoolkitApi(mock).relyingparty;
       var arg_request = buildIdentitytoolkitRelyingpartySetAccountInfoRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1430,7 +1465,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSetAccountInfoResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.setAccountInfo(arg_request).then(unittest.expectAsync(((api.SetAccountInfoResponse response) {
         checkSetAccountInfoResponse(response);
@@ -1439,7 +1474,7 @@
 
     unittest.test("method--uploadAccount", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RelyingpartyResourceApi res = new api.IdentitytoolkitApi(mock).relyingparty;
       var arg_request = buildIdentitytoolkitRelyingpartyUploadAccountRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1479,7 +1514,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUploadAccountResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.uploadAccount(arg_request).then(unittest.expectAsync(((api.UploadAccountResponse response) {
         checkUploadAccountResponse(response);
@@ -1488,7 +1523,7 @@
 
     unittest.test("method--verifyAssertion", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RelyingpartyResourceApi res = new api.IdentitytoolkitApi(mock).relyingparty;
       var arg_request = buildIdentitytoolkitRelyingpartyVerifyAssertionRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1528,7 +1563,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildVerifyAssertionResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.verifyAssertion(arg_request).then(unittest.expectAsync(((api.VerifyAssertionResponse response) {
         checkVerifyAssertionResponse(response);
@@ -1537,7 +1572,7 @@
 
     unittest.test("method--verifyPassword", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RelyingpartyResourceApi res = new api.IdentitytoolkitApi(mock).relyingparty;
       var arg_request = buildIdentitytoolkitRelyingpartyVerifyPasswordRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1577,7 +1612,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildVerifyPasswordResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.verifyPassword(arg_request).then(unittest.expectAsync(((api.VerifyPasswordResponse response) {
         checkVerifyPasswordResponse(response);
diff --git a/generated/googleapis/test/licensing/v1_test.dart b/generated/googleapis/test/licensing/v1_test.dart
index 79562e4..7c07822 100644
--- a/generated/googleapis/test/licensing/v1_test.dart
+++ b/generated/googleapis/test/licensing/v1_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/licensing/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterLicenseAssignment = 0;
 buildLicenseAssignment() {
@@ -64,14 +99,14 @@
   buildCounterLicenseAssignmentInsert--;
 }
 
-buildUnnamed1234() {
+buildUnnamed1162() {
   var o = new core.List<api.LicenseAssignment>();
   o.add(buildLicenseAssignment());
   o.add(buildLicenseAssignment());
   return o;
 }
 
-checkUnnamed1234(core.List<api.LicenseAssignment> o) {
+checkUnnamed1162(core.List<api.LicenseAssignment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLicenseAssignment(o[0]);
   checkLicenseAssignment(o[1]);
@@ -83,7 +118,7 @@
   buildCounterLicenseAssignmentList++;
   if (buildCounterLicenseAssignmentList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1234();
+    o.items = buildUnnamed1162();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -95,7 +130,7 @@
   buildCounterLicenseAssignmentList++;
   if (buildCounterLicenseAssignmentList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1234(o.items);
+    checkUnnamed1162(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -134,7 +169,7 @@
   unittest.group("resource-LicenseAssignmentsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LicenseAssignmentsResourceApi res = new api.LicensingApi(mock).licenseAssignments;
       var arg_productId = "foo";
       var arg_skuId = "foo";
@@ -169,14 +204,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_productId, arg_skuId, arg_userId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LicenseAssignmentsResourceApi res = new api.LicensingApi(mock).licenseAssignments;
       var arg_productId = "foo";
       var arg_skuId = "foo";
@@ -211,7 +246,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLicenseAssignment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_productId, arg_skuId, arg_userId).then(unittest.expectAsync(((api.LicenseAssignment response) {
         checkLicenseAssignment(response);
@@ -220,7 +255,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LicenseAssignmentsResourceApi res = new api.LicensingApi(mock).licenseAssignments;
       var arg_request = buildLicenseAssignmentInsert();
       var arg_productId = "foo";
@@ -258,7 +293,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLicenseAssignment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_productId, arg_skuId).then(unittest.expectAsync(((api.LicenseAssignment response) {
         checkLicenseAssignment(response);
@@ -267,7 +302,7 @@
 
     unittest.test("method--listForProduct", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LicenseAssignmentsResourceApi res = new api.LicensingApi(mock).licenseAssignments;
       var arg_productId = "foo";
       var arg_customerId = "foo";
@@ -306,7 +341,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLicenseAssignmentList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.listForProduct(arg_productId, arg_customerId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.LicenseAssignmentList response) {
         checkLicenseAssignmentList(response);
@@ -315,7 +350,7 @@
 
     unittest.test("method--listForProductAndSku", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LicenseAssignmentsResourceApi res = new api.LicensingApi(mock).licenseAssignments;
       var arg_productId = "foo";
       var arg_skuId = "foo";
@@ -355,7 +390,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLicenseAssignmentList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.listForProductAndSku(arg_productId, arg_skuId, arg_customerId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.LicenseAssignmentList response) {
         checkLicenseAssignmentList(response);
@@ -364,7 +399,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LicenseAssignmentsResourceApi res = new api.LicensingApi(mock).licenseAssignments;
       var arg_request = buildLicenseAssignment();
       var arg_productId = "foo";
@@ -403,7 +438,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLicenseAssignment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_productId, arg_skuId, arg_userId).then(unittest.expectAsync(((api.LicenseAssignment response) {
         checkLicenseAssignment(response);
@@ -412,7 +447,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LicenseAssignmentsResourceApi res = new api.LicensingApi(mock).licenseAssignments;
       var arg_request = buildLicenseAssignment();
       var arg_productId = "foo";
@@ -451,7 +486,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLicenseAssignment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_productId, arg_skuId, arg_userId).then(unittest.expectAsync(((api.LicenseAssignment response) {
         checkLicenseAssignment(response);
diff --git a/generated/googleapis/test/mapsengine/v1_test.dart b/generated/googleapis/test/mapsengine/v1_test.dart
index 1e7825f..e5e2614 100644
--- a/generated/googleapis/test/mapsengine/v1_test.dart
+++ b/generated/googleapis/test/mapsengine/v1_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/mapsengine/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterAcquisitionTime = 0;
 buildAcquisitionTime() {
@@ -39,27 +74,27 @@
   buildCounterAcquisitionTime--;
 }
 
-buildUnnamed92() {
+buildUnnamed1163() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed92(core.List<core.double> o) {
+checkUnnamed1163(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed93() {
+buildUnnamed1164() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed93(core.List<core.String> o) {
+checkUnnamed1164(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -70,7 +105,7 @@
   var o = new api.Asset();
   buildCounterAsset++;
   if (buildCounterAsset < 3) {
-    o.bbox = buildUnnamed92();
+    o.bbox = buildUnnamed1163();
     o.creationTime = core.DateTime.parse("2002-02-27T14:01:02");
     o.creatorEmail = "foo";
     o.description = "foo";
@@ -81,7 +116,7 @@
     o.name = "foo";
     o.projectId = "foo";
     o.resource = "foo";
-    o.tags = buildUnnamed93();
+    o.tags = buildUnnamed1164();
     o.type = "foo";
     o.writersCanEditPermissions = true;
   }
@@ -92,7 +127,7 @@
 checkAsset(api.Asset o) {
   buildCounterAsset++;
   if (buildCounterAsset < 3) {
-    checkUnnamed92(o.bbox);
+    checkUnnamed1163(o.bbox);
     unittest.expect(o.creationTime, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.creatorEmail, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
@@ -103,21 +138,21 @@
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.projectId, unittest.equals('foo'));
     unittest.expect(o.resource, unittest.equals('foo'));
-    checkUnnamed93(o.tags);
+    checkUnnamed1164(o.tags);
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(o.writersCanEditPermissions, unittest.isTrue);
   }
   buildCounterAsset--;
 }
 
-buildUnnamed94() {
+buildUnnamed1165() {
   var o = new core.List<api.Asset>();
   o.add(buildAsset());
   o.add(buildAsset());
   return o;
 }
 
-checkUnnamed94(core.List<api.Asset> o) {
+checkUnnamed1165(core.List<api.Asset> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAsset(o[0]);
   checkAsset(o[1]);
@@ -128,7 +163,7 @@
   var o = new api.AssetsListResponse();
   buildCounterAssetsListResponse++;
   if (buildCounterAssetsListResponse < 3) {
-    o.assets = buildUnnamed94();
+    o.assets = buildUnnamed1165();
     o.nextPageToken = "foo";
   }
   buildCounterAssetsListResponse--;
@@ -138,7 +173,7 @@
 checkAssetsListResponse(api.AssetsListResponse o) {
   buildCounterAssetsListResponse++;
   if (buildCounterAssetsListResponse < 3) {
-    checkUnnamed94(o.assets);
+    checkUnnamed1165(o.assets);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterAssetsListResponse--;
@@ -220,14 +255,14 @@
   checkDatasource(o[1]);
 }
 
-buildUnnamed95() {
+buildUnnamed1166() {
   var o = new core.List<api.Filter>();
   o.add(buildFilter());
   o.add(buildFilter());
   return o;
 }
 
-checkUnnamed95(core.List<api.Filter> o) {
+checkUnnamed1166(core.List<api.Filter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFilter(o[0]);
   checkFilter(o[1]);
@@ -238,7 +273,7 @@
   var o = new api.DisplayRule();
   buildCounterDisplayRule++;
   if (buildCounterDisplayRule < 3) {
-    o.filters = buildUnnamed95();
+    o.filters = buildUnnamed1166();
     o.lineOptions = buildLineStyle();
     o.name = "foo";
     o.pointOptions = buildPointStyle();
@@ -252,7 +287,7 @@
 checkDisplayRule(api.DisplayRule o) {
   buildCounterDisplayRule++;
   if (buildCounterDisplayRule < 3) {
-    checkUnnamed95(o.filters);
+    checkUnnamed1166(o.filters);
     checkLineStyle(o.lineOptions);
     unittest.expect(o.name, unittest.equals('foo'));
     checkPointStyle(o.pointOptions);
@@ -304,27 +339,27 @@
   buildCounterFeatureInfo--;
 }
 
-buildUnnamed96() {
+buildUnnamed1167() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed96(core.List<core.String> o) {
+checkUnnamed1167(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed97() {
+buildUnnamed1168() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed97(core.List<core.String> o) {
+checkUnnamed1168(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -335,8 +370,8 @@
   var o = new api.FeaturesBatchDeleteRequest();
   buildCounterFeaturesBatchDeleteRequest++;
   if (buildCounterFeaturesBatchDeleteRequest < 3) {
-    o.gxIds = buildUnnamed96();
-    o.primaryKeys = buildUnnamed97();
+    o.gxIds = buildUnnamed1167();
+    o.primaryKeys = buildUnnamed1168();
   }
   buildCounterFeaturesBatchDeleteRequest--;
   return o;
@@ -345,20 +380,20 @@
 checkFeaturesBatchDeleteRequest(api.FeaturesBatchDeleteRequest o) {
   buildCounterFeaturesBatchDeleteRequest++;
   if (buildCounterFeaturesBatchDeleteRequest < 3) {
-    checkUnnamed96(o.gxIds);
-    checkUnnamed97(o.primaryKeys);
+    checkUnnamed1167(o.gxIds);
+    checkUnnamed1168(o.primaryKeys);
   }
   buildCounterFeaturesBatchDeleteRequest--;
 }
 
-buildUnnamed98() {
+buildUnnamed1169() {
   var o = new core.List<api.Feature>();
   o.add(buildFeature());
   o.add(buildFeature());
   return o;
 }
 
-checkUnnamed98(core.List<api.Feature> o) {
+checkUnnamed1169(core.List<api.Feature> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFeature(o[0]);
   checkFeature(o[1]);
@@ -369,7 +404,7 @@
   var o = new api.FeaturesBatchInsertRequest();
   buildCounterFeaturesBatchInsertRequest++;
   if (buildCounterFeaturesBatchInsertRequest < 3) {
-    o.features = buildUnnamed98();
+    o.features = buildUnnamed1169();
     o.normalizeGeometries = true;
   }
   buildCounterFeaturesBatchInsertRequest--;
@@ -379,20 +414,20 @@
 checkFeaturesBatchInsertRequest(api.FeaturesBatchInsertRequest o) {
   buildCounterFeaturesBatchInsertRequest++;
   if (buildCounterFeaturesBatchInsertRequest < 3) {
-    checkUnnamed98(o.features);
+    checkUnnamed1169(o.features);
     unittest.expect(o.normalizeGeometries, unittest.isTrue);
   }
   buildCounterFeaturesBatchInsertRequest--;
 }
 
-buildUnnamed99() {
+buildUnnamed1170() {
   var o = new core.List<api.Feature>();
   o.add(buildFeature());
   o.add(buildFeature());
   return o;
 }
 
-checkUnnamed99(core.List<api.Feature> o) {
+checkUnnamed1170(core.List<api.Feature> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFeature(o[0]);
   checkFeature(o[1]);
@@ -403,7 +438,7 @@
   var o = new api.FeaturesBatchPatchRequest();
   buildCounterFeaturesBatchPatchRequest++;
   if (buildCounterFeaturesBatchPatchRequest < 3) {
-    o.features = buildUnnamed99();
+    o.features = buildUnnamed1170();
     o.normalizeGeometries = true;
   }
   buildCounterFeaturesBatchPatchRequest--;
@@ -413,20 +448,20 @@
 checkFeaturesBatchPatchRequest(api.FeaturesBatchPatchRequest o) {
   buildCounterFeaturesBatchPatchRequest++;
   if (buildCounterFeaturesBatchPatchRequest < 3) {
-    checkUnnamed99(o.features);
+    checkUnnamed1170(o.features);
     unittest.expect(o.normalizeGeometries, unittest.isTrue);
   }
   buildCounterFeaturesBatchPatchRequest--;
 }
 
-buildUnnamed100() {
+buildUnnamed1171() {
   var o = new core.List<api.Feature>();
   o.add(buildFeature());
   o.add(buildFeature());
   return o;
 }
 
-checkUnnamed100(core.List<api.Feature> o) {
+checkUnnamed1171(core.List<api.Feature> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFeature(o[0]);
   checkFeature(o[1]);
@@ -438,7 +473,7 @@
   buildCounterFeaturesListResponse++;
   if (buildCounterFeaturesListResponse < 3) {
     o.allowedQueriesPerSecond = 42.0;
-    o.features = buildUnnamed100();
+    o.features = buildUnnamed1171();
     o.nextPageToken = "foo";
     o.schema = buildSchema();
     o.type = "foo";
@@ -451,7 +486,7 @@
   buildCounterFeaturesListResponse++;
   if (buildCounterFeaturesListResponse < 3) {
     unittest.expect(o.allowedQueriesPerSecond, unittest.equals(42.0));
-    checkUnnamed100(o.features);
+    checkUnnamed1171(o.features);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkSchema(o.schema);
     unittest.expect(o.type, unittest.equals('foo'));
@@ -513,7 +548,7 @@
   checkGeoJsonGeometryCollection(api.GeoJsonGeometryCollection o) {
   buildCounterGeoJsonGeometryCollection++;
   if (buildCounterGeoJsonGeometryCollection < 3) {
-    checkUnnamed101(o.geometries);
+    checkUnnamed1172(o.geometries);
   }
   buildCounterGeoJsonGeometryCollection--;
 }
@@ -521,14 +556,14 @@
 (o);
 }
 
-buildUnnamed101() {
+buildUnnamed1172() {
   var o = new core.List<api.GeoJsonGeometry>();
   o.add(buildGeoJsonGeometry());
   o.add(buildGeoJsonGeometry());
   return o;
 }
 
-checkUnnamed101(core.List<api.GeoJsonGeometry> o) {
+checkUnnamed1172(core.List<api.GeoJsonGeometry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGeoJsonGeometry(o[0]);
   checkGeoJsonGeometry(o[1]);
@@ -539,7 +574,7 @@
   var o = new api.GeoJsonGeometryCollection();
   buildCounterGeoJsonGeometryCollection++;
   if (buildCounterGeoJsonGeometryCollection < 3) {
-    o.geometries = buildUnnamed101();
+    o.geometries = buildUnnamed1172();
   }
   buildCounterGeoJsonGeometryCollection--;
   return o;
@@ -548,19 +583,19 @@
 checkGeoJsonGeometryCollection(api.GeoJsonGeometryCollection o) {
   buildCounterGeoJsonGeometryCollection++;
   if (buildCounterGeoJsonGeometryCollection < 3) {
-    checkUnnamed101(o.geometries);
+    checkUnnamed1172(o.geometries);
   }
   buildCounterGeoJsonGeometryCollection--;
 }
 
-buildUnnamed102() {
+buildUnnamed1173() {
   var o = new core.List<api.GeoJsonPosition>();
   o.add(buildGeoJsonPosition());
   o.add(buildGeoJsonPosition());
   return o;
 }
 
-checkUnnamed102(core.List<api.GeoJsonPosition> o) {
+checkUnnamed1173(core.List<api.GeoJsonPosition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGeoJsonPosition(o[0]);
   checkGeoJsonPosition(o[1]);
@@ -571,7 +606,7 @@
   var o = new api.GeoJsonLineString();
   buildCounterGeoJsonLineString++;
   if (buildCounterGeoJsonLineString < 3) {
-    o.coordinates = buildUnnamed102();
+    o.coordinates = buildUnnamed1173();
   }
   buildCounterGeoJsonLineString--;
   return o;
@@ -580,35 +615,35 @@
 checkGeoJsonLineString(api.GeoJsonLineString o) {
   buildCounterGeoJsonLineString++;
   if (buildCounterGeoJsonLineString < 3) {
-    checkUnnamed102(o.coordinates);
+    checkUnnamed1173(o.coordinates);
   }
   buildCounterGeoJsonLineString--;
 }
 
-buildUnnamed103() {
+buildUnnamed1174() {
   var o = new core.List<api.GeoJsonPosition>();
   o.add(buildGeoJsonPosition());
   o.add(buildGeoJsonPosition());
   return o;
 }
 
-checkUnnamed103(core.List<api.GeoJsonPosition> o) {
+checkUnnamed1174(core.List<api.GeoJsonPosition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGeoJsonPosition(o[0]);
   checkGeoJsonPosition(o[1]);
 }
 
-buildUnnamed104() {
+buildUnnamed1175() {
   var o = new core.List<core.List<api.GeoJsonPosition>>();
-  o.add(buildUnnamed103());
-  o.add(buildUnnamed103());
+  o.add(buildUnnamed1174());
+  o.add(buildUnnamed1174());
   return o;
 }
 
-checkUnnamed104(core.List<core.List<api.GeoJsonPosition>> o) {
+checkUnnamed1175(core.List<core.List<api.GeoJsonPosition>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed103(o[0]);
-  checkUnnamed103(o[1]);
+  checkUnnamed1174(o[0]);
+  checkUnnamed1174(o[1]);
 }
 
 core.int buildCounterGeoJsonMultiLineString = 0;
@@ -616,7 +651,7 @@
   var o = new api.GeoJsonMultiLineString();
   buildCounterGeoJsonMultiLineString++;
   if (buildCounterGeoJsonMultiLineString < 3) {
-    o.coordinates = buildUnnamed104();
+    o.coordinates = buildUnnamed1175();
   }
   buildCounterGeoJsonMultiLineString--;
   return o;
@@ -625,19 +660,19 @@
 checkGeoJsonMultiLineString(api.GeoJsonMultiLineString o) {
   buildCounterGeoJsonMultiLineString++;
   if (buildCounterGeoJsonMultiLineString < 3) {
-    checkUnnamed104(o.coordinates);
+    checkUnnamed1175(o.coordinates);
   }
   buildCounterGeoJsonMultiLineString--;
 }
 
-buildUnnamed105() {
+buildUnnamed1176() {
   var o = new core.List<api.GeoJsonPosition>();
   o.add(buildGeoJsonPosition());
   o.add(buildGeoJsonPosition());
   return o;
 }
 
-checkUnnamed105(core.List<api.GeoJsonPosition> o) {
+checkUnnamed1176(core.List<api.GeoJsonPosition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGeoJsonPosition(o[0]);
   checkGeoJsonPosition(o[1]);
@@ -648,7 +683,7 @@
   var o = new api.GeoJsonMultiPoint();
   buildCounterGeoJsonMultiPoint++;
   if (buildCounterGeoJsonMultiPoint < 3) {
-    o.coordinates = buildUnnamed105();
+    o.coordinates = buildUnnamed1176();
   }
   buildCounterGeoJsonMultiPoint--;
   return o;
@@ -657,48 +692,48 @@
 checkGeoJsonMultiPoint(api.GeoJsonMultiPoint o) {
   buildCounterGeoJsonMultiPoint++;
   if (buildCounterGeoJsonMultiPoint < 3) {
-    checkUnnamed105(o.coordinates);
+    checkUnnamed1176(o.coordinates);
   }
   buildCounterGeoJsonMultiPoint--;
 }
 
-buildUnnamed106() {
+buildUnnamed1177() {
   var o = new core.List<api.GeoJsonPosition>();
   o.add(buildGeoJsonPosition());
   o.add(buildGeoJsonPosition());
   return o;
 }
 
-checkUnnamed106(core.List<api.GeoJsonPosition> o) {
+checkUnnamed1177(core.List<api.GeoJsonPosition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGeoJsonPosition(o[0]);
   checkGeoJsonPosition(o[1]);
 }
 
-buildUnnamed107() {
+buildUnnamed1178() {
   var o = new core.List<core.List<api.GeoJsonPosition>>();
-  o.add(buildUnnamed106());
-  o.add(buildUnnamed106());
+  o.add(buildUnnamed1177());
+  o.add(buildUnnamed1177());
   return o;
 }
 
-checkUnnamed107(core.List<core.List<api.GeoJsonPosition>> o) {
+checkUnnamed1178(core.List<core.List<api.GeoJsonPosition>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed106(o[0]);
-  checkUnnamed106(o[1]);
+  checkUnnamed1177(o[0]);
+  checkUnnamed1177(o[1]);
 }
 
-buildUnnamed108() {
+buildUnnamed1179() {
   var o = new core.List<core.List<core.List<api.GeoJsonPosition>>>();
-  o.add(buildUnnamed107());
-  o.add(buildUnnamed107());
+  o.add(buildUnnamed1178());
+  o.add(buildUnnamed1178());
   return o;
 }
 
-checkUnnamed108(core.List<core.List<core.List<api.GeoJsonPosition>>> o) {
+checkUnnamed1179(core.List<core.List<core.List<api.GeoJsonPosition>>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed107(o[0]);
-  checkUnnamed107(o[1]);
+  checkUnnamed1178(o[0]);
+  checkUnnamed1178(o[1]);
 }
 
 core.int buildCounterGeoJsonMultiPolygon = 0;
@@ -706,7 +741,7 @@
   var o = new api.GeoJsonMultiPolygon();
   buildCounterGeoJsonMultiPolygon++;
   if (buildCounterGeoJsonMultiPolygon < 3) {
-    o.coordinates = buildUnnamed108();
+    o.coordinates = buildUnnamed1179();
   }
   buildCounterGeoJsonMultiPolygon--;
   return o;
@@ -715,7 +750,7 @@
 checkGeoJsonMultiPolygon(api.GeoJsonMultiPolygon o) {
   buildCounterGeoJsonMultiPolygon++;
   if (buildCounterGeoJsonMultiPolygon < 3) {
-    checkUnnamed108(o.coordinates);
+    checkUnnamed1179(o.coordinates);
   }
   buildCounterGeoJsonMultiPolygon--;
 }
@@ -739,30 +774,30 @@
   buildCounterGeoJsonPoint--;
 }
 
-buildUnnamed109() {
+buildUnnamed1180() {
   var o = new core.List<api.GeoJsonPosition>();
   o.add(buildGeoJsonPosition());
   o.add(buildGeoJsonPosition());
   return o;
 }
 
-checkUnnamed109(core.List<api.GeoJsonPosition> o) {
+checkUnnamed1180(core.List<api.GeoJsonPosition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGeoJsonPosition(o[0]);
   checkGeoJsonPosition(o[1]);
 }
 
-buildUnnamed110() {
+buildUnnamed1181() {
   var o = new core.List<core.List<api.GeoJsonPosition>>();
-  o.add(buildUnnamed109());
-  o.add(buildUnnamed109());
+  o.add(buildUnnamed1180());
+  o.add(buildUnnamed1180());
   return o;
 }
 
-checkUnnamed110(core.List<core.List<api.GeoJsonPosition>> o) {
+checkUnnamed1181(core.List<core.List<api.GeoJsonPosition>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed109(o[0]);
-  checkUnnamed109(o[1]);
+  checkUnnamed1180(o[0]);
+  checkUnnamed1180(o[1]);
 }
 
 core.int buildCounterGeoJsonPolygon = 0;
@@ -770,7 +805,7 @@
   var o = new api.GeoJsonPolygon();
   buildCounterGeoJsonPolygon++;
   if (buildCounterGeoJsonPolygon < 3) {
-    o.coordinates = buildUnnamed110();
+    o.coordinates = buildUnnamed1181();
   }
   buildCounterGeoJsonPolygon--;
   return o;
@@ -779,7 +814,7 @@
 checkGeoJsonPolygon(api.GeoJsonPolygon o) {
   buildCounterGeoJsonPolygon++;
   if (buildCounterGeoJsonPolygon < 3) {
-    checkUnnamed110(o.coordinates);
+    checkUnnamed1181(o.coordinates);
   }
   buildCounterGeoJsonPolygon--;
 }
@@ -858,14 +893,14 @@
   buildCounterIconStyle--;
 }
 
-buildUnnamed111() {
+buildUnnamed1182() {
   var o = new core.List<api.Icon>();
   o.add(buildIcon());
   o.add(buildIcon());
   return o;
 }
 
-checkUnnamed111(core.List<api.Icon> o) {
+checkUnnamed1182(core.List<api.Icon> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkIcon(o[0]);
   checkIcon(o[1]);
@@ -876,7 +911,7 @@
   var o = new api.IconsListResponse();
   buildCounterIconsListResponse++;
   if (buildCounterIconsListResponse < 3) {
-    o.icons = buildUnnamed111();
+    o.icons = buildUnnamed1182();
     o.nextPageToken = "foo";
   }
   buildCounterIconsListResponse--;
@@ -886,7 +921,7 @@
 checkIconsListResponse(api.IconsListResponse o) {
   buildCounterIconsListResponse++;
   if (buildCounterIconsListResponse < 3) {
-    checkUnnamed111(o.icons);
+    checkUnnamed1182(o.icons);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterIconsListResponse--;
@@ -936,14 +971,14 @@
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed112() {
+buildUnnamed1183() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed112(core.List<core.double> o) {
+checkUnnamed1183(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
@@ -954,7 +989,7 @@
   var o = new api.Layer();
   buildCounterLayer++;
   if (buildCounterLayer < 3) {
-    o.bbox = buildUnnamed112();
+    o.bbox = buildUnnamed1183();
     o.creationTime = core.DateTime.parse("2002-02-27T14:01:02");
     o.creatorEmail = "foo";
     o.datasourceType = "foo";
@@ -982,7 +1017,7 @@
 checkLayer(api.Layer o) {
   buildCounterLayer++;
   if (buildCounterLayer < 3) {
-    checkUnnamed112(o.bbox);
+    checkUnnamed1183(o.bbox);
     unittest.expect(o.creationTime, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.creatorEmail, unittest.equals('foo'));
     unittest.expect(o.datasourceType, unittest.equals('foo'));
@@ -1006,14 +1041,14 @@
   buildCounterLayer--;
 }
 
-buildUnnamed113() {
+buildUnnamed1184() {
   var o = new core.List<api.Layer>();
   o.add(buildLayer());
   o.add(buildLayer());
   return o;
 }
 
-checkUnnamed113(core.List<api.Layer> o) {
+checkUnnamed1184(core.List<api.Layer> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLayer(o[0]);
   checkLayer(o[1]);
@@ -1024,7 +1059,7 @@
   var o = new api.LayersListResponse();
   buildCounterLayersListResponse++;
   if (buildCounterLayersListResponse < 3) {
-    o.layers = buildUnnamed113();
+    o.layers = buildUnnamed1184();
     o.nextPageToken = "foo";
   }
   buildCounterLayersListResponse--;
@@ -1034,20 +1069,20 @@
 checkLayersListResponse(api.LayersListResponse o) {
   buildCounterLayersListResponse++;
   if (buildCounterLayersListResponse < 3) {
-    checkUnnamed113(o.layers);
+    checkUnnamed1184(o.layers);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterLayersListResponse--;
 }
 
-buildUnnamed114() {
+buildUnnamed1185() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed114(core.List<core.double> o) {
+checkUnnamed1185(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
@@ -1082,7 +1117,7 @@
   buildCounterLineStyle++;
   if (buildCounterLineStyle < 3) {
     o.border = buildBorder();
-    o.dash = buildUnnamed114();
+    o.dash = buildUnnamed1185();
     o.label = buildLabelStyle();
     o.stroke = buildLineStyleStroke();
   }
@@ -1094,34 +1129,34 @@
   buildCounterLineStyle++;
   if (buildCounterLineStyle < 3) {
     checkBorder(o.border);
-    checkUnnamed114(o.dash);
+    checkUnnamed1185(o.dash);
     checkLabelStyle(o.label);
     checkLineStyleStroke(o.stroke);
   }
   buildCounterLineStyle--;
 }
 
-buildUnnamed115() {
+buildUnnamed1186() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed115(core.List<core.double> o) {
+checkUnnamed1186(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed116() {
+buildUnnamed1187() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed116(core.List<core.String> o) {
+checkUnnamed1187(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1132,7 +1167,7 @@
   var o = new api.Map();
   buildCounterMap++;
   if (buildCounterMap < 3) {
-    o.bbox = buildUnnamed115();
+    o.bbox = buildUnnamed1186();
     o.contents = buildMapContents();
     o.creationTime = core.DateTime.parse("2002-02-27T14:01:02");
     o.creatorEmail = "foo";
@@ -1149,7 +1184,7 @@
     o.publishedAccessList = "foo";
     o.publishingStatus = "foo";
     o.tags = buildTags();
-    o.versions = buildUnnamed116();
+    o.versions = buildUnnamed1187();
     o.writersCanEditPermissions = true;
   }
   buildCounterMap--;
@@ -1159,7 +1194,7 @@
 checkMap(api.Map o) {
   buildCounterMap++;
   if (buildCounterMap < 3) {
-    checkUnnamed115(o.bbox);
+    checkUnnamed1186(o.bbox);
     checkMapContents(o.contents);
     unittest.expect(o.creationTime, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.creatorEmail, unittest.equals('foo'));
@@ -1176,7 +1211,7 @@
     unittest.expect(o.publishedAccessList, unittest.equals('foo'));
     unittest.expect(o.publishingStatus, unittest.equals('foo'));
     checkTags(o.tags);
-    checkUnnamed116(o.versions);
+    checkUnnamed1187(o.versions);
     unittest.expect(o.writersCanEditPermissions, unittest.isTrue);
   }
   buildCounterMap--;
@@ -1195,27 +1230,27 @@
   checkMapItem(o[1]);
 }
 
-buildUnnamed117() {
+buildUnnamed1188() {
   var o = new core.List<api.MapItem>();
   o.add(buildMapItem());
   o.add(buildMapItem());
   return o;
 }
 
-checkUnnamed117(core.List<api.MapItem> o) {
+checkUnnamed1188(core.List<api.MapItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMapItem(o[0]);
   checkMapItem(o[1]);
 }
 
-buildUnnamed118() {
+buildUnnamed1189() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed118(core.List<core.double> o) {
+checkUnnamed1189(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
@@ -1226,8 +1261,8 @@
   var o = new api.MapFolder();
   buildCounterMapFolder++;
   if (buildCounterMapFolder < 3) {
-    o.contents = buildUnnamed117();
-    o.defaultViewport = buildUnnamed118();
+    o.contents = buildUnnamed1188();
+    o.defaultViewport = buildUnnamed1189();
     o.expandable = true;
     o.key = "foo";
     o.name = "foo";
@@ -1240,8 +1275,8 @@
 checkMapFolder(api.MapFolder o) {
   buildCounterMapFolder++;
   if (buildCounterMapFolder < 3) {
-    checkUnnamed117(o.contents);
-    checkUnnamed118(o.defaultViewport);
+    checkUnnamed1188(o.contents);
+    checkUnnamed1189(o.defaultViewport);
     unittest.expect(o.expandable, unittest.isTrue);
     unittest.expect(o.key, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
@@ -1258,8 +1293,8 @@
   checkMapFolder(api.MapFolder o) {
   buildCounterMapFolder++;
   if (buildCounterMapFolder < 3) {
-    checkUnnamed117(o.contents);
-    checkUnnamed118(o.defaultViewport);
+    checkUnnamed1188(o.contents);
+    checkUnnamed1189(o.defaultViewport);
     unittest.expect(o.expandable, unittest.isTrue);
     unittest.expect(o.key, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
@@ -1271,14 +1306,14 @@
 (o);
 }
 
-buildUnnamed119() {
+buildUnnamed1190() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed119(core.List<core.double> o) {
+checkUnnamed1190(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
@@ -1289,7 +1324,7 @@
   var o = new api.MapKmlLink();
   buildCounterMapKmlLink++;
   if (buildCounterMapKmlLink < 3) {
-    o.defaultViewport = buildUnnamed119();
+    o.defaultViewport = buildUnnamed1190();
     o.kmlUrl = "foo";
     o.name = "foo";
     o.visibility = "foo";
@@ -1301,7 +1336,7 @@
 checkMapKmlLink(api.MapKmlLink o) {
   buildCounterMapKmlLink++;
   if (buildCounterMapKmlLink < 3) {
-    checkUnnamed119(o.defaultViewport);
+    checkUnnamed1190(o.defaultViewport);
     unittest.expect(o.kmlUrl, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.visibility, unittest.equals('foo'));
@@ -1309,14 +1344,14 @@
   buildCounterMapKmlLink--;
 }
 
-buildUnnamed120() {
+buildUnnamed1191() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed120(core.List<core.double> o) {
+checkUnnamed1191(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
@@ -1327,7 +1362,7 @@
   var o = new api.MapLayer();
   buildCounterMapLayer++;
   if (buildCounterMapLayer < 3) {
-    o.defaultViewport = buildUnnamed120();
+    o.defaultViewport = buildUnnamed1191();
     o.id = "foo";
     o.key = "foo";
     o.name = "foo";
@@ -1340,7 +1375,7 @@
 checkMapLayer(api.MapLayer o) {
   buildCounterMapLayer++;
   if (buildCounterMapLayer < 3) {
-    checkUnnamed120(o.defaultViewport);
+    checkUnnamed1191(o.defaultViewport);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.key, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
@@ -1349,14 +1384,14 @@
   buildCounterMapLayer--;
 }
 
-buildUnnamed121() {
+buildUnnamed1192() {
   var o = new core.List<api.Map>();
   o.add(buildMap());
   o.add(buildMap());
   return o;
 }
 
-checkUnnamed121(core.List<api.Map> o) {
+checkUnnamed1192(core.List<api.Map> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMap(o[0]);
   checkMap(o[1]);
@@ -1367,7 +1402,7 @@
   var o = new api.MapsListResponse();
   buildCounterMapsListResponse++;
   if (buildCounterMapsListResponse < 3) {
-    o.maps = buildUnnamed121();
+    o.maps = buildUnnamed1192();
     o.nextPageToken = "foo";
   }
   buildCounterMapsListResponse--;
@@ -1377,7 +1412,7 @@
 checkMapsListResponse(api.MapsListResponse o) {
   buildCounterMapsListResponse++;
   if (buildCounterMapsListResponse < 3) {
-    checkUnnamed121(o.maps);
+    checkUnnamed1192(o.maps);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterMapsListResponse--;
@@ -1402,14 +1437,14 @@
   buildCounterParent--;
 }
 
-buildUnnamed122() {
+buildUnnamed1193() {
   var o = new core.List<api.Parent>();
   o.add(buildParent());
   o.add(buildParent());
   return o;
 }
 
-checkUnnamed122(core.List<api.Parent> o) {
+checkUnnamed1193(core.List<api.Parent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParent(o[0]);
   checkParent(o[1]);
@@ -1421,7 +1456,7 @@
   buildCounterParentsListResponse++;
   if (buildCounterParentsListResponse < 3) {
     o.nextPageToken = "foo";
-    o.parents = buildUnnamed122();
+    o.parents = buildUnnamed1193();
   }
   buildCounterParentsListResponse--;
   return o;
@@ -1431,7 +1466,7 @@
   buildCounterParentsListResponse++;
   if (buildCounterParentsListResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed122(o.parents);
+    checkUnnamed1193(o.parents);
   }
   buildCounterParentsListResponse--;
 }
@@ -1461,14 +1496,14 @@
   buildCounterPermission--;
 }
 
-buildUnnamed123() {
+buildUnnamed1194() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed123(core.List<core.String> o) {
+checkUnnamed1194(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1479,7 +1514,7 @@
   var o = new api.PermissionsBatchDeleteRequest();
   buildCounterPermissionsBatchDeleteRequest++;
   if (buildCounterPermissionsBatchDeleteRequest < 3) {
-    o.ids = buildUnnamed123();
+    o.ids = buildUnnamed1194();
   }
   buildCounterPermissionsBatchDeleteRequest--;
   return o;
@@ -1488,7 +1523,7 @@
 checkPermissionsBatchDeleteRequest(api.PermissionsBatchDeleteRequest o) {
   buildCounterPermissionsBatchDeleteRequest++;
   if (buildCounterPermissionsBatchDeleteRequest < 3) {
-    checkUnnamed123(o.ids);
+    checkUnnamed1194(o.ids);
   }
   buildCounterPermissionsBatchDeleteRequest--;
 }
@@ -1510,14 +1545,14 @@
   buildCounterPermissionsBatchDeleteResponse--;
 }
 
-buildUnnamed124() {
+buildUnnamed1195() {
   var o = new core.List<api.Permission>();
   o.add(buildPermission());
   o.add(buildPermission());
   return o;
 }
 
-checkUnnamed124(core.List<api.Permission> o) {
+checkUnnamed1195(core.List<api.Permission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPermission(o[0]);
   checkPermission(o[1]);
@@ -1528,7 +1563,7 @@
   var o = new api.PermissionsBatchUpdateRequest();
   buildCounterPermissionsBatchUpdateRequest++;
   if (buildCounterPermissionsBatchUpdateRequest < 3) {
-    o.permissions = buildUnnamed124();
+    o.permissions = buildUnnamed1195();
   }
   buildCounterPermissionsBatchUpdateRequest--;
   return o;
@@ -1537,7 +1572,7 @@
 checkPermissionsBatchUpdateRequest(api.PermissionsBatchUpdateRequest o) {
   buildCounterPermissionsBatchUpdateRequest++;
   if (buildCounterPermissionsBatchUpdateRequest < 3) {
-    checkUnnamed124(o.permissions);
+    checkUnnamed1195(o.permissions);
   }
   buildCounterPermissionsBatchUpdateRequest--;
 }
@@ -1559,14 +1594,14 @@
   buildCounterPermissionsBatchUpdateResponse--;
 }
 
-buildUnnamed125() {
+buildUnnamed1196() {
   var o = new core.List<api.Permission>();
   o.add(buildPermission());
   o.add(buildPermission());
   return o;
 }
 
-checkUnnamed125(core.List<api.Permission> o) {
+checkUnnamed1196(core.List<api.Permission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPermission(o[0]);
   checkPermission(o[1]);
@@ -1577,7 +1612,7 @@
   var o = new api.PermissionsListResponse();
   buildCounterPermissionsListResponse++;
   if (buildCounterPermissionsListResponse < 3) {
-    o.permissions = buildUnnamed125();
+    o.permissions = buildUnnamed1196();
   }
   buildCounterPermissionsListResponse--;
   return o;
@@ -1586,7 +1621,7 @@
 checkPermissionsListResponse(api.PermissionsListResponse o) {
   buildCounterPermissionsListResponse++;
   if (buildCounterPermissionsListResponse < 3) {
-    checkUnnamed125(o.permissions);
+    checkUnnamed1196(o.permissions);
   }
   buildCounterPermissionsListResponse--;
 }
@@ -1673,14 +1708,14 @@
   buildCounterProject--;
 }
 
-buildUnnamed126() {
+buildUnnamed1197() {
   var o = new core.List<api.Project>();
   o.add(buildProject());
   o.add(buildProject());
   return o;
 }
 
-checkUnnamed126(core.List<api.Project> o) {
+checkUnnamed1197(core.List<api.Project> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProject(o[0]);
   checkProject(o[1]);
@@ -1691,7 +1726,7 @@
   var o = new api.ProjectsListResponse();
   buildCounterProjectsListResponse++;
   if (buildCounterProjectsListResponse < 3) {
-    o.projects = buildUnnamed126();
+    o.projects = buildUnnamed1197();
   }
   buildCounterProjectsListResponse--;
   return o;
@@ -1700,7 +1735,7 @@
 checkProjectsListResponse(api.ProjectsListResponse o) {
   buildCounterProjectsListResponse++;
   if (buildCounterProjectsListResponse < 3) {
-    checkUnnamed126(o.projects);
+    checkUnnamed1197(o.projects);
   }
   buildCounterProjectsListResponse--;
 }
@@ -1749,14 +1784,14 @@
   buildCounterPublishedLayer--;
 }
 
-buildUnnamed127() {
+buildUnnamed1198() {
   var o = new core.List<api.PublishedLayer>();
   o.add(buildPublishedLayer());
   o.add(buildPublishedLayer());
   return o;
 }
 
-checkUnnamed127(core.List<api.PublishedLayer> o) {
+checkUnnamed1198(core.List<api.PublishedLayer> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPublishedLayer(o[0]);
   checkPublishedLayer(o[1]);
@@ -1767,7 +1802,7 @@
   var o = new api.PublishedLayersListResponse();
   buildCounterPublishedLayersListResponse++;
   if (buildCounterPublishedLayersListResponse < 3) {
-    o.layers = buildUnnamed127();
+    o.layers = buildUnnamed1198();
     o.nextPageToken = "foo";
   }
   buildCounterPublishedLayersListResponse--;
@@ -1777,7 +1812,7 @@
 checkPublishedLayersListResponse(api.PublishedLayersListResponse o) {
   buildCounterPublishedLayersListResponse++;
   if (buildCounterPublishedLayersListResponse < 3) {
-    checkUnnamed127(o.layers);
+    checkUnnamed1198(o.layers);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterPublishedLayersListResponse--;
@@ -1812,14 +1847,14 @@
   buildCounterPublishedMap--;
 }
 
-buildUnnamed128() {
+buildUnnamed1199() {
   var o = new core.List<api.PublishedMap>();
   o.add(buildPublishedMap());
   o.add(buildPublishedMap());
   return o;
 }
 
-checkUnnamed128(core.List<api.PublishedMap> o) {
+checkUnnamed1199(core.List<api.PublishedMap> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPublishedMap(o[0]);
   checkPublishedMap(o[1]);
@@ -1830,7 +1865,7 @@
   var o = new api.PublishedMapsListResponse();
   buildCounterPublishedMapsListResponse++;
   if (buildCounterPublishedMapsListResponse < 3) {
-    o.maps = buildUnnamed128();
+    o.maps = buildUnnamed1199();
     o.nextPageToken = "foo";
   }
   buildCounterPublishedMapsListResponse--;
@@ -1840,33 +1875,33 @@
 checkPublishedMapsListResponse(api.PublishedMapsListResponse o) {
   buildCounterPublishedMapsListResponse++;
   if (buildCounterPublishedMapsListResponse < 3) {
-    checkUnnamed128(o.maps);
+    checkUnnamed1199(o.maps);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterPublishedMapsListResponse--;
 }
 
-buildUnnamed129() {
+buildUnnamed1200() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed129(core.List<core.double> o) {
+checkUnnamed1200(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed130() {
+buildUnnamed1201() {
   var o = new core.List<api.File>();
   o.add(buildFile());
   o.add(buildFile());
   return o;
 }
 
-checkUnnamed130(core.List<api.File> o) {
+checkUnnamed1201(core.List<api.File> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFile(o[0]);
   checkFile(o[1]);
@@ -1879,13 +1914,13 @@
   if (buildCounterRaster < 3) {
     o.acquisitionTime = buildAcquisitionTime();
     o.attribution = "foo";
-    o.bbox = buildUnnamed129();
+    o.bbox = buildUnnamed1200();
     o.creationTime = core.DateTime.parse("2002-02-27T14:01:02");
     o.creatorEmail = "foo";
     o.description = "foo";
     o.draftAccessList = "foo";
     o.etag = "foo";
-    o.files = buildUnnamed130();
+    o.files = buildUnnamed1201();
     o.id = "foo";
     o.lastModifiedTime = core.DateTime.parse("2002-02-27T14:01:02");
     o.lastModifierEmail = "foo";
@@ -1906,13 +1941,13 @@
   if (buildCounterRaster < 3) {
     checkAcquisitionTime(o.acquisitionTime);
     unittest.expect(o.attribution, unittest.equals('foo'));
-    checkUnnamed129(o.bbox);
+    checkUnnamed1200(o.bbox);
     unittest.expect(o.creationTime, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.creatorEmail, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.draftAccessList, unittest.equals('foo'));
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed130(o.files);
+    checkUnnamed1201(o.files);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.lastModifiedTime, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.lastModifierEmail, unittest.equals('foo'));
@@ -1927,14 +1962,14 @@
   buildCounterRaster--;
 }
 
-buildUnnamed131() {
+buildUnnamed1202() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed131(core.List<core.double> o) {
+checkUnnamed1202(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
@@ -1946,7 +1981,7 @@
   buildCounterRasterCollection++;
   if (buildCounterRasterCollection < 3) {
     o.attribution = "foo";
-    o.bbox = buildUnnamed131();
+    o.bbox = buildUnnamed1202();
     o.creationTime = core.DateTime.parse("2002-02-27T14:01:02");
     o.creatorEmail = "foo";
     o.description = "foo";
@@ -1971,7 +2006,7 @@
   buildCounterRasterCollection++;
   if (buildCounterRasterCollection < 3) {
     unittest.expect(o.attribution, unittest.equals('foo'));
-    checkUnnamed131(o.bbox);
+    checkUnnamed1202(o.bbox);
     unittest.expect(o.creationTime, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.creatorEmail, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
@@ -1991,14 +2026,14 @@
   buildCounterRasterCollection--;
 }
 
-buildUnnamed132() {
+buildUnnamed1203() {
   var o = new core.List<api.RasterCollection>();
   o.add(buildRasterCollection());
   o.add(buildRasterCollection());
   return o;
 }
 
-checkUnnamed132(core.List<api.RasterCollection> o) {
+checkUnnamed1203(core.List<api.RasterCollection> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRasterCollection(o[0]);
   checkRasterCollection(o[1]);
@@ -2010,7 +2045,7 @@
   buildCounterRasterCollectionsListResponse++;
   if (buildCounterRasterCollectionsListResponse < 3) {
     o.nextPageToken = "foo";
-    o.rasterCollections = buildUnnamed132();
+    o.rasterCollections = buildUnnamed1203();
   }
   buildCounterRasterCollectionsListResponse--;
   return o;
@@ -2020,32 +2055,32 @@
   buildCounterRasterCollectionsListResponse++;
   if (buildCounterRasterCollectionsListResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed132(o.rasterCollections);
+    checkUnnamed1203(o.rasterCollections);
   }
   buildCounterRasterCollectionsListResponse--;
 }
 
-buildUnnamed133() {
+buildUnnamed1204() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed133(core.List<core.double> o) {
+checkUnnamed1204(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed134() {
+buildUnnamed1205() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed134(core.List<core.String> o) {
+checkUnnamed1205(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2056,7 +2091,7 @@
   var o = new api.RasterCollectionsRaster();
   buildCounterRasterCollectionsRaster++;
   if (buildCounterRasterCollectionsRaster < 3) {
-    o.bbox = buildUnnamed133();
+    o.bbox = buildUnnamed1204();
     o.creationTime = core.DateTime.parse("2002-02-27T14:01:02");
     o.description = "foo";
     o.id = "foo";
@@ -2064,7 +2099,7 @@
     o.name = "foo";
     o.projectId = "foo";
     o.rasterType = "foo";
-    o.tags = buildUnnamed134();
+    o.tags = buildUnnamed1205();
   }
   buildCounterRasterCollectionsRaster--;
   return o;
@@ -2073,7 +2108,7 @@
 checkRasterCollectionsRaster(api.RasterCollectionsRaster o) {
   buildCounterRasterCollectionsRaster++;
   if (buildCounterRasterCollectionsRaster < 3) {
-    checkUnnamed133(o.bbox);
+    checkUnnamed1204(o.bbox);
     unittest.expect(o.creationTime, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
@@ -2081,19 +2116,19 @@
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.projectId, unittest.equals('foo'));
     unittest.expect(o.rasterType, unittest.equals('foo'));
-    checkUnnamed134(o.tags);
+    checkUnnamed1205(o.tags);
   }
   buildCounterRasterCollectionsRaster--;
 }
 
-buildUnnamed135() {
+buildUnnamed1206() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed135(core.List<core.String> o) {
+checkUnnamed1206(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2104,7 +2139,7 @@
   var o = new api.RasterCollectionsRasterBatchDeleteRequest();
   buildCounterRasterCollectionsRasterBatchDeleteRequest++;
   if (buildCounterRasterCollectionsRasterBatchDeleteRequest < 3) {
-    o.ids = buildUnnamed135();
+    o.ids = buildUnnamed1206();
   }
   buildCounterRasterCollectionsRasterBatchDeleteRequest--;
   return o;
@@ -2113,7 +2148,7 @@
 checkRasterCollectionsRasterBatchDeleteRequest(api.RasterCollectionsRasterBatchDeleteRequest o) {
   buildCounterRasterCollectionsRasterBatchDeleteRequest++;
   if (buildCounterRasterCollectionsRasterBatchDeleteRequest < 3) {
-    checkUnnamed135(o.ids);
+    checkUnnamed1206(o.ids);
   }
   buildCounterRasterCollectionsRasterBatchDeleteRequest--;
 }
@@ -2135,14 +2170,14 @@
   buildCounterRasterCollectionsRastersBatchDeleteResponse--;
 }
 
-buildUnnamed136() {
+buildUnnamed1207() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed136(core.List<core.String> o) {
+checkUnnamed1207(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2153,7 +2188,7 @@
   var o = new api.RasterCollectionsRastersBatchInsertRequest();
   buildCounterRasterCollectionsRastersBatchInsertRequest++;
   if (buildCounterRasterCollectionsRastersBatchInsertRequest < 3) {
-    o.ids = buildUnnamed136();
+    o.ids = buildUnnamed1207();
   }
   buildCounterRasterCollectionsRastersBatchInsertRequest--;
   return o;
@@ -2162,7 +2197,7 @@
 checkRasterCollectionsRastersBatchInsertRequest(api.RasterCollectionsRastersBatchInsertRequest o) {
   buildCounterRasterCollectionsRastersBatchInsertRequest++;
   if (buildCounterRasterCollectionsRastersBatchInsertRequest < 3) {
-    checkUnnamed136(o.ids);
+    checkUnnamed1207(o.ids);
   }
   buildCounterRasterCollectionsRastersBatchInsertRequest--;
 }
@@ -2184,14 +2219,14 @@
   buildCounterRasterCollectionsRastersBatchInsertResponse--;
 }
 
-buildUnnamed137() {
+buildUnnamed1208() {
   var o = new core.List<api.RasterCollectionsRaster>();
   o.add(buildRasterCollectionsRaster());
   o.add(buildRasterCollectionsRaster());
   return o;
 }
 
-checkUnnamed137(core.List<api.RasterCollectionsRaster> o) {
+checkUnnamed1208(core.List<api.RasterCollectionsRaster> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRasterCollectionsRaster(o[0]);
   checkRasterCollectionsRaster(o[1]);
@@ -2203,7 +2238,7 @@
   buildCounterRasterCollectionsRastersListResponse++;
   if (buildCounterRasterCollectionsRastersListResponse < 3) {
     o.nextPageToken = "foo";
-    o.rasters = buildUnnamed137();
+    o.rasters = buildUnnamed1208();
   }
   buildCounterRasterCollectionsRastersListResponse--;
   return o;
@@ -2213,19 +2248,19 @@
   buildCounterRasterCollectionsRastersListResponse++;
   if (buildCounterRasterCollectionsRastersListResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed137(o.rasters);
+    checkUnnamed1208(o.rasters);
   }
   buildCounterRasterCollectionsRastersListResponse--;
 }
 
-buildUnnamed138() {
+buildUnnamed1209() {
   var o = new core.List<api.Raster>();
   o.add(buildRaster());
   o.add(buildRaster());
   return o;
 }
 
-checkUnnamed138(core.List<api.Raster> o) {
+checkUnnamed1209(core.List<api.Raster> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRaster(o[0]);
   checkRaster(o[1]);
@@ -2237,7 +2272,7 @@
   buildCounterRastersListResponse++;
   if (buildCounterRastersListResponse < 3) {
     o.nextPageToken = "foo";
-    o.rasters = buildUnnamed138();
+    o.rasters = buildUnnamed1209();
   }
   buildCounterRastersListResponse--;
   return o;
@@ -2247,7 +2282,7 @@
   buildCounterRastersListResponse++;
   if (buildCounterRastersListResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed138(o.rasters);
+    checkUnnamed1209(o.rasters);
   }
   buildCounterRastersListResponse--;
 }
@@ -2300,14 +2335,14 @@
   buildCounterScalingFunction--;
 }
 
-buildUnnamed139() {
+buildUnnamed1210() {
   var o = new core.List<api.TableColumn>();
   o.add(buildTableColumn());
   o.add(buildTableColumn());
   return o;
 }
 
-checkUnnamed139(core.List<api.TableColumn> o) {
+checkUnnamed1210(core.List<api.TableColumn> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableColumn(o[0]);
   checkTableColumn(o[1]);
@@ -2318,7 +2353,7 @@
   var o = new api.Schema();
   buildCounterSchema++;
   if (buildCounterSchema < 3) {
-    o.columns = buildUnnamed139();
+    o.columns = buildUnnamed1210();
     o.primaryGeometry = "foo";
     o.primaryKey = "foo";
   }
@@ -2329,7 +2364,7 @@
 checkSchema(api.Schema o) {
   buildCounterSchema++;
   if (buildCounterSchema < 3) {
-    checkUnnamed139(o.columns);
+    checkUnnamed1210(o.columns);
     unittest.expect(o.primaryGeometry, unittest.equals('foo'));
     unittest.expect(o.primaryKey, unittest.equals('foo'));
   }
@@ -2357,27 +2392,27 @@
   buildCounterSizeRange--;
 }
 
-buildUnnamed140() {
+buildUnnamed1211() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed140(core.List<core.double> o) {
+checkUnnamed1211(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed141() {
+buildUnnamed1212() {
   var o = new core.List<api.File>();
   o.add(buildFile());
   o.add(buildFile());
   return o;
 }
 
-checkUnnamed141(core.List<api.File> o) {
+checkUnnamed1212(core.List<api.File> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFile(o[0]);
   checkFile(o[1]);
@@ -2388,13 +2423,13 @@
   var o = new api.Table();
   buildCounterTable++;
   if (buildCounterTable < 3) {
-    o.bbox = buildUnnamed140();
+    o.bbox = buildUnnamed1211();
     o.creationTime = core.DateTime.parse("2002-02-27T14:01:02");
     o.creatorEmail = "foo";
     o.description = "foo";
     o.draftAccessList = "foo";
     o.etag = "foo";
-    o.files = buildUnnamed141();
+    o.files = buildUnnamed1212();
     o.id = "foo";
     o.lastModifiedTime = core.DateTime.parse("2002-02-27T14:01:02");
     o.lastModifierEmail = "foo";
@@ -2414,13 +2449,13 @@
 checkTable(api.Table o) {
   buildCounterTable++;
   if (buildCounterTable < 3) {
-    checkUnnamed140(o.bbox);
+    checkUnnamed1211(o.bbox);
     unittest.expect(o.creationTime, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.creatorEmail, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.draftAccessList, unittest.equals('foo'));
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed141(o.files);
+    checkUnnamed1212(o.files);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.lastModifiedTime, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.lastModifierEmail, unittest.equals('foo'));
@@ -2457,14 +2492,14 @@
   buildCounterTableColumn--;
 }
 
-buildUnnamed142() {
+buildUnnamed1213() {
   var o = new core.List<api.Table>();
   o.add(buildTable());
   o.add(buildTable());
   return o;
 }
 
-checkUnnamed142(core.List<api.Table> o) {
+checkUnnamed1213(core.List<api.Table> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTable(o[0]);
   checkTable(o[1]);
@@ -2476,7 +2511,7 @@
   buildCounterTablesListResponse++;
   if (buildCounterTablesListResponse < 3) {
     o.nextPageToken = "foo";
-    o.tables = buildUnnamed142();
+    o.tables = buildUnnamed1213();
   }
   buildCounterTablesListResponse--;
   return o;
@@ -2486,7 +2521,7 @@
   buildCounterTablesListResponse++;
   if (buildCounterTablesListResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed142(o.tables);
+    checkUnnamed1213(o.tables);
   }
   buildCounterTablesListResponse--;
 }
@@ -2525,14 +2560,14 @@
   buildCounterValueRange--;
 }
 
-buildUnnamed143() {
+buildUnnamed1214() {
   var o = new core.List<api.DisplayRule>();
   o.add(buildDisplayRule());
   o.add(buildDisplayRule());
   return o;
 }
 
-checkUnnamed143(core.List<api.DisplayRule> o) {
+checkUnnamed1214(core.List<api.DisplayRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDisplayRule(o[0]);
   checkDisplayRule(o[1]);
@@ -2543,7 +2578,7 @@
   var o = new api.VectorStyle();
   buildCounterVectorStyle++;
   if (buildCounterVectorStyle < 3) {
-    o.displayRules = buildUnnamed143();
+    o.displayRules = buildUnnamed1214();
     o.featureInfo = buildFeatureInfo();
     o.type = "foo";
   }
@@ -2554,7 +2589,7 @@
 checkVectorStyle(api.VectorStyle o) {
   buildCounterVectorStyle++;
   if (buildCounterVectorStyle < 3) {
-    checkUnnamed143(o.displayRules);
+    checkUnnamed1214(o.displayRules);
     checkFeatureInfo(o.featureInfo);
     unittest.expect(o.type, unittest.equals('foo'));
   }
@@ -3316,7 +3351,7 @@
   unittest.group("resource-AssetsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AssetsResourceApi res = new api.MapsengineApi(mock).assets;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -3356,7 +3391,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAsset());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_id).then(unittest.expectAsync(((api.Asset response) {
         checkAsset(response);
@@ -3365,7 +3400,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AssetsResourceApi res = new api.MapsengineApi(mock).assets;
       var arg_bbox = "foo";
       var arg_createdAfter = core.DateTime.parse("2002-02-27T14:01:02");
@@ -3427,7 +3462,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAssetsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(bbox: arg_bbox, createdAfter: arg_createdAfter, createdBefore: arg_createdBefore, creatorEmail: arg_creatorEmail, maxResults: arg_maxResults, modifiedAfter: arg_modifiedAfter, modifiedBefore: arg_modifiedBefore, pageToken: arg_pageToken, projectId: arg_projectId, role: arg_role, search: arg_search, tags: arg_tags, type: arg_type).then(unittest.expectAsync(((api.AssetsListResponse response) {
         checkAssetsListResponse(response);
@@ -3440,7 +3475,7 @@
   unittest.group("resource-AssetsParentsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AssetsParentsResourceApi res = new api.MapsengineApi(mock).assets.parents;
       var arg_id = "foo";
       var arg_maxResults = 42;
@@ -3488,7 +3523,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildParentsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_id, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.ParentsListResponse response) {
         checkParentsListResponse(response);
@@ -3501,7 +3536,7 @@
   unittest.group("resource-AssetsPermissionsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AssetsPermissionsResourceApi res = new api.MapsengineApi(mock).assets.permissions;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -3545,7 +3580,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPermissionsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_id).then(unittest.expectAsync(((api.PermissionsListResponse response) {
         checkPermissionsListResponse(response);
@@ -3558,7 +3593,7 @@
   unittest.group("resource-LayersResourceApi", () {
     unittest.test("method--cancelProcessing", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LayersResourceApi res = new api.MapsengineApi(mock).layers;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -3602,7 +3637,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProcessResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.cancelProcessing(arg_id).then(unittest.expectAsync(((api.ProcessResponse response) {
         checkProcessResponse(response);
@@ -3611,7 +3646,7 @@
 
     unittest.test("method--create", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LayersResourceApi res = new api.MapsengineApi(mock).layers;
       var arg_request = buildLayer();
       var arg_process_1 = true;
@@ -3653,7 +3688,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLayer());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.create(arg_request, process_1: arg_process_1).then(unittest.expectAsync(((api.Layer response) {
         checkLayer(response);
@@ -3662,7 +3697,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LayersResourceApi res = new api.MapsengineApi(mock).layers;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -3702,14 +3737,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LayersResourceApi res = new api.MapsengineApi(mock).layers;
       var arg_id = "foo";
       var arg_version = "foo";
@@ -3751,7 +3786,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLayer());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_id, version: arg_version).then(unittest.expectAsync(((api.Layer response) {
         checkLayer(response);
@@ -3760,7 +3795,7 @@
 
     unittest.test("method--getPublished", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LayersResourceApi res = new api.MapsengineApi(mock).layers;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -3804,7 +3839,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPublishedLayer());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.getPublished(arg_id).then(unittest.expectAsync(((api.PublishedLayer response) {
         checkPublishedLayer(response);
@@ -3813,7 +3848,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LayersResourceApi res = new api.MapsengineApi(mock).layers;
       var arg_bbox = "foo";
       var arg_createdAfter = core.DateTime.parse("2002-02-27T14:01:02");
@@ -3875,7 +3910,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLayersListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(bbox: arg_bbox, createdAfter: arg_createdAfter, createdBefore: arg_createdBefore, creatorEmail: arg_creatorEmail, maxResults: arg_maxResults, modifiedAfter: arg_modifiedAfter, modifiedBefore: arg_modifiedBefore, pageToken: arg_pageToken, processingStatus: arg_processingStatus, projectId: arg_projectId, role: arg_role, search: arg_search, tags: arg_tags).then(unittest.expectAsync(((api.LayersListResponse response) {
         checkLayersListResponse(response);
@@ -3884,7 +3919,7 @@
 
     unittest.test("method--listPublished", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LayersResourceApi res = new api.MapsengineApi(mock).layers;
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
@@ -3926,7 +3961,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPublishedLayersListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.listPublished(maxResults: arg_maxResults, pageToken: arg_pageToken, projectId: arg_projectId).then(unittest.expectAsync(((api.PublishedLayersListResponse response) {
         checkPublishedLayersListResponse(response);
@@ -3935,7 +3970,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LayersResourceApi res = new api.MapsengineApi(mock).layers;
       var arg_request = buildLayer();
       var arg_id = "foo";
@@ -3979,14 +4014,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--process", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LayersResourceApi res = new api.MapsengineApi(mock).layers;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -4030,7 +4065,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProcessResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.process(arg_id).then(unittest.expectAsync(((api.ProcessResponse response) {
         checkProcessResponse(response);
@@ -4039,7 +4074,7 @@
 
     unittest.test("method--publish", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LayersResourceApi res = new api.MapsengineApi(mock).layers;
       var arg_id = "foo";
       var arg_force = true;
@@ -4085,7 +4120,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPublishResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.publish(arg_id, force: arg_force).then(unittest.expectAsync(((api.PublishResponse response) {
         checkPublishResponse(response);
@@ -4094,7 +4129,7 @@
 
     unittest.test("method--unpublish", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LayersResourceApi res = new api.MapsengineApi(mock).layers;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -4138,7 +4173,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPublishResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.unpublish(arg_id).then(unittest.expectAsync(((api.PublishResponse response) {
         checkPublishResponse(response);
@@ -4151,7 +4186,7 @@
   unittest.group("resource-LayersParentsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LayersParentsResourceApi res = new api.MapsengineApi(mock).layers.parents;
       var arg_id = "foo";
       var arg_maxResults = 42;
@@ -4199,7 +4234,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildParentsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_id, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.ParentsListResponse response) {
         checkParentsListResponse(response);
@@ -4212,7 +4247,7 @@
   unittest.group("resource-LayersPermissionsResourceApi", () {
     unittest.test("method--batchDelete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LayersPermissionsResourceApi res = new api.MapsengineApi(mock).layers.permissions;
       var arg_request = buildPermissionsBatchDeleteRequest();
       var arg_id = "foo";
@@ -4260,7 +4295,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPermissionsBatchDeleteResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.batchDelete(arg_request, arg_id).then(unittest.expectAsync(((api.PermissionsBatchDeleteResponse response) {
         checkPermissionsBatchDeleteResponse(response);
@@ -4269,7 +4304,7 @@
 
     unittest.test("method--batchUpdate", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LayersPermissionsResourceApi res = new api.MapsengineApi(mock).layers.permissions;
       var arg_request = buildPermissionsBatchUpdateRequest();
       var arg_id = "foo";
@@ -4317,7 +4352,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPermissionsBatchUpdateResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.batchUpdate(arg_request, arg_id).then(unittest.expectAsync(((api.PermissionsBatchUpdateResponse response) {
         checkPermissionsBatchUpdateResponse(response);
@@ -4326,7 +4361,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LayersPermissionsResourceApi res = new api.MapsengineApi(mock).layers.permissions;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -4370,7 +4405,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPermissionsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_id).then(unittest.expectAsync(((api.PermissionsListResponse response) {
         checkPermissionsListResponse(response);
@@ -4383,7 +4418,7 @@
   unittest.group("resource-MapsResourceApi", () {
     unittest.test("method--create", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MapsResourceApi res = new api.MapsengineApi(mock).maps;
       var arg_request = buildMap();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -4423,7 +4458,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMap());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.create(arg_request).then(unittest.expectAsync(((api.Map response) {
         checkMap(response);
@@ -4432,7 +4467,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MapsResourceApi res = new api.MapsengineApi(mock).maps;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -4472,14 +4507,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MapsResourceApi res = new api.MapsengineApi(mock).maps;
       var arg_id = "foo";
       var arg_version = "foo";
@@ -4521,7 +4556,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMap());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_id, version: arg_version).then(unittest.expectAsync(((api.Map response) {
         checkMap(response);
@@ -4530,7 +4565,7 @@
 
     unittest.test("method--getPublished", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MapsResourceApi res = new api.MapsengineApi(mock).maps;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -4574,7 +4609,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPublishedMap());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.getPublished(arg_id).then(unittest.expectAsync(((api.PublishedMap response) {
         checkPublishedMap(response);
@@ -4583,7 +4618,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MapsResourceApi res = new api.MapsengineApi(mock).maps;
       var arg_bbox = "foo";
       var arg_createdAfter = core.DateTime.parse("2002-02-27T14:01:02");
@@ -4645,7 +4680,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMapsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(bbox: arg_bbox, createdAfter: arg_createdAfter, createdBefore: arg_createdBefore, creatorEmail: arg_creatorEmail, maxResults: arg_maxResults, modifiedAfter: arg_modifiedAfter, modifiedBefore: arg_modifiedBefore, pageToken: arg_pageToken, processingStatus: arg_processingStatus, projectId: arg_projectId, role: arg_role, search: arg_search, tags: arg_tags).then(unittest.expectAsync(((api.MapsListResponse response) {
         checkMapsListResponse(response);
@@ -4654,7 +4689,7 @@
 
     unittest.test("method--listPublished", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MapsResourceApi res = new api.MapsengineApi(mock).maps;
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
@@ -4696,7 +4731,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPublishedMapsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.listPublished(maxResults: arg_maxResults, pageToken: arg_pageToken, projectId: arg_projectId).then(unittest.expectAsync(((api.PublishedMapsListResponse response) {
         checkPublishedMapsListResponse(response);
@@ -4705,7 +4740,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MapsResourceApi res = new api.MapsengineApi(mock).maps;
       var arg_request = buildMap();
       var arg_id = "foo";
@@ -4749,14 +4784,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--publish", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MapsResourceApi res = new api.MapsengineApi(mock).maps;
       var arg_id = "foo";
       var arg_force = true;
@@ -4802,7 +4837,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPublishResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.publish(arg_id, force: arg_force).then(unittest.expectAsync(((api.PublishResponse response) {
         checkPublishResponse(response);
@@ -4811,7 +4846,7 @@
 
     unittest.test("method--unpublish", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MapsResourceApi res = new api.MapsengineApi(mock).maps;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -4855,7 +4890,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPublishResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.unpublish(arg_id).then(unittest.expectAsync(((api.PublishResponse response) {
         checkPublishResponse(response);
@@ -4868,7 +4903,7 @@
   unittest.group("resource-MapsPermissionsResourceApi", () {
     unittest.test("method--batchDelete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MapsPermissionsResourceApi res = new api.MapsengineApi(mock).maps.permissions;
       var arg_request = buildPermissionsBatchDeleteRequest();
       var arg_id = "foo";
@@ -4916,7 +4951,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPermissionsBatchDeleteResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.batchDelete(arg_request, arg_id).then(unittest.expectAsync(((api.PermissionsBatchDeleteResponse response) {
         checkPermissionsBatchDeleteResponse(response);
@@ -4925,7 +4960,7 @@
 
     unittest.test("method--batchUpdate", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MapsPermissionsResourceApi res = new api.MapsengineApi(mock).maps.permissions;
       var arg_request = buildPermissionsBatchUpdateRequest();
       var arg_id = "foo";
@@ -4973,7 +5008,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPermissionsBatchUpdateResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.batchUpdate(arg_request, arg_id).then(unittest.expectAsync(((api.PermissionsBatchUpdateResponse response) {
         checkPermissionsBatchUpdateResponse(response);
@@ -4982,7 +5017,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MapsPermissionsResourceApi res = new api.MapsengineApi(mock).maps.permissions;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -5026,7 +5061,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPermissionsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_id).then(unittest.expectAsync(((api.PermissionsListResponse response) {
         checkPermissionsListResponse(response);
@@ -5039,7 +5074,7 @@
   unittest.group("resource-ProjectsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ProjectsResourceApi res = new api.MapsengineApi(mock).projects;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -5075,7 +5110,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProjectsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list().then(unittest.expectAsync(((api.ProjectsListResponse response) {
         checkProjectsListResponse(response);
@@ -5090,7 +5125,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ProjectsIconsResourceApi res = new api.MapsengineApi(mock).projects.icons;
       var arg_request = buildIcon();
       var arg_projectId = "foo";
@@ -5138,7 +5173,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildIcon());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.create(arg_request, arg_projectId).then(unittest.expectAsync(((api.Icon response) {
         checkIcon(response);
@@ -5149,7 +5184,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ProjectsIconsResourceApi res = new api.MapsengineApi(mock).projects.icons;
       var arg_projectId = "foo";
       var arg_id = "foo";
@@ -5197,7 +5232,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildIcon());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_projectId, arg_id).then(unittest.expectAsync(((api.Icon response) {
         checkIcon(response);
@@ -5206,7 +5241,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ProjectsIconsResourceApi res = new api.MapsengineApi(mock).projects.icons;
       var arg_projectId = "foo";
       var arg_maxResults = 42;
@@ -5254,7 +5289,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildIconsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_projectId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.IconsListResponse response) {
         checkIconsListResponse(response);
@@ -5267,7 +5302,7 @@
   unittest.group("resource-RasterCollectionsResourceApi", () {
     unittest.test("method--cancelProcessing", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RasterCollectionsResourceApi res = new api.MapsengineApi(mock).rasterCollections;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -5311,7 +5346,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProcessResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.cancelProcessing(arg_id).then(unittest.expectAsync(((api.ProcessResponse response) {
         checkProcessResponse(response);
@@ -5320,7 +5355,7 @@
 
     unittest.test("method--create", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RasterCollectionsResourceApi res = new api.MapsengineApi(mock).rasterCollections;
       var arg_request = buildRasterCollection();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -5360,7 +5395,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRasterCollection());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.create(arg_request).then(unittest.expectAsync(((api.RasterCollection response) {
         checkRasterCollection(response);
@@ -5369,7 +5404,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RasterCollectionsResourceApi res = new api.MapsengineApi(mock).rasterCollections;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -5409,14 +5444,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RasterCollectionsResourceApi res = new api.MapsengineApi(mock).rasterCollections;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -5456,7 +5491,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRasterCollection());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_id).then(unittest.expectAsync(((api.RasterCollection response) {
         checkRasterCollection(response);
@@ -5465,7 +5500,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RasterCollectionsResourceApi res = new api.MapsengineApi(mock).rasterCollections;
       var arg_bbox = "foo";
       var arg_createdAfter = core.DateTime.parse("2002-02-27T14:01:02");
@@ -5527,7 +5562,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRasterCollectionsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(bbox: arg_bbox, createdAfter: arg_createdAfter, createdBefore: arg_createdBefore, creatorEmail: arg_creatorEmail, maxResults: arg_maxResults, modifiedAfter: arg_modifiedAfter, modifiedBefore: arg_modifiedBefore, pageToken: arg_pageToken, processingStatus: arg_processingStatus, projectId: arg_projectId, role: arg_role, search: arg_search, tags: arg_tags).then(unittest.expectAsync(((api.RasterCollectionsListResponse response) {
         checkRasterCollectionsListResponse(response);
@@ -5536,7 +5571,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RasterCollectionsResourceApi res = new api.MapsengineApi(mock).rasterCollections;
       var arg_request = buildRasterCollection();
       var arg_id = "foo";
@@ -5580,14 +5615,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--process", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RasterCollectionsResourceApi res = new api.MapsengineApi(mock).rasterCollections;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -5631,7 +5666,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProcessResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.process(arg_id).then(unittest.expectAsync(((api.ProcessResponse response) {
         checkProcessResponse(response);
@@ -5644,7 +5679,7 @@
   unittest.group("resource-RasterCollectionsParentsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RasterCollectionsParentsResourceApi res = new api.MapsengineApi(mock).rasterCollections.parents;
       var arg_id = "foo";
       var arg_maxResults = 42;
@@ -5692,7 +5727,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildParentsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_id, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.ParentsListResponse response) {
         checkParentsListResponse(response);
@@ -5705,7 +5740,7 @@
   unittest.group("resource-RasterCollectionsPermissionsResourceApi", () {
     unittest.test("method--batchDelete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RasterCollectionsPermissionsResourceApi res = new api.MapsengineApi(mock).rasterCollections.permissions;
       var arg_request = buildPermissionsBatchDeleteRequest();
       var arg_id = "foo";
@@ -5753,7 +5788,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPermissionsBatchDeleteResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.batchDelete(arg_request, arg_id).then(unittest.expectAsync(((api.PermissionsBatchDeleteResponse response) {
         checkPermissionsBatchDeleteResponse(response);
@@ -5762,7 +5797,7 @@
 
     unittest.test("method--batchUpdate", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RasterCollectionsPermissionsResourceApi res = new api.MapsengineApi(mock).rasterCollections.permissions;
       var arg_request = buildPermissionsBatchUpdateRequest();
       var arg_id = "foo";
@@ -5810,7 +5845,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPermissionsBatchUpdateResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.batchUpdate(arg_request, arg_id).then(unittest.expectAsync(((api.PermissionsBatchUpdateResponse response) {
         checkPermissionsBatchUpdateResponse(response);
@@ -5819,7 +5854,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RasterCollectionsPermissionsResourceApi res = new api.MapsengineApi(mock).rasterCollections.permissions;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -5863,7 +5898,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPermissionsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_id).then(unittest.expectAsync(((api.PermissionsListResponse response) {
         checkPermissionsListResponse(response);
@@ -5876,7 +5911,7 @@
   unittest.group("resource-RasterCollectionsRastersResourceApi", () {
     unittest.test("method--batchDelete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RasterCollectionsRastersResourceApi res = new api.MapsengineApi(mock).rasterCollections.rasters;
       var arg_request = buildRasterCollectionsRasterBatchDeleteRequest();
       var arg_id = "foo";
@@ -5924,7 +5959,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRasterCollectionsRastersBatchDeleteResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.batchDelete(arg_request, arg_id).then(unittest.expectAsync(((api.RasterCollectionsRastersBatchDeleteResponse response) {
         checkRasterCollectionsRastersBatchDeleteResponse(response);
@@ -5933,7 +5968,7 @@
 
     unittest.test("method--batchInsert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RasterCollectionsRastersResourceApi res = new api.MapsengineApi(mock).rasterCollections.rasters;
       var arg_request = buildRasterCollectionsRastersBatchInsertRequest();
       var arg_id = "foo";
@@ -5981,7 +6016,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRasterCollectionsRastersBatchInsertResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.batchInsert(arg_request, arg_id).then(unittest.expectAsync(((api.RasterCollectionsRastersBatchInsertResponse response) {
         checkRasterCollectionsRastersBatchInsertResponse(response);
@@ -5990,7 +6025,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RasterCollectionsRastersResourceApi res = new api.MapsengineApi(mock).rasterCollections.rasters;
       var arg_id = "foo";
       var arg_bbox = "foo";
@@ -6056,7 +6091,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRasterCollectionsRastersListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_id, bbox: arg_bbox, createdAfter: arg_createdAfter, createdBefore: arg_createdBefore, creatorEmail: arg_creatorEmail, maxResults: arg_maxResults, modifiedAfter: arg_modifiedAfter, modifiedBefore: arg_modifiedBefore, pageToken: arg_pageToken, role: arg_role, search: arg_search, tags: arg_tags).then(unittest.expectAsync(((api.RasterCollectionsRastersListResponse response) {
         checkRasterCollectionsRastersListResponse(response);
@@ -6069,7 +6104,7 @@
   unittest.group("resource-RastersResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RastersResourceApi res = new api.MapsengineApi(mock).rasters;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -6109,14 +6144,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RastersResourceApi res = new api.MapsengineApi(mock).rasters;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -6156,7 +6191,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRaster());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_id).then(unittest.expectAsync(((api.Raster response) {
         checkRaster(response);
@@ -6165,7 +6200,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RastersResourceApi res = new api.MapsengineApi(mock).rasters;
       var arg_projectId = "foo";
       var arg_bbox = "foo";
@@ -6227,7 +6262,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRastersListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_projectId, bbox: arg_bbox, createdAfter: arg_createdAfter, createdBefore: arg_createdBefore, creatorEmail: arg_creatorEmail, maxResults: arg_maxResults, modifiedAfter: arg_modifiedAfter, modifiedBefore: arg_modifiedBefore, pageToken: arg_pageToken, processingStatus: arg_processingStatus, role: arg_role, search: arg_search, tags: arg_tags).then(unittest.expectAsync(((api.RastersListResponse response) {
         checkRastersListResponse(response);
@@ -6236,7 +6271,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RastersResourceApi res = new api.MapsengineApi(mock).rasters;
       var arg_request = buildRaster();
       var arg_id = "foo";
@@ -6280,14 +6315,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--process", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RastersResourceApi res = new api.MapsengineApi(mock).rasters;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -6331,7 +6366,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProcessResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.process(arg_id).then(unittest.expectAsync(((api.ProcessResponse response) {
         checkProcessResponse(response);
@@ -6340,7 +6375,7 @@
 
     unittest.test("method--upload", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RastersResourceApi res = new api.MapsengineApi(mock).rasters;
       var arg_request = buildRaster();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -6380,7 +6415,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRaster());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.upload(arg_request).then(unittest.expectAsync(((api.Raster response) {
         checkRaster(response);
@@ -6395,7 +6430,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RastersFilesResourceApi res = new api.MapsengineApi(mock).rasters.files;
       var arg_id = "foo";
       var arg_filename = "foo";
@@ -6441,7 +6476,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_id, arg_filename).then(unittest.expectAsync((_) {}));
     });
@@ -6452,7 +6487,7 @@
   unittest.group("resource-RastersParentsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RastersParentsResourceApi res = new api.MapsengineApi(mock).rasters.parents;
       var arg_id = "foo";
       var arg_maxResults = 42;
@@ -6500,7 +6535,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildParentsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_id, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.ParentsListResponse response) {
         checkParentsListResponse(response);
@@ -6513,7 +6548,7 @@
   unittest.group("resource-RastersPermissionsResourceApi", () {
     unittest.test("method--batchDelete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RastersPermissionsResourceApi res = new api.MapsengineApi(mock).rasters.permissions;
       var arg_request = buildPermissionsBatchDeleteRequest();
       var arg_id = "foo";
@@ -6561,7 +6596,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPermissionsBatchDeleteResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.batchDelete(arg_request, arg_id).then(unittest.expectAsync(((api.PermissionsBatchDeleteResponse response) {
         checkPermissionsBatchDeleteResponse(response);
@@ -6570,7 +6605,7 @@
 
     unittest.test("method--batchUpdate", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RastersPermissionsResourceApi res = new api.MapsengineApi(mock).rasters.permissions;
       var arg_request = buildPermissionsBatchUpdateRequest();
       var arg_id = "foo";
@@ -6618,7 +6653,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPermissionsBatchUpdateResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.batchUpdate(arg_request, arg_id).then(unittest.expectAsync(((api.PermissionsBatchUpdateResponse response) {
         checkPermissionsBatchUpdateResponse(response);
@@ -6627,7 +6662,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.RastersPermissionsResourceApi res = new api.MapsengineApi(mock).rasters.permissions;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -6671,7 +6706,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPermissionsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_id).then(unittest.expectAsync(((api.PermissionsListResponse response) {
         checkPermissionsListResponse(response);
@@ -6684,7 +6719,7 @@
   unittest.group("resource-TablesResourceApi", () {
     unittest.test("method--create", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TablesResourceApi res = new api.MapsengineApi(mock).tables;
       var arg_request = buildTable();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -6724,7 +6759,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTable());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.create(arg_request).then(unittest.expectAsync(((api.Table response) {
         checkTable(response);
@@ -6733,7 +6768,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TablesResourceApi res = new api.MapsengineApi(mock).tables;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -6773,14 +6808,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TablesResourceApi res = new api.MapsengineApi(mock).tables;
       var arg_id = "foo";
       var arg_version = "foo";
@@ -6822,7 +6857,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTable());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_id, version: arg_version).then(unittest.expectAsync(((api.Table response) {
         checkTable(response);
@@ -6831,7 +6866,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TablesResourceApi res = new api.MapsengineApi(mock).tables;
       var arg_bbox = "foo";
       var arg_createdAfter = core.DateTime.parse("2002-02-27T14:01:02");
@@ -6893,7 +6928,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTablesListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(bbox: arg_bbox, createdAfter: arg_createdAfter, createdBefore: arg_createdBefore, creatorEmail: arg_creatorEmail, maxResults: arg_maxResults, modifiedAfter: arg_modifiedAfter, modifiedBefore: arg_modifiedBefore, pageToken: arg_pageToken, processingStatus: arg_processingStatus, projectId: arg_projectId, role: arg_role, search: arg_search, tags: arg_tags).then(unittest.expectAsync(((api.TablesListResponse response) {
         checkTablesListResponse(response);
@@ -6902,7 +6937,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TablesResourceApi res = new api.MapsengineApi(mock).tables;
       var arg_request = buildTable();
       var arg_id = "foo";
@@ -6946,14 +6981,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--process", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TablesResourceApi res = new api.MapsengineApi(mock).tables;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -6997,7 +7032,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildProcessResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.process(arg_id).then(unittest.expectAsync(((api.ProcessResponse response) {
         checkProcessResponse(response);
@@ -7006,7 +7041,7 @@
 
     unittest.test("method--upload", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TablesResourceApi res = new api.MapsengineApi(mock).tables;
       var arg_request = buildTable();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -7046,7 +7081,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTable());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.upload(arg_request).then(unittest.expectAsync(((api.Table response) {
         checkTable(response);
@@ -7059,7 +7094,7 @@
   unittest.group("resource-TablesFeaturesResourceApi", () {
     unittest.test("method--batchDelete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TablesFeaturesResourceApi res = new api.MapsengineApi(mock).tables.features;
       var arg_request = buildFeaturesBatchDeleteRequest();
       var arg_id = "foo";
@@ -7107,14 +7142,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.batchDelete(arg_request, arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--batchInsert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TablesFeaturesResourceApi res = new api.MapsengineApi(mock).tables.features;
       var arg_request = buildFeaturesBatchInsertRequest();
       var arg_id = "foo";
@@ -7162,14 +7197,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.batchInsert(arg_request, arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--batchPatch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TablesFeaturesResourceApi res = new api.MapsengineApi(mock).tables.features;
       var arg_request = buildFeaturesBatchPatchRequest();
       var arg_id = "foo";
@@ -7217,14 +7252,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.batchPatch(arg_request, arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TablesFeaturesResourceApi res = new api.MapsengineApi(mock).tables.features;
       var arg_tableId = "foo";
       var arg_id = "foo";
@@ -7276,7 +7311,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFeature());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_tableId, arg_id, select: arg_select, version: arg_version).then(unittest.expectAsync(((api.Feature response) {
         checkFeature(response);
@@ -7285,7 +7320,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TablesFeaturesResourceApi res = new api.MapsengineApi(mock).tables.features;
       var arg_id = "foo";
       var arg_include = "foo";
@@ -7347,7 +7382,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildFeaturesListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_id, include: arg_include, intersects: arg_intersects, limit: arg_limit, maxResults: arg_maxResults, orderBy: arg_orderBy, pageToken: arg_pageToken, select: arg_select, version: arg_version, where: arg_where).then(unittest.expectAsync(((api.FeaturesListResponse response) {
         checkFeaturesListResponse(response);
@@ -7362,7 +7397,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TablesFilesResourceApi res = new api.MapsengineApi(mock).tables.files;
       var arg_id = "foo";
       var arg_filename = "foo";
@@ -7408,7 +7443,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_id, arg_filename).then(unittest.expectAsync((_) {}));
     });
@@ -7419,7 +7454,7 @@
   unittest.group("resource-TablesParentsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TablesParentsResourceApi res = new api.MapsengineApi(mock).tables.parents;
       var arg_id = "foo";
       var arg_maxResults = 42;
@@ -7467,7 +7502,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildParentsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_id, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.ParentsListResponse response) {
         checkParentsListResponse(response);
@@ -7480,7 +7515,7 @@
   unittest.group("resource-TablesPermissionsResourceApi", () {
     unittest.test("method--batchDelete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TablesPermissionsResourceApi res = new api.MapsengineApi(mock).tables.permissions;
       var arg_request = buildPermissionsBatchDeleteRequest();
       var arg_id = "foo";
@@ -7528,7 +7563,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPermissionsBatchDeleteResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.batchDelete(arg_request, arg_id).then(unittest.expectAsync(((api.PermissionsBatchDeleteResponse response) {
         checkPermissionsBatchDeleteResponse(response);
@@ -7537,7 +7572,7 @@
 
     unittest.test("method--batchUpdate", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TablesPermissionsResourceApi res = new api.MapsengineApi(mock).tables.permissions;
       var arg_request = buildPermissionsBatchUpdateRequest();
       var arg_id = "foo";
@@ -7585,7 +7620,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPermissionsBatchUpdateResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.batchUpdate(arg_request, arg_id).then(unittest.expectAsync(((api.PermissionsBatchUpdateResponse response) {
         checkPermissionsBatchUpdateResponse(response);
@@ -7594,7 +7629,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TablesPermissionsResourceApi res = new api.MapsengineApi(mock).tables.permissions;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -7638,7 +7673,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPermissionsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_id).then(unittest.expectAsync(((api.PermissionsListResponse response) {
         checkPermissionsListResponse(response);
diff --git a/generated/googleapis/test/mirror/v1_test.dart b/generated/googleapis/test/mirror/v1_test.dart
index af551e7..0334cd2 100644
--- a/generated/googleapis/test/mirror/v1_test.dart
+++ b/generated/googleapis/test/mirror/v1_test.dart
@@ -8,48 +8,83 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/mirror/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
 
-buildUnnamed1069() {
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+buildUnnamed1215() {
   var o = new core.List<api.AuthToken>();
   o.add(buildAuthToken());
   o.add(buildAuthToken());
   return o;
 }
 
-checkUnnamed1069(core.List<api.AuthToken> o) {
+checkUnnamed1215(core.List<api.AuthToken> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuthToken(o[0]);
   checkAuthToken(o[1]);
 }
 
-buildUnnamed1070() {
+buildUnnamed1216() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1070(core.List<core.String> o) {
+checkUnnamed1216(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1071() {
+buildUnnamed1217() {
   var o = new core.List<api.UserData>();
   o.add(buildUserData());
   o.add(buildUserData());
   return o;
 }
 
-checkUnnamed1071(core.List<api.UserData> o) {
+checkUnnamed1217(core.List<api.UserData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserData(o[0]);
   checkUserData(o[1]);
@@ -60,10 +95,10 @@
   var o = new api.Account();
   buildCounterAccount++;
   if (buildCounterAccount < 3) {
-    o.authTokens = buildUnnamed1069();
-    o.features = buildUnnamed1070();
+    o.authTokens = buildUnnamed1215();
+    o.features = buildUnnamed1216();
     o.password = "foo";
-    o.userData = buildUnnamed1071();
+    o.userData = buildUnnamed1217();
   }
   buildCounterAccount--;
   return o;
@@ -72,10 +107,10 @@
 checkAccount(api.Account o) {
   buildCounterAccount++;
   if (buildCounterAccount < 3) {
-    checkUnnamed1069(o.authTokens);
-    checkUnnamed1070(o.features);
+    checkUnnamed1215(o.authTokens);
+    checkUnnamed1216(o.features);
     unittest.expect(o.password, unittest.equals('foo'));
-    checkUnnamed1071(o.userData);
+    checkUnnamed1217(o.userData);
   }
   buildCounterAccount--;
 }
@@ -105,14 +140,14 @@
   buildCounterAttachment--;
 }
 
-buildUnnamed1072() {
+buildUnnamed1218() {
   var o = new core.List<api.Attachment>();
   o.add(buildAttachment());
   o.add(buildAttachment());
   return o;
 }
 
-checkUnnamed1072(core.List<api.Attachment> o) {
+checkUnnamed1218(core.List<api.Attachment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAttachment(o[0]);
   checkAttachment(o[1]);
@@ -123,7 +158,7 @@
   var o = new api.AttachmentsListResponse();
   buildCounterAttachmentsListResponse++;
   if (buildCounterAttachmentsListResponse < 3) {
-    o.items = buildUnnamed1072();
+    o.items = buildUnnamed1218();
     o.kind = "foo";
   }
   buildCounterAttachmentsListResponse--;
@@ -133,7 +168,7 @@
 checkAttachmentsListResponse(api.AttachmentsListResponse o) {
   buildCounterAttachmentsListResponse++;
   if (buildCounterAttachmentsListResponse < 3) {
-    checkUnnamed1072(o.items);
+    checkUnnamed1218(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAttachmentsListResponse--;
@@ -179,53 +214,53 @@
   buildCounterCommand--;
 }
 
-buildUnnamed1073() {
+buildUnnamed1219() {
   var o = new core.List<api.Command>();
   o.add(buildCommand());
   o.add(buildCommand());
   return o;
 }
 
-checkUnnamed1073(core.List<api.Command> o) {
+checkUnnamed1219(core.List<api.Command> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCommand(o[0]);
   checkCommand(o[1]);
 }
 
-buildUnnamed1074() {
+buildUnnamed1220() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1074(core.List<core.String> o) {
+checkUnnamed1220(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1075() {
+buildUnnamed1221() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1075(core.List<core.String> o) {
+checkUnnamed1221(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1076() {
+buildUnnamed1222() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1076(core.List<core.String> o) {
+checkUnnamed1222(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -236,15 +271,15 @@
   var o = new api.Contact();
   buildCounterContact++;
   if (buildCounterContact < 3) {
-    o.acceptCommands = buildUnnamed1073();
-    o.acceptTypes = buildUnnamed1074();
+    o.acceptCommands = buildUnnamed1219();
+    o.acceptTypes = buildUnnamed1220();
     o.displayName = "foo";
     o.id = "foo";
-    o.imageUrls = buildUnnamed1075();
+    o.imageUrls = buildUnnamed1221();
     o.kind = "foo";
     o.phoneNumber = "foo";
     o.priority = 42;
-    o.sharingFeatures = buildUnnamed1076();
+    o.sharingFeatures = buildUnnamed1222();
     o.source = "foo";
     o.speakableName = "foo";
     o.type = "foo";
@@ -256,15 +291,15 @@
 checkContact(api.Contact o) {
   buildCounterContact++;
   if (buildCounterContact < 3) {
-    checkUnnamed1073(o.acceptCommands);
-    checkUnnamed1074(o.acceptTypes);
+    checkUnnamed1219(o.acceptCommands);
+    checkUnnamed1220(o.acceptTypes);
     unittest.expect(o.displayName, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1075(o.imageUrls);
+    checkUnnamed1221(o.imageUrls);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.phoneNumber, unittest.equals('foo'));
     unittest.expect(o.priority, unittest.equals(42));
-    checkUnnamed1076(o.sharingFeatures);
+    checkUnnamed1222(o.sharingFeatures);
     unittest.expect(o.source, unittest.equals('foo'));
     unittest.expect(o.speakableName, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
@@ -272,14 +307,14 @@
   buildCounterContact--;
 }
 
-buildUnnamed1077() {
+buildUnnamed1223() {
   var o = new core.List<api.Contact>();
   o.add(buildContact());
   o.add(buildContact());
   return o;
 }
 
-checkUnnamed1077(core.List<api.Contact> o) {
+checkUnnamed1223(core.List<api.Contact> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContact(o[0]);
   checkContact(o[1]);
@@ -290,7 +325,7 @@
   var o = new api.ContactsListResponse();
   buildCounterContactsListResponse++;
   if (buildCounterContactsListResponse < 3) {
-    o.items = buildUnnamed1077();
+    o.items = buildUnnamed1223();
     o.kind = "foo";
   }
   buildCounterContactsListResponse--;
@@ -300,7 +335,7 @@
 checkContactsListResponse(api.ContactsListResponse o) {
   buildCounterContactsListResponse++;
   if (buildCounterContactsListResponse < 3) {
-    checkUnnamed1077(o.items);
+    checkUnnamed1223(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterContactsListResponse--;
@@ -339,14 +374,14 @@
   buildCounterLocation--;
 }
 
-buildUnnamed1078() {
+buildUnnamed1224() {
   var o = new core.List<api.Location>();
   o.add(buildLocation());
   o.add(buildLocation());
   return o;
 }
 
-checkUnnamed1078(core.List<api.Location> o) {
+checkUnnamed1224(core.List<api.Location> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLocation(o[0]);
   checkLocation(o[1]);
@@ -357,7 +392,7 @@
   var o = new api.LocationsListResponse();
   buildCounterLocationsListResponse++;
   if (buildCounterLocationsListResponse < 3) {
-    o.items = buildUnnamed1078();
+    o.items = buildUnnamed1224();
     o.kind = "foo";
   }
   buildCounterLocationsListResponse--;
@@ -367,20 +402,20 @@
 checkLocationsListResponse(api.LocationsListResponse o) {
   buildCounterLocationsListResponse++;
   if (buildCounterLocationsListResponse < 3) {
-    checkUnnamed1078(o.items);
+    checkUnnamed1224(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterLocationsListResponse--;
 }
 
-buildUnnamed1079() {
+buildUnnamed1225() {
   var o = new core.List<api.MenuValue>();
   o.add(buildMenuValue());
   o.add(buildMenuValue());
   return o;
 }
 
-checkUnnamed1079(core.List<api.MenuValue> o) {
+checkUnnamed1225(core.List<api.MenuValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMenuValue(o[0]);
   checkMenuValue(o[1]);
@@ -396,7 +431,7 @@
     o.id = "foo";
     o.payload = "foo";
     o.removeWhenSelected = true;
-    o.values = buildUnnamed1079();
+    o.values = buildUnnamed1225();
   }
   buildCounterMenuItem--;
   return o;
@@ -410,7 +445,7 @@
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.payload, unittest.equals('foo'));
     unittest.expect(o.removeWhenSelected, unittest.isTrue);
-    checkUnnamed1079(o.values);
+    checkUnnamed1225(o.values);
   }
   buildCounterMenuItem--;
 }
@@ -438,14 +473,14 @@
   buildCounterMenuValue--;
 }
 
-buildUnnamed1080() {
+buildUnnamed1226() {
   var o = new core.List<api.UserAction>();
   o.add(buildUserAction());
   o.add(buildUserAction());
   return o;
 }
 
-checkUnnamed1080(core.List<api.UserAction> o) {
+checkUnnamed1226(core.List<api.UserAction> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserAction(o[0]);
   checkUserAction(o[1]);
@@ -459,7 +494,7 @@
     o.collection = "foo";
     o.itemId = "foo";
     o.operation = "foo";
-    o.userActions = buildUnnamed1080();
+    o.userActions = buildUnnamed1226();
     o.userToken = "foo";
     o.verifyToken = "foo";
   }
@@ -473,7 +508,7 @@
     unittest.expect(o.collection, unittest.equals('foo'));
     unittest.expect(o.itemId, unittest.equals('foo'));
     unittest.expect(o.operation, unittest.equals('foo'));
-    checkUnnamed1080(o.userActions);
+    checkUnnamed1226(o.userActions);
     unittest.expect(o.userToken, unittest.equals('foo'));
     unittest.expect(o.verifyToken, unittest.equals('foo'));
   }
@@ -524,14 +559,14 @@
   buildCounterSetting--;
 }
 
-buildUnnamed1081() {
+buildUnnamed1227() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1081(core.List<core.String> o) {
+checkUnnamed1227(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -547,7 +582,7 @@
     o.id = "foo";
     o.kind = "foo";
     o.notification = buildNotification();
-    o.operation = buildUnnamed1081();
+    o.operation = buildUnnamed1227();
     o.updated = core.DateTime.parse("2002-02-27T14:01:02");
     o.userToken = "foo";
     o.verifyToken = "foo";
@@ -564,7 +599,7 @@
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     checkNotification(o.notification);
-    checkUnnamed1081(o.operation);
+    checkUnnamed1227(o.operation);
     unittest.expect(o.updated, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.userToken, unittest.equals('foo'));
     unittest.expect(o.verifyToken, unittest.equals('foo'));
@@ -572,14 +607,14 @@
   buildCounterSubscription--;
 }
 
-buildUnnamed1082() {
+buildUnnamed1228() {
   var o = new core.List<api.Subscription>();
   o.add(buildSubscription());
   o.add(buildSubscription());
   return o;
 }
 
-checkUnnamed1082(core.List<api.Subscription> o) {
+checkUnnamed1228(core.List<api.Subscription> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSubscription(o[0]);
   checkSubscription(o[1]);
@@ -590,7 +625,7 @@
   var o = new api.SubscriptionsListResponse();
   buildCounterSubscriptionsListResponse++;
   if (buildCounterSubscriptionsListResponse < 3) {
-    o.items = buildUnnamed1082();
+    o.items = buildUnnamed1228();
     o.kind = "foo";
   }
   buildCounterSubscriptionsListResponse--;
@@ -600,46 +635,46 @@
 checkSubscriptionsListResponse(api.SubscriptionsListResponse o) {
   buildCounterSubscriptionsListResponse++;
   if (buildCounterSubscriptionsListResponse < 3) {
-    checkUnnamed1082(o.items);
+    checkUnnamed1228(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterSubscriptionsListResponse--;
 }
 
-buildUnnamed1083() {
+buildUnnamed1229() {
   var o = new core.List<api.Attachment>();
   o.add(buildAttachment());
   o.add(buildAttachment());
   return o;
 }
 
-checkUnnamed1083(core.List<api.Attachment> o) {
+checkUnnamed1229(core.List<api.Attachment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAttachment(o[0]);
   checkAttachment(o[1]);
 }
 
-buildUnnamed1084() {
+buildUnnamed1230() {
   var o = new core.List<api.MenuItem>();
   o.add(buildMenuItem());
   o.add(buildMenuItem());
   return o;
 }
 
-checkUnnamed1084(core.List<api.MenuItem> o) {
+checkUnnamed1230(core.List<api.MenuItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMenuItem(o[0]);
   checkMenuItem(o[1]);
 }
 
-buildUnnamed1085() {
+buildUnnamed1231() {
   var o = new core.List<api.Contact>();
   o.add(buildContact());
   o.add(buildContact());
   return o;
 }
 
-checkUnnamed1085(core.List<api.Contact> o) {
+checkUnnamed1231(core.List<api.Contact> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContact(o[0]);
   checkContact(o[1]);
@@ -650,7 +685,7 @@
   var o = new api.TimelineItem();
   buildCounterTimelineItem++;
   if (buildCounterTimelineItem < 3) {
-    o.attachments = buildUnnamed1083();
+    o.attachments = buildUnnamed1229();
     o.bundleId = "foo";
     o.canonicalUrl = "foo";
     o.created = core.DateTime.parse("2002-02-27T14:01:02");
@@ -665,10 +700,10 @@
     o.isPinned = true;
     o.kind = "foo";
     o.location = buildLocation();
-    o.menuItems = buildUnnamed1084();
+    o.menuItems = buildUnnamed1230();
     o.notification = buildNotificationConfig();
     o.pinScore = 42;
-    o.recipients = buildUnnamed1085();
+    o.recipients = buildUnnamed1231();
     o.selfLink = "foo";
     o.sourceItemId = "foo";
     o.speakableText = "foo";
@@ -684,7 +719,7 @@
 checkTimelineItem(api.TimelineItem o) {
   buildCounterTimelineItem++;
   if (buildCounterTimelineItem < 3) {
-    checkUnnamed1083(o.attachments);
+    checkUnnamed1229(o.attachments);
     unittest.expect(o.bundleId, unittest.equals('foo'));
     unittest.expect(o.canonicalUrl, unittest.equals('foo'));
     unittest.expect(o.created, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
@@ -699,10 +734,10 @@
     unittest.expect(o.isPinned, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkLocation(o.location);
-    checkUnnamed1084(o.menuItems);
+    checkUnnamed1230(o.menuItems);
     checkNotificationConfig(o.notification);
     unittest.expect(o.pinScore, unittest.equals(42));
-    checkUnnamed1085(o.recipients);
+    checkUnnamed1231(o.recipients);
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.sourceItemId, unittest.equals('foo'));
     unittest.expect(o.speakableText, unittest.equals('foo'));
@@ -714,14 +749,14 @@
   buildCounterTimelineItem--;
 }
 
-buildUnnamed1086() {
+buildUnnamed1232() {
   var o = new core.List<api.TimelineItem>();
   o.add(buildTimelineItem());
   o.add(buildTimelineItem());
   return o;
 }
 
-checkUnnamed1086(core.List<api.TimelineItem> o) {
+checkUnnamed1232(core.List<api.TimelineItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTimelineItem(o[0]);
   checkTimelineItem(o[1]);
@@ -732,7 +767,7 @@
   var o = new api.TimelineListResponse();
   buildCounterTimelineListResponse++;
   if (buildCounterTimelineListResponse < 3) {
-    o.items = buildUnnamed1086();
+    o.items = buildUnnamed1232();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -743,7 +778,7 @@
 checkTimelineListResponse(api.TimelineListResponse o) {
   buildCounterTimelineListResponse++;
   if (buildCounterTimelineListResponse < 3) {
-    checkUnnamed1086(o.items);
+    checkUnnamed1232(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -977,7 +1012,7 @@
   unittest.group("resource-AccountsResourceApi", () {
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.MirrorApi(mock).accounts;
       var arg_request = buildAccount();
       var arg_userToken = "foo";
@@ -1037,7 +1072,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccount());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_userToken, arg_accountType, arg_accountName).then(unittest.expectAsync(((api.Account response) {
         checkAccount(response);
@@ -1050,7 +1085,7 @@
   unittest.group("resource-ContactsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ContactsResourceApi res = new api.MirrorApi(mock).contacts;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1090,14 +1125,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ContactsResourceApi res = new api.MirrorApi(mock).contacts;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1137,7 +1172,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildContact());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_id).then(unittest.expectAsync(((api.Contact response) {
         checkContact(response);
@@ -1146,7 +1181,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ContactsResourceApi res = new api.MirrorApi(mock).contacts;
       var arg_request = buildContact();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1186,7 +1221,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildContact());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request).then(unittest.expectAsync(((api.Contact response) {
         checkContact(response);
@@ -1195,7 +1230,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ContactsResourceApi res = new api.MirrorApi(mock).contacts;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1231,7 +1266,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildContactsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list().then(unittest.expectAsync(((api.ContactsListResponse response) {
         checkContactsListResponse(response);
@@ -1240,7 +1275,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ContactsResourceApi res = new api.MirrorApi(mock).contacts;
       var arg_request = buildContact();
       var arg_id = "foo";
@@ -1284,7 +1319,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildContact());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_id).then(unittest.expectAsync(((api.Contact response) {
         checkContact(response);
@@ -1293,7 +1328,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ContactsResourceApi res = new api.MirrorApi(mock).contacts;
       var arg_request = buildContact();
       var arg_id = "foo";
@@ -1337,7 +1372,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildContact());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_id).then(unittest.expectAsync(((api.Contact response) {
         checkContact(response);
@@ -1350,7 +1385,7 @@
   unittest.group("resource-LocationsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LocationsResourceApi res = new api.MirrorApi(mock).locations;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1390,7 +1425,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLocation());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_id).then(unittest.expectAsync(((api.Location response) {
         checkLocation(response);
@@ -1399,7 +1434,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LocationsResourceApi res = new api.MirrorApi(mock).locations;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1435,7 +1470,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLocationsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list().then(unittest.expectAsync(((api.LocationsListResponse response) {
         checkLocationsListResponse(response);
@@ -1448,7 +1483,7 @@
   unittest.group("resource-SettingsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SettingsResourceApi res = new api.MirrorApi(mock).settings;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1488,7 +1523,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSetting());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_id).then(unittest.expectAsync(((api.Setting response) {
         checkSetting(response);
@@ -1501,7 +1536,7 @@
   unittest.group("resource-SubscriptionsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SubscriptionsResourceApi res = new api.MirrorApi(mock).subscriptions;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1541,14 +1576,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SubscriptionsResourceApi res = new api.MirrorApi(mock).subscriptions;
       var arg_request = buildSubscription();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1588,7 +1623,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSubscription());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request).then(unittest.expectAsync(((api.Subscription response) {
         checkSubscription(response);
@@ -1597,7 +1632,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SubscriptionsResourceApi res = new api.MirrorApi(mock).subscriptions;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1633,7 +1668,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSubscriptionsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list().then(unittest.expectAsync(((api.SubscriptionsListResponse response) {
         checkSubscriptionsListResponse(response);
@@ -1642,7 +1677,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SubscriptionsResourceApi res = new api.MirrorApi(mock).subscriptions;
       var arg_request = buildSubscription();
       var arg_id = "foo";
@@ -1686,7 +1721,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSubscription());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_id).then(unittest.expectAsync(((api.Subscription response) {
         checkSubscription(response);
@@ -1699,7 +1734,7 @@
   unittest.group("resource-TimelineResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TimelineResourceApi res = new api.MirrorApi(mock).timeline;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1739,14 +1774,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TimelineResourceApi res = new api.MirrorApi(mock).timeline;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1786,7 +1821,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTimelineItem());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_id).then(unittest.expectAsync(((api.TimelineItem response) {
         checkTimelineItem(response);
@@ -1797,7 +1832,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TimelineResourceApi res = new api.MirrorApi(mock).timeline;
       var arg_request = buildTimelineItem();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1837,7 +1872,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTimelineItem());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request).then(unittest.expectAsync(((api.TimelineItem response) {
         checkTimelineItem(response);
@@ -1846,7 +1881,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TimelineResourceApi res = new api.MirrorApi(mock).timeline;
       var arg_bundleId = "foo";
       var arg_includeDeleted = true;
@@ -1896,7 +1931,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTimelineListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(bundleId: arg_bundleId, includeDeleted: arg_includeDeleted, maxResults: arg_maxResults, orderBy: arg_orderBy, pageToken: arg_pageToken, pinnedOnly: arg_pinnedOnly, sourceItemId: arg_sourceItemId).then(unittest.expectAsync(((api.TimelineListResponse response) {
         checkTimelineListResponse(response);
@@ -1905,7 +1940,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TimelineResourceApi res = new api.MirrorApi(mock).timeline;
       var arg_request = buildTimelineItem();
       var arg_id = "foo";
@@ -1949,7 +1984,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTimelineItem());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_id).then(unittest.expectAsync(((api.TimelineItem response) {
         checkTimelineItem(response);
@@ -1960,7 +1995,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TimelineResourceApi res = new api.MirrorApi(mock).timeline;
       var arg_request = buildTimelineItem();
       var arg_id = "foo";
@@ -2004,7 +2039,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTimelineItem());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_id).then(unittest.expectAsync(((api.TimelineItem response) {
         checkTimelineItem(response);
@@ -2017,7 +2052,7 @@
   unittest.group("resource-TimelineAttachmentsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TimelineAttachmentsResourceApi res = new api.MirrorApi(mock).timeline.attachments;
       var arg_itemId = "foo";
       var arg_attachmentId = "foo";
@@ -2065,7 +2100,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_itemId, arg_attachmentId).then(unittest.expectAsync((_) {}));
     });
@@ -2074,7 +2109,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TimelineAttachmentsResourceApi res = new api.MirrorApi(mock).timeline.attachments;
       var arg_itemId = "foo";
       var arg_attachmentId = "foo";
@@ -2122,7 +2157,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAttachment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_itemId, arg_attachmentId).then(unittest.expectAsync(((api.Attachment response) {
         checkAttachment(response);
@@ -2133,7 +2168,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TimelineAttachmentsResourceApi res = new api.MirrorApi(mock).timeline.attachments;
       var arg_itemId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2177,7 +2212,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAttachment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_itemId).then(unittest.expectAsync(((api.Attachment response) {
         checkAttachment(response);
@@ -2186,7 +2221,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TimelineAttachmentsResourceApi res = new api.MirrorApi(mock).timeline.attachments;
       var arg_itemId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2230,7 +2265,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAttachmentsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_itemId).then(unittest.expectAsync(((api.AttachmentsListResponse response) {
         checkAttachmentsListResponse(response);
diff --git a/generated/googleapis/test/oauth2/v2_test.dart b/generated/googleapis/test/oauth2/v2_test.dart
index 9ee3897..14d7fc4 100644
--- a/generated/googleapis/test/oauth2/v2_test.dart
+++ b/generated/googleapis/test/oauth2/v2_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/oauth2/v2.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterJwkKeys = 0;
 buildJwkKeys() {
@@ -45,14 +80,14 @@
   buildCounterJwkKeys--;
 }
 
-buildUnnamed1383() {
+buildUnnamed1233() {
   var o = new core.List<api.JwkKeys>();
   o.add(buildJwkKeys());
   o.add(buildJwkKeys());
   return o;
 }
 
-checkUnnamed1383(core.List<api.JwkKeys> o) {
+checkUnnamed1233(core.List<api.JwkKeys> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkJwkKeys(o[0]);
   checkJwkKeys(o[1]);
@@ -63,7 +98,7 @@
   var o = new api.Jwk();
   buildCounterJwk++;
   if (buildCounterJwk < 3) {
-    o.keys = buildUnnamed1383();
+    o.keys = buildUnnamed1233();
   }
   buildCounterJwk--;
   return o;
@@ -72,7 +107,7 @@
 checkJwk(api.Jwk o) {
   buildCounterJwk++;
   if (buildCounterJwk < 3) {
-    checkUnnamed1383(o.keys);
+    checkUnnamed1233(o.keys);
   }
   buildCounterJwk--;
 }
@@ -88,6 +123,7 @@
     o.expiresIn = 42;
     o.issuedTo = "foo";
     o.scope = "foo";
+    o.tokenHandle = "foo";
     o.userId = "foo";
     o.verifiedEmail = true;
   }
@@ -104,6 +140,7 @@
     unittest.expect(o.expiresIn, unittest.equals(42));
     unittest.expect(o.issuedTo, unittest.equals('foo'));
     unittest.expect(o.scope, unittest.equals('foo'));
+    unittest.expect(o.tokenHandle, unittest.equals('foo'));
     unittest.expect(o.userId, unittest.equals('foo'));
     unittest.expect(o.verifiedEmail, unittest.isTrue);
   }
@@ -190,7 +227,7 @@
   unittest.group("resource-Oauth2Api", () {
     unittest.test("method--getCertForOpenIdConnect", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.Oauth2Api res = new api.Oauth2Api(mock);
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -224,7 +261,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildJwk());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.getCertForOpenIdConnect().then(unittest.expectAsync(((api.Jwk response) {
         checkJwk(response);
@@ -233,10 +270,11 @@
 
     unittest.test("method--tokeninfo", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.Oauth2Api res = new api.Oauth2Api(mock);
       var arg_accessToken = "foo";
       var arg_idToken = "foo";
+      var arg_tokenHandle = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -265,15 +303,16 @@
         }
         unittest.expect(queryMap["access_token"].first, unittest.equals(arg_accessToken));
         unittest.expect(queryMap["id_token"].first, unittest.equals(arg_idToken));
+        unittest.expect(queryMap["token_handle"].first, unittest.equals(arg_tokenHandle));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTokeninfo());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.tokeninfo(accessToken: arg_accessToken, idToken: arg_idToken).then(unittest.expectAsync(((api.Tokeninfo response) {
+      res.tokeninfo(accessToken: arg_accessToken, idToken: arg_idToken, tokenHandle: arg_tokenHandle).then(unittest.expectAsync(((api.Tokeninfo response) {
         checkTokeninfo(response);
       })));
     });
@@ -284,7 +323,7 @@
   unittest.group("resource-UserinfoResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UserinfoResourceApi res = new api.Oauth2Api(mock).userinfo;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -318,7 +357,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUserinfoplus());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get().then(unittest.expectAsync(((api.Userinfoplus response) {
         checkUserinfoplus(response);
@@ -331,7 +370,7 @@
   unittest.group("resource-UserinfoV2MeResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UserinfoV2MeResourceApi res = new api.Oauth2Api(mock).userinfo.v2.me;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -365,7 +404,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUserinfoplus());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get().then(unittest.expectAsync(((api.Userinfoplus response) {
         checkUserinfoplus(response);
diff --git a/generated/googleapis/test/pagespeedonline/v1_test.dart b/generated/googleapis/test/pagespeedonline/v1_test.dart
index d07d96d..8eac6c5 100644
--- a/generated/googleapis/test/pagespeedonline/v1_test.dart
+++ b/generated/googleapis/test/pagespeedonline/v1_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/pagespeedonline/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterResultFormattedResultsRuleResultsValueUrlBlocksHeaderArgs = 0;
 buildResultFormattedResultsRuleResultsValueUrlBlocksHeaderArgs() {
@@ -37,14 +72,14 @@
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksHeaderArgs--;
 }
 
-buildUnnamed1384() {
+buildUnnamed1234() {
   var o = new core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocksHeaderArgs>();
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocksHeaderArgs());
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocksHeaderArgs());
   return o;
 }
 
-checkUnnamed1384(core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocksHeaderArgs> o) {
+checkUnnamed1234(core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocksHeaderArgs> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResultFormattedResultsRuleResultsValueUrlBlocksHeaderArgs(o[0]);
   checkResultFormattedResultsRuleResultsValueUrlBlocksHeaderArgs(o[1]);
@@ -55,7 +90,7 @@
   var o = new api.ResultFormattedResultsRuleResultsValueUrlBlocksHeader();
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksHeader++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocksHeader < 3) {
-    o.args = buildUnnamed1384();
+    o.args = buildUnnamed1234();
     o.format = "foo";
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksHeader--;
@@ -65,7 +100,7 @@
 checkResultFormattedResultsRuleResultsValueUrlBlocksHeader(api.ResultFormattedResultsRuleResultsValueUrlBlocksHeader o) {
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksHeader++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocksHeader < 3) {
-    checkUnnamed1384(o.args);
+    checkUnnamed1234(o.args);
     unittest.expect(o.format, unittest.equals('foo'));
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksHeader--;
@@ -92,14 +127,14 @@
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetailsArgs--;
 }
 
-buildUnnamed1385() {
+buildUnnamed1235() {
   var o = new core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetailsArgs>();
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetailsArgs());
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetailsArgs());
   return o;
 }
 
-checkUnnamed1385(core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetailsArgs> o) {
+checkUnnamed1235(core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetailsArgs> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetailsArgs(o[0]);
   checkResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetailsArgs(o[1]);
@@ -110,7 +145,7 @@
   var o = new api.ResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails();
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails < 3) {
-    o.args = buildUnnamed1385();
+    o.args = buildUnnamed1235();
     o.format = "foo";
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails--;
@@ -120,20 +155,20 @@
 checkResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails(api.ResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails o) {
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails < 3) {
-    checkUnnamed1385(o.args);
+    checkUnnamed1235(o.args);
     unittest.expect(o.format, unittest.equals('foo'));
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails--;
 }
 
-buildUnnamed1386() {
+buildUnnamed1236() {
   var o = new core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails>();
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails());
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails());
   return o;
 }
 
-checkUnnamed1386(core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails> o) {
+checkUnnamed1236(core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails(o[0]);
   checkResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails(o[1]);
@@ -160,14 +195,14 @@
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsResultArgs--;
 }
 
-buildUnnamed1387() {
+buildUnnamed1237() {
   var o = new core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocksUrlsResultArgs>();
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocksUrlsResultArgs());
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocksUrlsResultArgs());
   return o;
 }
 
-checkUnnamed1387(core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocksUrlsResultArgs> o) {
+checkUnnamed1237(core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocksUrlsResultArgs> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResultFormattedResultsRuleResultsValueUrlBlocksUrlsResultArgs(o[0]);
   checkResultFormattedResultsRuleResultsValueUrlBlocksUrlsResultArgs(o[1]);
@@ -178,7 +213,7 @@
   var o = new api.ResultFormattedResultsRuleResultsValueUrlBlocksUrlsResult();
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsResult++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsResult < 3) {
-    o.args = buildUnnamed1387();
+    o.args = buildUnnamed1237();
     o.format = "foo";
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsResult--;
@@ -188,7 +223,7 @@
 checkResultFormattedResultsRuleResultsValueUrlBlocksUrlsResult(api.ResultFormattedResultsRuleResultsValueUrlBlocksUrlsResult o) {
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsResult++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsResult < 3) {
-    checkUnnamed1387(o.args);
+    checkUnnamed1237(o.args);
     unittest.expect(o.format, unittest.equals('foo'));
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsResult--;
@@ -199,7 +234,7 @@
   var o = new api.ResultFormattedResultsRuleResultsValueUrlBlocksUrls();
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrls++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrls < 3) {
-    o.details = buildUnnamed1386();
+    o.details = buildUnnamed1236();
     o.result = buildResultFormattedResultsRuleResultsValueUrlBlocksUrlsResult();
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrls--;
@@ -209,20 +244,20 @@
 checkResultFormattedResultsRuleResultsValueUrlBlocksUrls(api.ResultFormattedResultsRuleResultsValueUrlBlocksUrls o) {
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrls++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrls < 3) {
-    checkUnnamed1386(o.details);
+    checkUnnamed1236(o.details);
     checkResultFormattedResultsRuleResultsValueUrlBlocksUrlsResult(o.result);
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrls--;
 }
 
-buildUnnamed1388() {
+buildUnnamed1238() {
   var o = new core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocksUrls>();
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocksUrls());
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocksUrls());
   return o;
 }
 
-checkUnnamed1388(core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocksUrls> o) {
+checkUnnamed1238(core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocksUrls> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResultFormattedResultsRuleResultsValueUrlBlocksUrls(o[0]);
   checkResultFormattedResultsRuleResultsValueUrlBlocksUrls(o[1]);
@@ -234,7 +269,7 @@
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocks++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocks < 3) {
     o.header = buildResultFormattedResultsRuleResultsValueUrlBlocksHeader();
-    o.urls = buildUnnamed1388();
+    o.urls = buildUnnamed1238();
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocks--;
   return o;
@@ -244,19 +279,19 @@
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocks++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocks < 3) {
     checkResultFormattedResultsRuleResultsValueUrlBlocksHeader(o.header);
-    checkUnnamed1388(o.urls);
+    checkUnnamed1238(o.urls);
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocks--;
 }
 
-buildUnnamed1389() {
+buildUnnamed1239() {
   var o = new core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocks>();
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocks());
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocks());
   return o;
 }
 
-checkUnnamed1389(core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocks> o) {
+checkUnnamed1239(core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocks> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResultFormattedResultsRuleResultsValueUrlBlocks(o[0]);
   checkResultFormattedResultsRuleResultsValueUrlBlocks(o[1]);
@@ -269,7 +304,7 @@
   if (buildCounterResultFormattedResultsRuleResultsValue < 3) {
     o.localizedRuleName = "foo";
     o.ruleImpact = 42.0;
-    o.urlBlocks = buildUnnamed1389();
+    o.urlBlocks = buildUnnamed1239();
   }
   buildCounterResultFormattedResultsRuleResultsValue--;
   return o;
@@ -280,19 +315,19 @@
   if (buildCounterResultFormattedResultsRuleResultsValue < 3) {
     unittest.expect(o.localizedRuleName, unittest.equals('foo'));
     unittest.expect(o.ruleImpact, unittest.equals(42.0));
-    checkUnnamed1389(o.urlBlocks);
+    checkUnnamed1239(o.urlBlocks);
   }
   buildCounterResultFormattedResultsRuleResultsValue--;
 }
 
-buildUnnamed1390() {
+buildUnnamed1240() {
   var o = new core.Map<core.String, api.ResultFormattedResultsRuleResultsValue>();
   o["x"] = buildResultFormattedResultsRuleResultsValue();
   o["y"] = buildResultFormattedResultsRuleResultsValue();
   return o;
 }
 
-checkUnnamed1390(core.Map<core.String, api.ResultFormattedResultsRuleResultsValue> o) {
+checkUnnamed1240(core.Map<core.String, api.ResultFormattedResultsRuleResultsValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResultFormattedResultsRuleResultsValue(o["x"]);
   checkResultFormattedResultsRuleResultsValue(o["y"]);
@@ -304,7 +339,7 @@
   buildCounterResultFormattedResults++;
   if (buildCounterResultFormattedResults < 3) {
     o.locale = "foo";
-    o.ruleResults = buildUnnamed1390();
+    o.ruleResults = buildUnnamed1240();
   }
   buildCounterResultFormattedResults--;
   return o;
@@ -314,19 +349,19 @@
   buildCounterResultFormattedResults++;
   if (buildCounterResultFormattedResults < 3) {
     unittest.expect(o.locale, unittest.equals('foo'));
-    checkUnnamed1390(o.ruleResults);
+    checkUnnamed1240(o.ruleResults);
   }
   buildCounterResultFormattedResults--;
 }
 
-buildUnnamed1391() {
+buildUnnamed1241() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1391(core.List<core.String> o) {
+checkUnnamed1241(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -428,7 +463,7 @@
   if (buildCounterResult < 3) {
     o.formattedResults = buildResultFormattedResults();
     o.id = "foo";
-    o.invalidRules = buildUnnamed1391();
+    o.invalidRules = buildUnnamed1241();
     o.kind = "foo";
     o.pageStats = buildResultPageStats();
     o.responseCode = 42;
@@ -446,7 +481,7 @@
   if (buildCounterResult < 3) {
     checkResultFormattedResults(o.formattedResults);
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1391(o.invalidRules);
+    checkUnnamed1241(o.invalidRules);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkResultPageStats(o.pageStats);
     unittest.expect(o.responseCode, unittest.equals(42));
@@ -458,14 +493,14 @@
   buildCounterResult--;
 }
 
-buildUnnamed1392() {
+buildUnnamed1242() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1392(core.List<core.String> o) {
+checkUnnamed1242(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -602,12 +637,12 @@
   unittest.group("resource-PagespeedapiResourceApi", () {
     unittest.test("method--runpagespeed", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PagespeedapiResourceApi res = new api.PagespeedonlineApi(mock).pagespeedapi;
       var arg_url = "foo";
       var arg_filterThirdPartyResources = true;
       var arg_locale = "foo";
-      var arg_rule = buildUnnamed1392();
+      var arg_rule = buildUnnamed1242();
       var arg_screenshot = true;
       var arg_strategy = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -650,7 +685,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildResult());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.runpagespeed(arg_url, filterThirdPartyResources: arg_filterThirdPartyResources, locale: arg_locale, rule: arg_rule, screenshot: arg_screenshot, strategy: arg_strategy).then(unittest.expectAsync(((api.Result response) {
         checkResult(response);
diff --git a/generated/googleapis/test/pagespeedonline/v2_test.dart b/generated/googleapis/test/pagespeedonline/v2_test.dart
index dc335ff..246de10 100644
--- a/generated/googleapis/test/pagespeedonline/v2_test.dart
+++ b/generated/googleapis/test/pagespeedonline/v2_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/pagespeedonline/v2.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterPagespeedApiFormatStringV2ArgsRects = 0;
 buildPagespeedApiFormatStringV2ArgsRects() {
@@ -41,14 +76,14 @@
   buildCounterPagespeedApiFormatStringV2ArgsRects--;
 }
 
-buildUnnamed1005() {
+buildUnnamed1243() {
   var o = new core.List<api.PagespeedApiFormatStringV2ArgsRects>();
   o.add(buildPagespeedApiFormatStringV2ArgsRects());
   o.add(buildPagespeedApiFormatStringV2ArgsRects());
   return o;
 }
 
-checkUnnamed1005(core.List<api.PagespeedApiFormatStringV2ArgsRects> o) {
+checkUnnamed1243(core.List<api.PagespeedApiFormatStringV2ArgsRects> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPagespeedApiFormatStringV2ArgsRects(o[0]);
   checkPagespeedApiFormatStringV2ArgsRects(o[1]);
@@ -79,14 +114,14 @@
   buildCounterPagespeedApiFormatStringV2ArgsSecondaryRects--;
 }
 
-buildUnnamed1006() {
+buildUnnamed1244() {
   var o = new core.List<api.PagespeedApiFormatStringV2ArgsSecondaryRects>();
   o.add(buildPagespeedApiFormatStringV2ArgsSecondaryRects());
   o.add(buildPagespeedApiFormatStringV2ArgsSecondaryRects());
   return o;
 }
 
-checkUnnamed1006(core.List<api.PagespeedApiFormatStringV2ArgsSecondaryRects> o) {
+checkUnnamed1244(core.List<api.PagespeedApiFormatStringV2ArgsSecondaryRects> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPagespeedApiFormatStringV2ArgsSecondaryRects(o[0]);
   checkPagespeedApiFormatStringV2ArgsSecondaryRects(o[1]);
@@ -98,8 +133,8 @@
   buildCounterPagespeedApiFormatStringV2Args++;
   if (buildCounterPagespeedApiFormatStringV2Args < 3) {
     o.key = "foo";
-    o.rects = buildUnnamed1005();
-    o.secondaryRects = buildUnnamed1006();
+    o.rects = buildUnnamed1243();
+    o.secondaryRects = buildUnnamed1244();
     o.type = "foo";
     o.value = "foo";
   }
@@ -111,22 +146,22 @@
   buildCounterPagespeedApiFormatStringV2Args++;
   if (buildCounterPagespeedApiFormatStringV2Args < 3) {
     unittest.expect(o.key, unittest.equals('foo'));
-    checkUnnamed1005(o.rects);
-    checkUnnamed1006(o.secondaryRects);
+    checkUnnamed1243(o.rects);
+    checkUnnamed1244(o.secondaryRects);
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(o.value, unittest.equals('foo'));
   }
   buildCounterPagespeedApiFormatStringV2Args--;
 }
 
-buildUnnamed1007() {
+buildUnnamed1245() {
   var o = new core.List<api.PagespeedApiFormatStringV2Args>();
   o.add(buildPagespeedApiFormatStringV2Args());
   o.add(buildPagespeedApiFormatStringV2Args());
   return o;
 }
 
-checkUnnamed1007(core.List<api.PagespeedApiFormatStringV2Args> o) {
+checkUnnamed1245(core.List<api.PagespeedApiFormatStringV2Args> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPagespeedApiFormatStringV2Args(o[0]);
   checkPagespeedApiFormatStringV2Args(o[1]);
@@ -137,7 +172,7 @@
   var o = new api.PagespeedApiFormatStringV2();
   buildCounterPagespeedApiFormatStringV2++;
   if (buildCounterPagespeedApiFormatStringV2 < 3) {
-    o.args = buildUnnamed1007();
+    o.args = buildUnnamed1245();
     o.format = "foo";
   }
   buildCounterPagespeedApiFormatStringV2--;
@@ -147,7 +182,7 @@
 checkPagespeedApiFormatStringV2(api.PagespeedApiFormatStringV2 o) {
   buildCounterPagespeedApiFormatStringV2++;
   if (buildCounterPagespeedApiFormatStringV2 < 3) {
-    checkUnnamed1007(o.args);
+    checkUnnamed1245(o.args);
     unittest.expect(o.format, unittest.equals('foo'));
   }
   buildCounterPagespeedApiFormatStringV2--;
@@ -207,27 +242,27 @@
   buildCounterPagespeedApiImageV2--;
 }
 
-buildUnnamed1008() {
+buildUnnamed1246() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1008(core.List<core.String> o) {
+checkUnnamed1246(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1009() {
+buildUnnamed1247() {
   var o = new core.List<api.PagespeedApiFormatStringV2>();
   o.add(buildPagespeedApiFormatStringV2());
   o.add(buildPagespeedApiFormatStringV2());
   return o;
 }
 
-checkUnnamed1009(core.List<api.PagespeedApiFormatStringV2> o) {
+checkUnnamed1247(core.List<api.PagespeedApiFormatStringV2> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPagespeedApiFormatStringV2(o[0]);
   checkPagespeedApiFormatStringV2(o[1]);
@@ -238,7 +273,7 @@
   var o = new api.ResultFormattedResultsRuleResultsValueUrlBlocksUrls();
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrls++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrls < 3) {
-    o.details = buildUnnamed1009();
+    o.details = buildUnnamed1247();
     o.result = buildPagespeedApiFormatStringV2();
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrls--;
@@ -248,20 +283,20 @@
 checkResultFormattedResultsRuleResultsValueUrlBlocksUrls(api.ResultFormattedResultsRuleResultsValueUrlBlocksUrls o) {
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrls++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrls < 3) {
-    checkUnnamed1009(o.details);
+    checkUnnamed1247(o.details);
     checkPagespeedApiFormatStringV2(o.result);
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrls--;
 }
 
-buildUnnamed1010() {
+buildUnnamed1248() {
   var o = new core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocksUrls>();
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocksUrls());
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocksUrls());
   return o;
 }
 
-checkUnnamed1010(core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocksUrls> o) {
+checkUnnamed1248(core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocksUrls> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResultFormattedResultsRuleResultsValueUrlBlocksUrls(o[0]);
   checkResultFormattedResultsRuleResultsValueUrlBlocksUrls(o[1]);
@@ -273,7 +308,7 @@
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocks++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocks < 3) {
     o.header = buildPagespeedApiFormatStringV2();
-    o.urls = buildUnnamed1010();
+    o.urls = buildUnnamed1248();
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocks--;
   return o;
@@ -283,19 +318,19 @@
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocks++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocks < 3) {
     checkPagespeedApiFormatStringV2(o.header);
-    checkUnnamed1010(o.urls);
+    checkUnnamed1248(o.urls);
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocks--;
 }
 
-buildUnnamed1011() {
+buildUnnamed1249() {
   var o = new core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocks>();
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocks());
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocks());
   return o;
 }
 
-checkUnnamed1011(core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocks> o) {
+checkUnnamed1249(core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocks> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResultFormattedResultsRuleResultsValueUrlBlocks(o[0]);
   checkResultFormattedResultsRuleResultsValueUrlBlocks(o[1]);
@@ -306,11 +341,11 @@
   var o = new api.ResultFormattedResultsRuleResultsValue();
   buildCounterResultFormattedResultsRuleResultsValue++;
   if (buildCounterResultFormattedResultsRuleResultsValue < 3) {
-    o.groups = buildUnnamed1008();
+    o.groups = buildUnnamed1246();
     o.localizedRuleName = "foo";
     o.ruleImpact = 42.0;
     o.summary = buildPagespeedApiFormatStringV2();
-    o.urlBlocks = buildUnnamed1011();
+    o.urlBlocks = buildUnnamed1249();
   }
   buildCounterResultFormattedResultsRuleResultsValue--;
   return o;
@@ -319,23 +354,23 @@
 checkResultFormattedResultsRuleResultsValue(api.ResultFormattedResultsRuleResultsValue o) {
   buildCounterResultFormattedResultsRuleResultsValue++;
   if (buildCounterResultFormattedResultsRuleResultsValue < 3) {
-    checkUnnamed1008(o.groups);
+    checkUnnamed1246(o.groups);
     unittest.expect(o.localizedRuleName, unittest.equals('foo'));
     unittest.expect(o.ruleImpact, unittest.equals(42.0));
     checkPagespeedApiFormatStringV2(o.summary);
-    checkUnnamed1011(o.urlBlocks);
+    checkUnnamed1249(o.urlBlocks);
   }
   buildCounterResultFormattedResultsRuleResultsValue--;
 }
 
-buildUnnamed1012() {
+buildUnnamed1250() {
   var o = new core.Map<core.String, api.ResultFormattedResultsRuleResultsValue>();
   o["x"] = buildResultFormattedResultsRuleResultsValue();
   o["y"] = buildResultFormattedResultsRuleResultsValue();
   return o;
 }
 
-checkUnnamed1012(core.Map<core.String, api.ResultFormattedResultsRuleResultsValue> o) {
+checkUnnamed1250(core.Map<core.String, api.ResultFormattedResultsRuleResultsValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResultFormattedResultsRuleResultsValue(o["x"]);
   checkResultFormattedResultsRuleResultsValue(o["y"]);
@@ -347,7 +382,7 @@
   buildCounterResultFormattedResults++;
   if (buildCounterResultFormattedResults < 3) {
     o.locale = "foo";
-    o.ruleResults = buildUnnamed1012();
+    o.ruleResults = buildUnnamed1250();
   }
   buildCounterResultFormattedResults--;
   return o;
@@ -357,19 +392,19 @@
   buildCounterResultFormattedResults++;
   if (buildCounterResultFormattedResults < 3) {
     unittest.expect(o.locale, unittest.equals('foo'));
-    checkUnnamed1012(o.ruleResults);
+    checkUnnamed1250(o.ruleResults);
   }
   buildCounterResultFormattedResults--;
 }
 
-buildUnnamed1013() {
+buildUnnamed1251() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1013(core.List<core.String> o) {
+checkUnnamed1251(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -437,14 +472,14 @@
   buildCounterResultRuleGroupsValue--;
 }
 
-buildUnnamed1014() {
+buildUnnamed1252() {
   var o = new core.Map<core.String, api.ResultRuleGroupsValue>();
   o["x"] = buildResultRuleGroupsValue();
   o["y"] = buildResultRuleGroupsValue();
   return o;
 }
 
-checkUnnamed1014(core.Map<core.String, api.ResultRuleGroupsValue> o) {
+checkUnnamed1252(core.Map<core.String, api.ResultRuleGroupsValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResultRuleGroupsValue(o["x"]);
   checkResultRuleGroupsValue(o["y"]);
@@ -478,11 +513,11 @@
   if (buildCounterResult < 3) {
     o.formattedResults = buildResultFormattedResults();
     o.id = "foo";
-    o.invalidRules = buildUnnamed1013();
+    o.invalidRules = buildUnnamed1251();
     o.kind = "foo";
     o.pageStats = buildResultPageStats();
     o.responseCode = 42;
-    o.ruleGroups = buildUnnamed1014();
+    o.ruleGroups = buildUnnamed1252();
     o.screenshot = buildPagespeedApiImageV2();
     o.title = "foo";
     o.version = buildResultVersion();
@@ -496,11 +531,11 @@
   if (buildCounterResult < 3) {
     checkResultFormattedResults(o.formattedResults);
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1013(o.invalidRules);
+    checkUnnamed1251(o.invalidRules);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkResultPageStats(o.pageStats);
     unittest.expect(o.responseCode, unittest.equals(42));
-    checkUnnamed1014(o.ruleGroups);
+    checkUnnamed1252(o.ruleGroups);
     checkPagespeedApiImageV2(o.screenshot);
     unittest.expect(o.title, unittest.equals('foo'));
     checkResultVersion(o.version);
@@ -508,14 +543,14 @@
   buildCounterResult--;
 }
 
-buildUnnamed1015() {
+buildUnnamed1253() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1015(core.List<core.String> o) {
+checkUnnamed1253(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -652,12 +687,12 @@
   unittest.group("resource-PagespeedapiResourceApi", () {
     unittest.test("method--runpagespeed", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PagespeedapiResourceApi res = new api.PagespeedonlineApi(mock).pagespeedapi;
       var arg_url = "foo";
       var arg_filterThirdPartyResources = true;
       var arg_locale = "foo";
-      var arg_rule = buildUnnamed1015();
+      var arg_rule = buildUnnamed1253();
       var arg_screenshot = true;
       var arg_strategy = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -700,7 +735,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildResult());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.runpagespeed(arg_url, filterThirdPartyResources: arg_filterThirdPartyResources, locale: arg_locale, rule: arg_rule, screenshot: arg_screenshot, strategy: arg_strategy).then(unittest.expectAsync(((api.Result response) {
         checkResult(response);
diff --git a/generated/googleapis/test/plus/v1_test.dart b/generated/googleapis/test/plus/v1_test.dart
index 3b3f246..8ac8de5 100644
--- a/generated/googleapis/test/plus/v1_test.dart
+++ b/generated/googleapis/test/plus/v1_test.dart
@@ -8,22 +8,57 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/plus/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
 
-buildUnnamed144() {
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+buildUnnamed1254() {
   var o = new core.List<api.PlusAclentryResource>();
   o.add(buildPlusAclentryResource());
   o.add(buildPlusAclentryResource());
   return o;
 }
 
-checkUnnamed144(core.List<api.PlusAclentryResource> o) {
+checkUnnamed1254(core.List<api.PlusAclentryResource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlusAclentryResource(o[0]);
   checkPlusAclentryResource(o[1]);
@@ -35,7 +70,7 @@
   buildCounterAcl++;
   if (buildCounterAcl < 3) {
     o.description = "foo";
-    o.items = buildUnnamed144();
+    o.items = buildUnnamed1254();
     o.kind = "foo";
   }
   buildCounterAcl--;
@@ -46,7 +81,7 @@
   buildCounterAcl++;
   if (buildCounterAcl < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed144(o.items);
+    checkUnnamed1254(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAcl--;
@@ -282,14 +317,14 @@
   buildCounterActivityObjectAttachmentsThumbnails--;
 }
 
-buildUnnamed145() {
+buildUnnamed1255() {
   var o = new core.List<api.ActivityObjectAttachmentsThumbnails>();
   o.add(buildActivityObjectAttachmentsThumbnails());
   o.add(buildActivityObjectAttachmentsThumbnails());
   return o;
 }
 
-checkUnnamed145(core.List<api.ActivityObjectAttachmentsThumbnails> o) {
+checkUnnamed1255(core.List<api.ActivityObjectAttachmentsThumbnails> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivityObjectAttachmentsThumbnails(o[0]);
   checkActivityObjectAttachmentsThumbnails(o[1]);
@@ -307,7 +342,7 @@
     o.id = "foo";
     o.image = buildActivityObjectAttachmentsImage();
     o.objectType = "foo";
-    o.thumbnails = buildUnnamed145();
+    o.thumbnails = buildUnnamed1255();
     o.url = "foo";
   }
   buildCounterActivityObjectAttachments--;
@@ -324,20 +359,20 @@
     unittest.expect(o.id, unittest.equals('foo'));
     checkActivityObjectAttachmentsImage(o.image);
     unittest.expect(o.objectType, unittest.equals('foo'));
-    checkUnnamed145(o.thumbnails);
+    checkUnnamed1255(o.thumbnails);
     unittest.expect(o.url, unittest.equals('foo'));
   }
   buildCounterActivityObjectAttachments--;
 }
 
-buildUnnamed146() {
+buildUnnamed1256() {
   var o = new core.List<api.ActivityObjectAttachments>();
   o.add(buildActivityObjectAttachments());
   o.add(buildActivityObjectAttachments());
   return o;
 }
 
-checkUnnamed146(core.List<api.ActivityObjectAttachments> o) {
+checkUnnamed1256(core.List<api.ActivityObjectAttachments> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivityObjectAttachments(o[0]);
   checkActivityObjectAttachments(o[1]);
@@ -412,7 +447,7 @@
   buildCounterActivityObject++;
   if (buildCounterActivityObject < 3) {
     o.actor = buildActivityObjectActor();
-    o.attachments = buildUnnamed146();
+    o.attachments = buildUnnamed1256();
     o.content = "foo";
     o.id = "foo";
     o.objectType = "foo";
@@ -430,7 +465,7 @@
   buildCounterActivityObject++;
   if (buildCounterActivityObject < 3) {
     checkActivityObjectActor(o.actor);
-    checkUnnamed146(o.attachments);
+    checkUnnamed1256(o.attachments);
     unittest.expect(o.content, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.objectType, unittest.equals('foo'));
@@ -519,14 +554,14 @@
   buildCounterActivity--;
 }
 
-buildUnnamed147() {
+buildUnnamed1257() {
   var o = new core.List<api.Activity>();
   o.add(buildActivity());
   o.add(buildActivity());
   return o;
 }
 
-checkUnnamed147(core.List<api.Activity> o) {
+checkUnnamed1257(core.List<api.Activity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivity(o[0]);
   checkActivity(o[1]);
@@ -539,7 +574,7 @@
   if (buildCounterActivityFeed < 3) {
     o.etag = "foo";
     o.id = "foo";
-    o.items = buildUnnamed147();
+    o.items = buildUnnamed1257();
     o.kind = "foo";
     o.nextLink = "foo";
     o.nextPageToken = "foo";
@@ -556,7 +591,7 @@
   if (buildCounterActivityFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed147(o.items);
+    checkUnnamed1257(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -632,14 +667,14 @@
   buildCounterCommentInReplyTo--;
 }
 
-buildUnnamed148() {
+buildUnnamed1258() {
   var o = new core.List<api.CommentInReplyTo>();
   o.add(buildCommentInReplyTo());
   o.add(buildCommentInReplyTo());
   return o;
 }
 
-checkUnnamed148(core.List<api.CommentInReplyTo> o) {
+checkUnnamed1258(core.List<api.CommentInReplyTo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCommentInReplyTo(o[0]);
   checkCommentInReplyTo(o[1]);
@@ -695,7 +730,7 @@
     o.actor = buildCommentActor();
     o.etag = "foo";
     o.id = "foo";
-    o.inReplyTo = buildUnnamed148();
+    o.inReplyTo = buildUnnamed1258();
     o.kind = "foo";
     o.object = buildCommentObject();
     o.plusoners = buildCommentPlusoners();
@@ -714,7 +749,7 @@
     checkCommentActor(o.actor);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed148(o.inReplyTo);
+    checkUnnamed1258(o.inReplyTo);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkCommentObject(o.object);
     checkCommentPlusoners(o.plusoners);
@@ -726,14 +761,14 @@
   buildCounterComment--;
 }
 
-buildUnnamed149() {
+buildUnnamed1259() {
   var o = new core.List<api.Comment>();
   o.add(buildComment());
   o.add(buildComment());
   return o;
 }
 
-checkUnnamed149(core.List<api.Comment> o) {
+checkUnnamed1259(core.List<api.Comment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkComment(o[0]);
   checkComment(o[1]);
@@ -746,7 +781,7 @@
   if (buildCounterCommentFeed < 3) {
     o.etag = "foo";
     o.id = "foo";
-    o.items = buildUnnamed149();
+    o.items = buildUnnamed1259();
     o.kind = "foo";
     o.nextLink = "foo";
     o.nextPageToken = "foo";
@@ -762,7 +797,7 @@
   if (buildCounterCommentFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed149(o.items);
+    checkUnnamed1259(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -772,79 +807,79 @@
   buildCounterCommentFeed--;
 }
 
-buildUnnamed150() {
+buildUnnamed1260() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed150(core.List<core.String> o) {
+checkUnnamed1260(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed151() {
+buildUnnamed1261() {
   var o = new core.List<api.ItemScope>();
   o.add(buildItemScope());
   o.add(buildItemScope());
   return o;
 }
 
-checkUnnamed151(core.List<api.ItemScope> o) {
+checkUnnamed1261(core.List<api.ItemScope> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkItemScope(o[0]);
   checkItemScope(o[1]);
 }
 
-buildUnnamed152() {
+buildUnnamed1262() {
   var o = new core.List<api.ItemScope>();
   o.add(buildItemScope());
   o.add(buildItemScope());
   return o;
 }
 
-checkUnnamed152(core.List<api.ItemScope> o) {
+checkUnnamed1262(core.List<api.ItemScope> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkItemScope(o[0]);
   checkItemScope(o[1]);
 }
 
-buildUnnamed153() {
+buildUnnamed1263() {
   var o = new core.List<api.ItemScope>();
   o.add(buildItemScope());
   o.add(buildItemScope());
   return o;
 }
 
-checkUnnamed153(core.List<api.ItemScope> o) {
+checkUnnamed1263(core.List<api.ItemScope> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkItemScope(o[0]);
   checkItemScope(o[1]);
 }
 
-buildUnnamed154() {
+buildUnnamed1264() {
   var o = new core.List<api.ItemScope>();
   o.add(buildItemScope());
   o.add(buildItemScope());
   return o;
 }
 
-checkUnnamed154(core.List<api.ItemScope> o) {
+checkUnnamed1264(core.List<api.ItemScope> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkItemScope(o[0]);
   checkItemScope(o[1]);
 }
 
-buildUnnamed155() {
+buildUnnamed1265() {
   var o = new core.List<api.ItemScope>();
   o.add(buildItemScope());
   o.add(buildItemScope());
   return o;
 }
 
-checkUnnamed155(core.List<api.ItemScope> o) {
+checkUnnamed1265(core.List<api.ItemScope> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkItemScope(o[0]);
   checkItemScope(o[1]);
@@ -856,23 +891,23 @@
   buildCounterItemScope++;
   if (buildCounterItemScope < 3) {
     o.about = buildItemScope();
-    o.additionalName = buildUnnamed150();
+    o.additionalName = buildUnnamed1260();
     o.address = buildItemScope();
     o.addressCountry = "foo";
     o.addressLocality = "foo";
     o.addressRegion = "foo";
-    o.associatedMedia = buildUnnamed151();
+    o.associatedMedia = buildUnnamed1261();
     o.attendeeCount = 42;
-    o.attendees = buildUnnamed152();
+    o.attendees = buildUnnamed1262();
     o.audio = buildItemScope();
-    o.author = buildUnnamed153();
+    o.author = buildUnnamed1263();
     o.bestRating = "foo";
     o.birthDate = "foo";
     o.byArtist = buildItemScope();
     o.caption = "foo";
     o.contentSize = "foo";
     o.contentUrl = "foo";
-    o.contributor = buildUnnamed154();
+    o.contributor = buildUnnamed1264();
     o.dateCreated = "foo";
     o.dateModified = "foo";
     o.datePublished = "foo";
@@ -894,7 +929,7 @@
     o.longitude = 42.0;
     o.name = "foo";
     o.partOfTVSeries = buildItemScope();
-    o.performers = buildUnnamed155();
+    o.performers = buildUnnamed1265();
     o.playerType = "foo";
     o.postOfficeBoxNumber = "foo";
     o.postalCode = "foo";
@@ -919,23 +954,23 @@
   buildCounterItemScope++;
   if (buildCounterItemScope < 3) {
     checkItemScope(o.about);
-    checkUnnamed150(o.additionalName);
+    checkUnnamed1260(o.additionalName);
     checkItemScope(o.address);
     unittest.expect(o.addressCountry, unittest.equals('foo'));
     unittest.expect(o.addressLocality, unittest.equals('foo'));
     unittest.expect(o.addressRegion, unittest.equals('foo'));
-    checkUnnamed151(o.associatedMedia);
+    checkUnnamed1261(o.associatedMedia);
     unittest.expect(o.attendeeCount, unittest.equals(42));
-    checkUnnamed152(o.attendees);
+    checkUnnamed1262(o.attendees);
     checkItemScope(o.audio);
-    checkUnnamed153(o.author);
+    checkUnnamed1263(o.author);
     unittest.expect(o.bestRating, unittest.equals('foo'));
     unittest.expect(o.birthDate, unittest.equals('foo'));
     checkItemScope(o.byArtist);
     unittest.expect(o.caption, unittest.equals('foo'));
     unittest.expect(o.contentSize, unittest.equals('foo'));
     unittest.expect(o.contentUrl, unittest.equals('foo'));
-    checkUnnamed154(o.contributor);
+    checkUnnamed1264(o.contributor);
     unittest.expect(o.dateCreated, unittest.equals('foo'));
     unittest.expect(o.dateModified, unittest.equals('foo'));
     unittest.expect(o.datePublished, unittest.equals('foo'));
@@ -957,7 +992,7 @@
     unittest.expect(o.longitude, unittest.equals(42.0));
     unittest.expect(o.name, unittest.equals('foo'));
     checkItemScope(o.partOfTVSeries);
-    checkUnnamed155(o.performers);
+    checkUnnamed1265(o.performers);
     unittest.expect(o.playerType, unittest.equals('foo'));
     unittest.expect(o.postOfficeBoxNumber, unittest.equals('foo'));
     unittest.expect(o.postalCode, unittest.equals('foo'));
@@ -1008,14 +1043,14 @@
   buildCounterMoment--;
 }
 
-buildUnnamed156() {
+buildUnnamed1266() {
   var o = new core.List<api.Moment>();
   o.add(buildMoment());
   o.add(buildMoment());
   return o;
 }
 
-checkUnnamed156(core.List<api.Moment> o) {
+checkUnnamed1266(core.List<api.Moment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMoment(o[0]);
   checkMoment(o[1]);
@@ -1027,7 +1062,7 @@
   buildCounterMomentsFeed++;
   if (buildCounterMomentsFeed < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed156();
+    o.items = buildUnnamed1266();
     o.kind = "foo";
     o.nextLink = "foo";
     o.nextPageToken = "foo";
@@ -1043,7 +1078,7 @@
   buildCounterMomentsFeed++;
   if (buildCounterMomentsFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed156(o.items);
+    checkUnnamed1266(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -1054,14 +1089,14 @@
   buildCounterMomentsFeed--;
 }
 
-buildUnnamed157() {
+buildUnnamed1267() {
   var o = new core.List<api.Person>();
   o.add(buildPerson());
   o.add(buildPerson());
   return o;
 }
 
-checkUnnamed157(core.List<api.Person> o) {
+checkUnnamed1267(core.List<api.Person> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPerson(o[0]);
   checkPerson(o[1]);
@@ -1073,7 +1108,7 @@
   buildCounterPeopleFeed++;
   if (buildCounterPeopleFeed < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed157();
+    o.items = buildUnnamed1267();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -1088,7 +1123,7 @@
   buildCounterPeopleFeed++;
   if (buildCounterPeopleFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed157(o.items);
+    checkUnnamed1267(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -1207,14 +1242,14 @@
   buildCounterPersonEmails--;
 }
 
-buildUnnamed158() {
+buildUnnamed1268() {
   var o = new core.List<api.PersonEmails>();
   o.add(buildPersonEmails());
   o.add(buildPersonEmails());
   return o;
 }
 
-checkUnnamed158(core.List<api.PersonEmails> o) {
+checkUnnamed1268(core.List<api.PersonEmails> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersonEmails(o[0]);
   checkPersonEmails(o[1]);
@@ -1305,14 +1340,14 @@
   buildCounterPersonOrganizations--;
 }
 
-buildUnnamed159() {
+buildUnnamed1269() {
   var o = new core.List<api.PersonOrganizations>();
   o.add(buildPersonOrganizations());
   o.add(buildPersonOrganizations());
   return o;
 }
 
-checkUnnamed159(core.List<api.PersonOrganizations> o) {
+checkUnnamed1269(core.List<api.PersonOrganizations> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersonOrganizations(o[0]);
   checkPersonOrganizations(o[1]);
@@ -1339,14 +1374,14 @@
   buildCounterPersonPlacesLived--;
 }
 
-buildUnnamed160() {
+buildUnnamed1270() {
   var o = new core.List<api.PersonPlacesLived>();
   o.add(buildPersonPlacesLived());
   o.add(buildPersonPlacesLived());
   return o;
 }
 
-checkUnnamed160(core.List<api.PersonPlacesLived> o) {
+checkUnnamed1270(core.List<api.PersonPlacesLived> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersonPlacesLived(o[0]);
   checkPersonPlacesLived(o[1]);
@@ -1375,14 +1410,14 @@
   buildCounterPersonUrls--;
 }
 
-buildUnnamed161() {
+buildUnnamed1271() {
   var o = new core.List<api.PersonUrls>();
   o.add(buildPersonUrls());
   o.add(buildPersonUrls());
   return o;
 }
 
-checkUnnamed161(core.List<api.PersonUrls> o) {
+checkUnnamed1271(core.List<api.PersonUrls> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersonUrls(o[0]);
   checkPersonUrls(o[1]);
@@ -1402,7 +1437,7 @@
     o.currentLocation = "foo";
     o.displayName = "foo";
     o.domain = "foo";
-    o.emails = buildUnnamed158();
+    o.emails = buildUnnamed1268();
     o.etag = "foo";
     o.gender = "foo";
     o.id = "foo";
@@ -1414,14 +1449,14 @@
     o.nickname = "foo";
     o.objectType = "foo";
     o.occupation = "foo";
-    o.organizations = buildUnnamed159();
-    o.placesLived = buildUnnamed160();
+    o.organizations = buildUnnamed1269();
+    o.placesLived = buildUnnamed1270();
     o.plusOneCount = 42;
     o.relationshipStatus = "foo";
     o.skills = "foo";
     o.tagline = "foo";
     o.url = "foo";
-    o.urls = buildUnnamed161();
+    o.urls = buildUnnamed1271();
     o.verified = true;
   }
   buildCounterPerson--;
@@ -1440,7 +1475,7 @@
     unittest.expect(o.currentLocation, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
     unittest.expect(o.domain, unittest.equals('foo'));
-    checkUnnamed158(o.emails);
+    checkUnnamed1268(o.emails);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.gender, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
@@ -1452,14 +1487,14 @@
     unittest.expect(o.nickname, unittest.equals('foo'));
     unittest.expect(o.objectType, unittest.equals('foo'));
     unittest.expect(o.occupation, unittest.equals('foo'));
-    checkUnnamed159(o.organizations);
-    checkUnnamed160(o.placesLived);
+    checkUnnamed1269(o.organizations);
+    checkUnnamed1270(o.placesLived);
     unittest.expect(o.plusOneCount, unittest.equals(42));
     unittest.expect(o.relationshipStatus, unittest.equals('foo'));
     unittest.expect(o.skills, unittest.equals('foo'));
     unittest.expect(o.tagline, unittest.equals('foo'));
     unittest.expect(o.url, unittest.equals('foo'));
-    checkUnnamed161(o.urls);
+    checkUnnamed1271(o.urls);
     unittest.expect(o.verified, unittest.isTrue);
   }
   buildCounterPerson--;
@@ -1965,7 +2000,7 @@
   unittest.group("resource-ActivitiesResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ActivitiesResourceApi res = new api.PlusApi(mock).activities;
       var arg_activityId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2005,7 +2040,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildActivity());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_activityId).then(unittest.expectAsync(((api.Activity response) {
         checkActivity(response);
@@ -2014,7 +2049,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ActivitiesResourceApi res = new api.PlusApi(mock).activities;
       var arg_userId = "foo";
       var arg_collection = "foo";
@@ -2066,7 +2101,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildActivityFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userId, arg_collection, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.ActivityFeed response) {
         checkActivityFeed(response);
@@ -2075,7 +2110,7 @@
 
     unittest.test("method--search", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ActivitiesResourceApi res = new api.PlusApi(mock).activities;
       var arg_query = "foo";
       var arg_language = "foo";
@@ -2121,7 +2156,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildActivityFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.search(arg_query, language: arg_language, maxResults: arg_maxResults, orderBy: arg_orderBy, pageToken: arg_pageToken).then(unittest.expectAsync(((api.ActivityFeed response) {
         checkActivityFeed(response);
@@ -2134,7 +2169,7 @@
   unittest.group("resource-CommentsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CommentsResourceApi res = new api.PlusApi(mock).comments;
       var arg_commentId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2174,7 +2209,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildComment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_commentId).then(unittest.expectAsync(((api.Comment response) {
         checkComment(response);
@@ -2183,7 +2218,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CommentsResourceApi res = new api.PlusApi(mock).comments;
       var arg_activityId = "foo";
       var arg_maxResults = 42;
@@ -2233,7 +2268,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCommentFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_activityId, maxResults: arg_maxResults, pageToken: arg_pageToken, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.CommentFeed response) {
         checkCommentFeed(response);
@@ -2246,7 +2281,7 @@
   unittest.group("resource-MomentsResourceApi", () {
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MomentsResourceApi res = new api.PlusApi(mock).moments;
       var arg_request = buildMoment();
       var arg_userId = "foo";
@@ -2300,7 +2335,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMoment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_userId, arg_collection, debug: arg_debug).then(unittest.expectAsync(((api.Moment response) {
         checkMoment(response);
@@ -2309,7 +2344,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MomentsResourceApi res = new api.PlusApi(mock).moments;
       var arg_userId = "foo";
       var arg_collection = "foo";
@@ -2365,7 +2400,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMomentsFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userId, arg_collection, maxResults: arg_maxResults, pageToken: arg_pageToken, targetUrl: arg_targetUrl, type: arg_type).then(unittest.expectAsync(((api.MomentsFeed response) {
         checkMomentsFeed(response);
@@ -2374,7 +2409,7 @@
 
     unittest.test("method--remove", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MomentsResourceApi res = new api.PlusApi(mock).moments;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2414,7 +2449,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.remove(arg_id).then(unittest.expectAsync((_) {}));
     });
@@ -2425,7 +2460,7 @@
   unittest.group("resource-PeopleResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PeopleResourceApi res = new api.PlusApi(mock).people;
       var arg_userId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2465,7 +2500,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPerson());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_userId).then(unittest.expectAsync(((api.Person response) {
         checkPerson(response);
@@ -2474,7 +2509,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PeopleResourceApi res = new api.PlusApi(mock).people;
       var arg_userId = "foo";
       var arg_collection = "foo";
@@ -2528,7 +2563,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPeopleFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userId, arg_collection, maxResults: arg_maxResults, orderBy: arg_orderBy, pageToken: arg_pageToken).then(unittest.expectAsync(((api.PeopleFeed response) {
         checkPeopleFeed(response);
@@ -2537,7 +2572,7 @@
 
     unittest.test("method--listByActivity", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PeopleResourceApi res = new api.PlusApi(mock).people;
       var arg_activityId = "foo";
       var arg_collection = "foo";
@@ -2589,7 +2624,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPeopleFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.listByActivity(arg_activityId, arg_collection, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.PeopleFeed response) {
         checkPeopleFeed(response);
@@ -2598,7 +2633,7 @@
 
     unittest.test("method--search", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PeopleResourceApi res = new api.PlusApi(mock).people;
       var arg_query = "foo";
       var arg_language = "foo";
@@ -2642,7 +2677,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPeopleFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.search(arg_query, language: arg_language, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.PeopleFeed response) {
         checkPeopleFeed(response);
diff --git a/generated/googleapis/test/plusdomains/v1_test.dart b/generated/googleapis/test/plusdomains/v1_test.dart
index c617ac4..b52c533 100644
--- a/generated/googleapis/test/plusdomains/v1_test.dart
+++ b/generated/googleapis/test/plusdomains/v1_test.dart
@@ -8,22 +8,57 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/plusdomains/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
 
-buildUnnamed951() {
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+buildUnnamed1272() {
   var o = new core.List<api.PlusDomainsAclentryResource>();
   o.add(buildPlusDomainsAclentryResource());
   o.add(buildPlusDomainsAclentryResource());
   return o;
 }
 
-checkUnnamed951(core.List<api.PlusDomainsAclentryResource> o) {
+checkUnnamed1272(core.List<api.PlusDomainsAclentryResource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlusDomainsAclentryResource(o[0]);
   checkPlusDomainsAclentryResource(o[1]);
@@ -36,7 +71,7 @@
   if (buildCounterAcl < 3) {
     o.description = "foo";
     o.domainRestricted = true;
-    o.items = buildUnnamed951();
+    o.items = buildUnnamed1272();
     o.kind = "foo";
   }
   buildCounterAcl--;
@@ -48,7 +83,7 @@
   if (buildCounterAcl < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.domainRestricted, unittest.isTrue);
-    checkUnnamed951(o.items);
+    checkUnnamed1272(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAcl--;
@@ -255,14 +290,14 @@
   buildCounterActivityObjectAttachmentsPreviewThumbnails--;
 }
 
-buildUnnamed952() {
+buildUnnamed1273() {
   var o = new core.List<api.ActivityObjectAttachmentsPreviewThumbnails>();
   o.add(buildActivityObjectAttachmentsPreviewThumbnails());
   o.add(buildActivityObjectAttachmentsPreviewThumbnails());
   return o;
 }
 
-checkUnnamed952(core.List<api.ActivityObjectAttachmentsPreviewThumbnails> o) {
+checkUnnamed1273(core.List<api.ActivityObjectAttachmentsPreviewThumbnails> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivityObjectAttachmentsPreviewThumbnails(o[0]);
   checkActivityObjectAttachmentsPreviewThumbnails(o[1]);
@@ -316,14 +351,14 @@
   buildCounterActivityObjectAttachmentsThumbnails--;
 }
 
-buildUnnamed953() {
+buildUnnamed1274() {
   var o = new core.List<api.ActivityObjectAttachmentsThumbnails>();
   o.add(buildActivityObjectAttachmentsThumbnails());
   o.add(buildActivityObjectAttachmentsThumbnails());
   return o;
 }
 
-checkUnnamed953(core.List<api.ActivityObjectAttachmentsThumbnails> o) {
+checkUnnamed1274(core.List<api.ActivityObjectAttachmentsThumbnails> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivityObjectAttachmentsThumbnails(o[0]);
   checkActivityObjectAttachmentsThumbnails(o[1]);
@@ -341,8 +376,8 @@
     o.id = "foo";
     o.image = buildActivityObjectAttachmentsImage();
     o.objectType = "foo";
-    o.previewThumbnails = buildUnnamed952();
-    o.thumbnails = buildUnnamed953();
+    o.previewThumbnails = buildUnnamed1273();
+    o.thumbnails = buildUnnamed1274();
     o.url = "foo";
   }
   buildCounterActivityObjectAttachments--;
@@ -359,21 +394,21 @@
     unittest.expect(o.id, unittest.equals('foo'));
     checkActivityObjectAttachmentsImage(o.image);
     unittest.expect(o.objectType, unittest.equals('foo'));
-    checkUnnamed952(o.previewThumbnails);
-    checkUnnamed953(o.thumbnails);
+    checkUnnamed1273(o.previewThumbnails);
+    checkUnnamed1274(o.thumbnails);
     unittest.expect(o.url, unittest.equals('foo'));
   }
   buildCounterActivityObjectAttachments--;
 }
 
-buildUnnamed954() {
+buildUnnamed1275() {
   var o = new core.List<api.ActivityObjectAttachments>();
   o.add(buildActivityObjectAttachments());
   o.add(buildActivityObjectAttachments());
   return o;
 }
 
-checkUnnamed954(core.List<api.ActivityObjectAttachments> o) {
+checkUnnamed1275(core.List<api.ActivityObjectAttachments> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivityObjectAttachments(o[0]);
   checkActivityObjectAttachments(o[1]);
@@ -475,7 +510,7 @@
   buildCounterActivityObject++;
   if (buildCounterActivityObject < 3) {
     o.actor = buildActivityObjectActor();
-    o.attachments = buildUnnamed954();
+    o.attachments = buildUnnamed1275();
     o.content = "foo";
     o.id = "foo";
     o.objectType = "foo";
@@ -494,7 +529,7 @@
   buildCounterActivityObject++;
   if (buildCounterActivityObject < 3) {
     checkActivityObjectActor(o.actor);
-    checkUnnamed954(o.attachments);
+    checkUnnamed1275(o.attachments);
     unittest.expect(o.content, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.objectType, unittest.equals('foo'));
@@ -584,14 +619,14 @@
   buildCounterActivity--;
 }
 
-buildUnnamed955() {
+buildUnnamed1276() {
   var o = new core.List<api.Activity>();
   o.add(buildActivity());
   o.add(buildActivity());
   return o;
 }
 
-checkUnnamed955(core.List<api.Activity> o) {
+checkUnnamed1276(core.List<api.Activity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivity(o[0]);
   checkActivity(o[1]);
@@ -604,7 +639,7 @@
   if (buildCounterActivityFeed < 3) {
     o.etag = "foo";
     o.id = "foo";
-    o.items = buildUnnamed955();
+    o.items = buildUnnamed1276();
     o.kind = "foo";
     o.nextLink = "foo";
     o.nextPageToken = "foo";
@@ -621,7 +656,7 @@
   if (buildCounterActivityFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed955(o.items);
+    checkUnnamed1276(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -659,14 +694,14 @@
   buildCounterAudience--;
 }
 
-buildUnnamed956() {
+buildUnnamed1277() {
   var o = new core.List<api.Audience>();
   o.add(buildAudience());
   o.add(buildAudience());
   return o;
 }
 
-checkUnnamed956(core.List<api.Audience> o) {
+checkUnnamed1277(core.List<api.Audience> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAudience(o[0]);
   checkAudience(o[1]);
@@ -678,7 +713,7 @@
   buildCounterAudiencesFeed++;
   if (buildCounterAudiencesFeed < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed956();
+    o.items = buildUnnamed1277();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
@@ -691,7 +726,7 @@
   buildCounterAudiencesFeed++;
   if (buildCounterAudiencesFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed956(o.items);
+    checkUnnamed1277(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -749,14 +784,14 @@
   buildCounterCircle--;
 }
 
-buildUnnamed957() {
+buildUnnamed1278() {
   var o = new core.List<api.Circle>();
   o.add(buildCircle());
   o.add(buildCircle());
   return o;
 }
 
-checkUnnamed957(core.List<api.Circle> o) {
+checkUnnamed1278(core.List<api.Circle> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCircle(o[0]);
   checkCircle(o[1]);
@@ -768,7 +803,7 @@
   buildCounterCircleFeed++;
   if (buildCounterCircleFeed < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed957();
+    o.items = buildUnnamed1278();
     o.kind = "foo";
     o.nextLink = "foo";
     o.nextPageToken = "foo";
@@ -784,7 +819,7 @@
   buildCounterCircleFeed++;
   if (buildCounterCircleFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed957(o.items);
+    checkUnnamed1278(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -860,14 +895,14 @@
   buildCounterCommentInReplyTo--;
 }
 
-buildUnnamed958() {
+buildUnnamed1279() {
   var o = new core.List<api.CommentInReplyTo>();
   o.add(buildCommentInReplyTo());
   o.add(buildCommentInReplyTo());
   return o;
 }
 
-checkUnnamed958(core.List<api.CommentInReplyTo> o) {
+checkUnnamed1279(core.List<api.CommentInReplyTo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCommentInReplyTo(o[0]);
   checkCommentInReplyTo(o[1]);
@@ -923,7 +958,7 @@
     o.actor = buildCommentActor();
     o.etag = "foo";
     o.id = "foo";
-    o.inReplyTo = buildUnnamed958();
+    o.inReplyTo = buildUnnamed1279();
     o.kind = "foo";
     o.object = buildCommentObject();
     o.plusoners = buildCommentPlusoners();
@@ -942,7 +977,7 @@
     checkCommentActor(o.actor);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed958(o.inReplyTo);
+    checkUnnamed1279(o.inReplyTo);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkCommentObject(o.object);
     checkCommentPlusoners(o.plusoners);
@@ -954,14 +989,14 @@
   buildCounterComment--;
 }
 
-buildUnnamed959() {
+buildUnnamed1280() {
   var o = new core.List<api.Comment>();
   o.add(buildComment());
   o.add(buildComment());
   return o;
 }
 
-checkUnnamed959(core.List<api.Comment> o) {
+checkUnnamed1280(core.List<api.Comment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkComment(o[0]);
   checkComment(o[1]);
@@ -974,7 +1009,7 @@
   if (buildCounterCommentFeed < 3) {
     o.etag = "foo";
     o.id = "foo";
-    o.items = buildUnnamed959();
+    o.items = buildUnnamed1280();
     o.kind = "foo";
     o.nextLink = "foo";
     o.nextPageToken = "foo";
@@ -990,7 +1025,7 @@
   if (buildCounterCommentFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed959(o.items);
+    checkUnnamed1280(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -1063,14 +1098,14 @@
   buildCounterMediaExif--;
 }
 
-buildUnnamed960() {
+buildUnnamed1281() {
   var o = new core.List<api.Videostream>();
   o.add(buildVideostream());
   o.add(buildVideostream());
   return o;
 }
 
-checkUnnamed960(core.List<api.Videostream> o) {
+checkUnnamed1281(core.List<api.Videostream> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVideostream(o[0]);
   checkVideostream(o[1]);
@@ -1092,7 +1127,7 @@
     o.mediaUrl = "foo";
     o.published = core.DateTime.parse("2002-02-27T14:01:02");
     o.sizeBytes = "foo";
-    o.streams = buildUnnamed960();
+    o.streams = buildUnnamed1281();
     o.summary = "foo";
     o.updated = core.DateTime.parse("2002-02-27T14:01:02");
     o.url = "foo";
@@ -1118,7 +1153,7 @@
     unittest.expect(o.mediaUrl, unittest.equals('foo'));
     unittest.expect(o.published, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.sizeBytes, unittest.equals('foo'));
-    checkUnnamed960(o.streams);
+    checkUnnamed1281(o.streams);
     unittest.expect(o.summary, unittest.equals('foo'));
     unittest.expect(o.updated, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.url, unittest.equals('foo'));
@@ -1129,14 +1164,14 @@
   buildCounterMedia--;
 }
 
-buildUnnamed961() {
+buildUnnamed1282() {
   var o = new core.List<api.Person>();
   o.add(buildPerson());
   o.add(buildPerson());
   return o;
 }
 
-checkUnnamed961(core.List<api.Person> o) {
+checkUnnamed1282(core.List<api.Person> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPerson(o[0]);
   checkPerson(o[1]);
@@ -1148,7 +1183,7 @@
   buildCounterPeopleFeed++;
   if (buildCounterPeopleFeed < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed961();
+    o.items = buildUnnamed1282();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -1163,7 +1198,7 @@
   buildCounterPeopleFeed++;
   if (buildCounterPeopleFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed961(o.items);
+    checkUnnamed1282(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -1261,14 +1296,14 @@
   buildCounterPersonEmails--;
 }
 
-buildUnnamed962() {
+buildUnnamed1283() {
   var o = new core.List<api.PersonEmails>();
   o.add(buildPersonEmails());
   o.add(buildPersonEmails());
   return o;
 }
 
-checkUnnamed962(core.List<api.PersonEmails> o) {
+checkUnnamed1283(core.List<api.PersonEmails> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersonEmails(o[0]);
   checkPersonEmails(o[1]);
@@ -1359,14 +1394,14 @@
   buildCounterPersonOrganizations--;
 }
 
-buildUnnamed963() {
+buildUnnamed1284() {
   var o = new core.List<api.PersonOrganizations>();
   o.add(buildPersonOrganizations());
   o.add(buildPersonOrganizations());
   return o;
 }
 
-checkUnnamed963(core.List<api.PersonOrganizations> o) {
+checkUnnamed1284(core.List<api.PersonOrganizations> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersonOrganizations(o[0]);
   checkPersonOrganizations(o[1]);
@@ -1393,14 +1428,14 @@
   buildCounterPersonPlacesLived--;
 }
 
-buildUnnamed964() {
+buildUnnamed1285() {
   var o = new core.List<api.PersonPlacesLived>();
   o.add(buildPersonPlacesLived());
   o.add(buildPersonPlacesLived());
   return o;
 }
 
-checkUnnamed964(core.List<api.PersonPlacesLived> o) {
+checkUnnamed1285(core.List<api.PersonPlacesLived> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersonPlacesLived(o[0]);
   checkPersonPlacesLived(o[1]);
@@ -1429,14 +1464,14 @@
   buildCounterPersonUrls--;
 }
 
-buildUnnamed965() {
+buildUnnamed1286() {
   var o = new core.List<api.PersonUrls>();
   o.add(buildPersonUrls());
   o.add(buildPersonUrls());
   return o;
 }
 
-checkUnnamed965(core.List<api.PersonUrls> o) {
+checkUnnamed1286(core.List<api.PersonUrls> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersonUrls(o[0]);
   checkPersonUrls(o[1]);
@@ -1455,7 +1490,7 @@
     o.currentLocation = "foo";
     o.displayName = "foo";
     o.domain = "foo";
-    o.emails = buildUnnamed962();
+    o.emails = buildUnnamed1283();
     o.etag = "foo";
     o.gender = "foo";
     o.id = "foo";
@@ -1466,14 +1501,14 @@
     o.nickname = "foo";
     o.objectType = "foo";
     o.occupation = "foo";
-    o.organizations = buildUnnamed963();
-    o.placesLived = buildUnnamed964();
+    o.organizations = buildUnnamed1284();
+    o.placesLived = buildUnnamed1285();
     o.plusOneCount = 42;
     o.relationshipStatus = "foo";
     o.skills = "foo";
     o.tagline = "foo";
     o.url = "foo";
-    o.urls = buildUnnamed965();
+    o.urls = buildUnnamed1286();
     o.verified = true;
   }
   buildCounterPerson--;
@@ -1491,7 +1526,7 @@
     unittest.expect(o.currentLocation, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
     unittest.expect(o.domain, unittest.equals('foo'));
-    checkUnnamed962(o.emails);
+    checkUnnamed1283(o.emails);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.gender, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
@@ -1502,14 +1537,14 @@
     unittest.expect(o.nickname, unittest.equals('foo'));
     unittest.expect(o.objectType, unittest.equals('foo'));
     unittest.expect(o.occupation, unittest.equals('foo'));
-    checkUnnamed963(o.organizations);
-    checkUnnamed964(o.placesLived);
+    checkUnnamed1284(o.organizations);
+    checkUnnamed1285(o.placesLived);
     unittest.expect(o.plusOneCount, unittest.equals(42));
     unittest.expect(o.relationshipStatus, unittest.equals('foo'));
     unittest.expect(o.skills, unittest.equals('foo'));
     unittest.expect(o.tagline, unittest.equals('foo'));
     unittest.expect(o.url, unittest.equals('foo'));
-    checkUnnamed965(o.urls);
+    checkUnnamed1286(o.urls);
     unittest.expect(o.verified, unittest.isTrue);
   }
   buildCounterPerson--;
@@ -1630,53 +1665,53 @@
   buildCounterVideostream--;
 }
 
-buildUnnamed966() {
+buildUnnamed1287() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed966(core.List<core.String> o) {
+checkUnnamed1287(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed967() {
+buildUnnamed1288() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed967(core.List<core.String> o) {
+checkUnnamed1288(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed968() {
+buildUnnamed1289() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed968(core.List<core.String> o) {
+checkUnnamed1289(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed969() {
+buildUnnamed1290() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed969(core.List<core.String> o) {
+checkUnnamed1290(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2164,7 +2199,7 @@
   unittest.group("resource-ActivitiesResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ActivitiesResourceApi res = new api.PlusDomainsApi(mock).activities;
       var arg_activityId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2204,7 +2239,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildActivity());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_activityId).then(unittest.expectAsync(((api.Activity response) {
         checkActivity(response);
@@ -2213,7 +2248,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ActivitiesResourceApi res = new api.PlusDomainsApi(mock).activities;
       var arg_request = buildActivity();
       var arg_userId = "foo";
@@ -2263,7 +2298,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildActivity());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_userId, preview: arg_preview).then(unittest.expectAsync(((api.Activity response) {
         checkActivity(response);
@@ -2272,7 +2307,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ActivitiesResourceApi res = new api.PlusDomainsApi(mock).activities;
       var arg_userId = "foo";
       var arg_collection = "foo";
@@ -2324,7 +2359,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildActivityFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userId, arg_collection, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.ActivityFeed response) {
         checkActivityFeed(response);
@@ -2337,7 +2372,7 @@
   unittest.group("resource-AudiencesResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AudiencesResourceApi res = new api.PlusDomainsApi(mock).audiences;
       var arg_userId = "foo";
       var arg_maxResults = 42;
@@ -2385,7 +2420,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAudiencesFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.AudiencesFeed response) {
         checkAudiencesFeed(response);
@@ -2398,11 +2433,11 @@
   unittest.group("resource-CirclesResourceApi", () {
     unittest.test("method--addPeople", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CirclesResourceApi res = new api.PlusDomainsApi(mock).circles;
       var arg_circleId = "foo";
-      var arg_email = buildUnnamed966();
-      var arg_userId = buildUnnamed967();
+      var arg_email = buildUnnamed1287();
+      var arg_userId = buildUnnamed1288();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -2446,7 +2481,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCircle());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.addPeople(arg_circleId, email: arg_email, userId: arg_userId).then(unittest.expectAsync(((api.Circle response) {
         checkCircle(response);
@@ -2455,7 +2490,7 @@
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CirclesResourceApi res = new api.PlusDomainsApi(mock).circles;
       var arg_circleId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2495,7 +2530,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCircle());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_circleId).then(unittest.expectAsync(((api.Circle response) {
         checkCircle(response);
@@ -2504,7 +2539,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CirclesResourceApi res = new api.PlusDomainsApi(mock).circles;
       var arg_request = buildCircle();
       var arg_userId = "foo";
@@ -2552,7 +2587,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCircle());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_userId).then(unittest.expectAsync(((api.Circle response) {
         checkCircle(response);
@@ -2561,7 +2596,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CirclesResourceApi res = new api.PlusDomainsApi(mock).circles;
       var arg_userId = "foo";
       var arg_maxResults = 42;
@@ -2609,7 +2644,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCircleFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.CircleFeed response) {
         checkCircleFeed(response);
@@ -2618,7 +2653,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CirclesResourceApi res = new api.PlusDomainsApi(mock).circles;
       var arg_request = buildCircle();
       var arg_circleId = "foo";
@@ -2662,7 +2697,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCircle());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_circleId).then(unittest.expectAsync(((api.Circle response) {
         checkCircle(response);
@@ -2671,7 +2706,7 @@
 
     unittest.test("method--remove", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CirclesResourceApi res = new api.PlusDomainsApi(mock).circles;
       var arg_circleId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2711,18 +2746,18 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.remove(arg_circleId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--removePeople", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CirclesResourceApi res = new api.PlusDomainsApi(mock).circles;
       var arg_circleId = "foo";
-      var arg_email = buildUnnamed968();
-      var arg_userId = buildUnnamed969();
+      var arg_email = buildUnnamed1289();
+      var arg_userId = buildUnnamed1290();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -2766,14 +2801,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.removePeople(arg_circleId, email: arg_email, userId: arg_userId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CirclesResourceApi res = new api.PlusDomainsApi(mock).circles;
       var arg_request = buildCircle();
       var arg_circleId = "foo";
@@ -2817,7 +2852,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCircle());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_circleId).then(unittest.expectAsync(((api.Circle response) {
         checkCircle(response);
@@ -2830,7 +2865,7 @@
   unittest.group("resource-CommentsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CommentsResourceApi res = new api.PlusDomainsApi(mock).comments;
       var arg_commentId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2870,7 +2905,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildComment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_commentId).then(unittest.expectAsync(((api.Comment response) {
         checkComment(response);
@@ -2879,7 +2914,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CommentsResourceApi res = new api.PlusDomainsApi(mock).comments;
       var arg_request = buildComment();
       var arg_activityId = "foo";
@@ -2927,7 +2962,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildComment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_activityId).then(unittest.expectAsync(((api.Comment response) {
         checkComment(response);
@@ -2936,7 +2971,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CommentsResourceApi res = new api.PlusDomainsApi(mock).comments;
       var arg_activityId = "foo";
       var arg_maxResults = 42;
@@ -2986,7 +3021,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCommentFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_activityId, maxResults: arg_maxResults, pageToken: arg_pageToken, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.CommentFeed response) {
         checkCommentFeed(response);
@@ -3001,7 +3036,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MediaResourceApi res = new api.PlusDomainsApi(mock).media;
       var arg_request = buildMedia();
       var arg_userId = "foo";
@@ -3053,7 +3088,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMedia());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_userId, arg_collection).then(unittest.expectAsync(((api.Media response) {
         checkMedia(response);
@@ -3066,7 +3101,7 @@
   unittest.group("resource-PeopleResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PeopleResourceApi res = new api.PlusDomainsApi(mock).people;
       var arg_userId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -3106,7 +3141,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPerson());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_userId).then(unittest.expectAsync(((api.Person response) {
         checkPerson(response);
@@ -3115,7 +3150,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PeopleResourceApi res = new api.PlusDomainsApi(mock).people;
       var arg_userId = "foo";
       var arg_collection = "foo";
@@ -3169,7 +3204,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPeopleFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userId, arg_collection, maxResults: arg_maxResults, orderBy: arg_orderBy, pageToken: arg_pageToken).then(unittest.expectAsync(((api.PeopleFeed response) {
         checkPeopleFeed(response);
@@ -3178,7 +3213,7 @@
 
     unittest.test("method--listByActivity", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PeopleResourceApi res = new api.PlusDomainsApi(mock).people;
       var arg_activityId = "foo";
       var arg_collection = "foo";
@@ -3230,7 +3265,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPeopleFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.listByActivity(arg_activityId, arg_collection, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.PeopleFeed response) {
         checkPeopleFeed(response);
@@ -3239,7 +3274,7 @@
 
     unittest.test("method--listByCircle", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PeopleResourceApi res = new api.PlusDomainsApi(mock).people;
       var arg_circleId = "foo";
       var arg_maxResults = 42;
@@ -3287,7 +3322,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPeopleFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.listByCircle(arg_circleId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.PeopleFeed response) {
         checkPeopleFeed(response);
diff --git a/generated/googleapis/test/prediction/v1_6_test.dart b/generated/googleapis/test/prediction/v1_6_test.dart
index 662307b..5167039 100644
--- a/generated/googleapis/test/prediction/v1_6_test.dart
+++ b/generated/googleapis/test/prediction/v1_6_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/prediction/v1_6.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterAnalyzeDataDescriptionFeaturesCategoricalValues = 0;
 buildAnalyzeDataDescriptionFeaturesCategoricalValues() {
@@ -37,14 +72,14 @@
   buildCounterAnalyzeDataDescriptionFeaturesCategoricalValues--;
 }
 
-buildUnnamed1108() {
+buildUnnamed1291() {
   var o = new core.List<api.AnalyzeDataDescriptionFeaturesCategoricalValues>();
   o.add(buildAnalyzeDataDescriptionFeaturesCategoricalValues());
   o.add(buildAnalyzeDataDescriptionFeaturesCategoricalValues());
   return o;
 }
 
-checkUnnamed1108(core.List<api.AnalyzeDataDescriptionFeaturesCategoricalValues> o) {
+checkUnnamed1291(core.List<api.AnalyzeDataDescriptionFeaturesCategoricalValues> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAnalyzeDataDescriptionFeaturesCategoricalValues(o[0]);
   checkAnalyzeDataDescriptionFeaturesCategoricalValues(o[1]);
@@ -56,7 +91,7 @@
   buildCounterAnalyzeDataDescriptionFeaturesCategorical++;
   if (buildCounterAnalyzeDataDescriptionFeaturesCategorical < 3) {
     o.count = "foo";
-    o.values = buildUnnamed1108();
+    o.values = buildUnnamed1291();
   }
   buildCounterAnalyzeDataDescriptionFeaturesCategorical--;
   return o;
@@ -66,7 +101,7 @@
   buildCounterAnalyzeDataDescriptionFeaturesCategorical++;
   if (buildCounterAnalyzeDataDescriptionFeaturesCategorical < 3) {
     unittest.expect(o.count, unittest.equals('foo'));
-    checkUnnamed1108(o.values);
+    checkUnnamed1291(o.values);
   }
   buildCounterAnalyzeDataDescriptionFeaturesCategorical--;
 }
@@ -138,14 +173,14 @@
   buildCounterAnalyzeDataDescriptionFeatures--;
 }
 
-buildUnnamed1109() {
+buildUnnamed1292() {
   var o = new core.List<api.AnalyzeDataDescriptionFeatures>();
   o.add(buildAnalyzeDataDescriptionFeatures());
   o.add(buildAnalyzeDataDescriptionFeatures());
   return o;
 }
 
-checkUnnamed1109(core.List<api.AnalyzeDataDescriptionFeatures> o) {
+checkUnnamed1292(core.List<api.AnalyzeDataDescriptionFeatures> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAnalyzeDataDescriptionFeatures(o[0]);
   checkAnalyzeDataDescriptionFeatures(o[1]);
@@ -195,14 +230,14 @@
   buildCounterAnalyzeDataDescriptionOutputFeatureText--;
 }
 
-buildUnnamed1110() {
+buildUnnamed1293() {
   var o = new core.List<api.AnalyzeDataDescriptionOutputFeatureText>();
   o.add(buildAnalyzeDataDescriptionOutputFeatureText());
   o.add(buildAnalyzeDataDescriptionOutputFeatureText());
   return o;
 }
 
-checkUnnamed1110(core.List<api.AnalyzeDataDescriptionOutputFeatureText> o) {
+checkUnnamed1293(core.List<api.AnalyzeDataDescriptionOutputFeatureText> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAnalyzeDataDescriptionOutputFeatureText(o[0]);
   checkAnalyzeDataDescriptionOutputFeatureText(o[1]);
@@ -214,7 +249,7 @@
   buildCounterAnalyzeDataDescriptionOutputFeature++;
   if (buildCounterAnalyzeDataDescriptionOutputFeature < 3) {
     o.numeric = buildAnalyzeDataDescriptionOutputFeatureNumeric();
-    o.text = buildUnnamed1110();
+    o.text = buildUnnamed1293();
   }
   buildCounterAnalyzeDataDescriptionOutputFeature--;
   return o;
@@ -224,7 +259,7 @@
   buildCounterAnalyzeDataDescriptionOutputFeature++;
   if (buildCounterAnalyzeDataDescriptionOutputFeature < 3) {
     checkAnalyzeDataDescriptionOutputFeatureNumeric(o.numeric);
-    checkUnnamed1110(o.text);
+    checkUnnamed1293(o.text);
   }
   buildCounterAnalyzeDataDescriptionOutputFeature--;
 }
@@ -234,7 +269,7 @@
   var o = new api.AnalyzeDataDescription();
   buildCounterAnalyzeDataDescription++;
   if (buildCounterAnalyzeDataDescription < 3) {
-    o.features = buildUnnamed1109();
+    o.features = buildUnnamed1292();
     o.outputFeature = buildAnalyzeDataDescriptionOutputFeature();
   }
   buildCounterAnalyzeDataDescription--;
@@ -244,72 +279,72 @@
 checkAnalyzeDataDescription(api.AnalyzeDataDescription o) {
   buildCounterAnalyzeDataDescription++;
   if (buildCounterAnalyzeDataDescription < 3) {
-    checkUnnamed1109(o.features);
+    checkUnnamed1292(o.features);
     checkAnalyzeDataDescriptionOutputFeature(o.outputFeature);
   }
   buildCounterAnalyzeDataDescription--;
 }
 
-buildUnnamed1111() {
+buildUnnamed1294() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1111(core.Map<core.String, core.String> o) {
+checkUnnamed1294(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed1112() {
+buildUnnamed1295() {
   var o = new core.List<core.Map<core.String, core.String>>();
-  o.add(buildUnnamed1111());
-  o.add(buildUnnamed1111());
+  o.add(buildUnnamed1294());
+  o.add(buildUnnamed1294());
   return o;
 }
 
-checkUnnamed1112(core.List<core.Map<core.String, core.String>> o) {
+checkUnnamed1295(core.List<core.Map<core.String, core.String>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1111(o[0]);
-  checkUnnamed1111(o[1]);
+  checkUnnamed1294(o[0]);
+  checkUnnamed1294(o[1]);
 }
 
-buildUnnamed1113() {
+buildUnnamed1296() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1113(core.Map<core.String, core.String> o) {
+checkUnnamed1296(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed1114() {
+buildUnnamed1297() {
   var o = new core.Map<core.String, core.Map<core.String, core.String>>();
-  o["x"] = buildUnnamed1113();
-  o["y"] = buildUnnamed1113();
+  o["x"] = buildUnnamed1296();
+  o["y"] = buildUnnamed1296();
   return o;
 }
 
-checkUnnamed1114(core.Map<core.String, core.Map<core.String, core.String>> o) {
+checkUnnamed1297(core.Map<core.String, core.Map<core.String, core.String>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1113(o["x"]);
-  checkUnnamed1113(o["y"]);
+  checkUnnamed1296(o["x"]);
+  checkUnnamed1296(o["y"]);
 }
 
-buildUnnamed1115() {
+buildUnnamed1298() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1115(core.Map<core.String, core.String> o) {
+checkUnnamed1298(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -320,8 +355,8 @@
   var o = new api.AnalyzeModelDescription();
   buildCounterAnalyzeModelDescription++;
   if (buildCounterAnalyzeModelDescription < 3) {
-    o.confusionMatrix = buildUnnamed1114();
-    o.confusionMatrixRowTotals = buildUnnamed1115();
+    o.confusionMatrix = buildUnnamed1297();
+    o.confusionMatrixRowTotals = buildUnnamed1298();
     o.modelinfo = buildInsert2();
   }
   buildCounterAnalyzeModelDescription--;
@@ -331,8 +366,8 @@
 checkAnalyzeModelDescription(api.AnalyzeModelDescription o) {
   buildCounterAnalyzeModelDescription++;
   if (buildCounterAnalyzeModelDescription < 3) {
-    checkUnnamed1114(o.confusionMatrix);
-    checkUnnamed1115(o.confusionMatrixRowTotals);
+    checkUnnamed1297(o.confusionMatrix);
+    checkUnnamed1298(o.confusionMatrixRowTotals);
     checkInsert2(o.modelinfo);
   }
   buildCounterAnalyzeModelDescription--;
@@ -344,7 +379,7 @@
   buildCounterAnalyze++;
   if (buildCounterAnalyze < 3) {
     o.dataDescription = buildAnalyzeDataDescription();
-    o.errors = buildUnnamed1112();
+    o.errors = buildUnnamed1295();
     o.id = "foo";
     o.kind = "foo";
     o.modelDescription = buildAnalyzeModelDescription();
@@ -358,7 +393,7 @@
   buildCounterAnalyze++;
   if (buildCounterAnalyze < 3) {
     checkAnalyzeDataDescription(o.dataDescription);
-    checkUnnamed1112(o.errors);
+    checkUnnamed1295(o.errors);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     checkAnalyzeModelDescription(o.modelDescription);
@@ -367,14 +402,14 @@
   buildCounterAnalyze--;
 }
 
-buildUnnamed1116() {
+buildUnnamed1299() {
   var o = new core.List<core.Object>();
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   return o;
 }
 
-checkUnnamed1116(core.List<core.Object> o) {
+checkUnnamed1299(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o[0]) as core.Map; unittest.expect(casted1, unittest.hasLength(3)); unittest.expect(casted1["list"], unittest.equals([1, 2, 3])); unittest.expect(casted1["bool"], unittest.equals(true)); unittest.expect(casted1["string"], unittest.equals('foo')); 
   var casted2 = (o[1]) as core.Map; unittest.expect(casted2, unittest.hasLength(3)); unittest.expect(casted2["list"], unittest.equals([1, 2, 3])); unittest.expect(casted2["bool"], unittest.equals(true)); unittest.expect(casted2["string"], unittest.equals('foo')); 
@@ -385,7 +420,7 @@
   var o = new api.InputInput();
   buildCounterInputInput++;
   if (buildCounterInputInput < 3) {
-    o.csvInstance = buildUnnamed1116();
+    o.csvInstance = buildUnnamed1299();
   }
   buildCounterInputInput--;
   return o;
@@ -394,7 +429,7 @@
 checkInputInput(api.InputInput o) {
   buildCounterInputInput++;
   if (buildCounterInputInput < 3) {
-    checkUnnamed1116(o.csvInstance);
+    checkUnnamed1299(o.csvInstance);
   }
   buildCounterInputInput--;
 }
@@ -418,14 +453,14 @@
   buildCounterInput--;
 }
 
-buildUnnamed1117() {
+buildUnnamed1300() {
   var o = new core.List<core.Object>();
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   return o;
 }
 
-checkUnnamed1117(core.List<core.Object> o) {
+checkUnnamed1300(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o[0]) as core.Map; unittest.expect(casted3, unittest.hasLength(3)); unittest.expect(casted3["list"], unittest.equals([1, 2, 3])); unittest.expect(casted3["bool"], unittest.equals(true)); unittest.expect(casted3["string"], unittest.equals('foo')); 
   var casted4 = (o[1]) as core.Map; unittest.expect(casted4, unittest.hasLength(3)); unittest.expect(casted4["list"], unittest.equals([1, 2, 3])); unittest.expect(casted4["bool"], unittest.equals(true)); unittest.expect(casted4["string"], unittest.equals('foo')); 
@@ -436,7 +471,7 @@
   var o = new api.InsertTrainingInstances();
   buildCounterInsertTrainingInstances++;
   if (buildCounterInsertTrainingInstances < 3) {
-    o.csvInstance = buildUnnamed1117();
+    o.csvInstance = buildUnnamed1300();
     o.output = "foo";
   }
   buildCounterInsertTrainingInstances--;
@@ -446,49 +481,49 @@
 checkInsertTrainingInstances(api.InsertTrainingInstances o) {
   buildCounterInsertTrainingInstances++;
   if (buildCounterInsertTrainingInstances < 3) {
-    checkUnnamed1117(o.csvInstance);
+    checkUnnamed1300(o.csvInstance);
     unittest.expect(o.output, unittest.equals('foo'));
   }
   buildCounterInsertTrainingInstances--;
 }
 
-buildUnnamed1118() {
+buildUnnamed1301() {
   var o = new core.List<api.InsertTrainingInstances>();
   o.add(buildInsertTrainingInstances());
   o.add(buildInsertTrainingInstances());
   return o;
 }
 
-checkUnnamed1118(core.List<api.InsertTrainingInstances> o) {
+checkUnnamed1301(core.List<api.InsertTrainingInstances> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInsertTrainingInstances(o[0]);
   checkInsertTrainingInstances(o[1]);
 }
 
-buildUnnamed1119() {
+buildUnnamed1302() {
   var o = new core.Map<core.String, core.double>();
   o["x"] = 42.0;
   o["y"] = 42.0;
   return o;
 }
 
-checkUnnamed1119(core.Map<core.String, core.double> o) {
+checkUnnamed1302(core.Map<core.String, core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals(42.0));
   unittest.expect(o["y"], unittest.equals(42.0));
 }
 
-buildUnnamed1120() {
+buildUnnamed1303() {
   var o = new core.List<core.Map<core.String, core.double>>();
-  o.add(buildUnnamed1119());
-  o.add(buildUnnamed1119());
+  o.add(buildUnnamed1302());
+  o.add(buildUnnamed1302());
   return o;
 }
 
-checkUnnamed1120(core.List<core.Map<core.String, core.double>> o) {
+checkUnnamed1303(core.List<core.Map<core.String, core.double>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1119(o[0]);
-  checkUnnamed1119(o[1]);
+  checkUnnamed1302(o[0]);
+  checkUnnamed1302(o[1]);
 }
 
 core.int buildCounterInsert = 0;
@@ -502,8 +537,8 @@
     o.storageDataLocation = "foo";
     o.storagePMMLLocation = "foo";
     o.storagePMMLModelLocation = "foo";
-    o.trainingInstances = buildUnnamed1118();
-    o.utility = buildUnnamed1120();
+    o.trainingInstances = buildUnnamed1301();
+    o.utility = buildUnnamed1303();
   }
   buildCounterInsert--;
   return o;
@@ -518,8 +553,8 @@
     unittest.expect(o.storageDataLocation, unittest.equals('foo'));
     unittest.expect(o.storagePMMLLocation, unittest.equals('foo'));
     unittest.expect(o.storagePMMLModelLocation, unittest.equals('foo'));
-    checkUnnamed1118(o.trainingInstances);
-    checkUnnamed1120(o.utility);
+    checkUnnamed1301(o.trainingInstances);
+    checkUnnamed1303(o.utility);
   }
   buildCounterInsert--;
 }
@@ -592,14 +627,14 @@
   buildCounterInsert2--;
 }
 
-buildUnnamed1121() {
+buildUnnamed1304() {
   var o = new core.List<api.Insert2>();
   o.add(buildInsert2());
   o.add(buildInsert2());
   return o;
 }
 
-checkUnnamed1121(core.List<api.Insert2> o) {
+checkUnnamed1304(core.List<api.Insert2> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInsert2(o[0]);
   checkInsert2(o[1]);
@@ -610,7 +645,7 @@
   var o = new api.List();
   buildCounterList++;
   if (buildCounterList < 3) {
-    o.items = buildUnnamed1121();
+    o.items = buildUnnamed1304();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -622,7 +657,7 @@
 checkList(api.List o) {
   buildCounterList++;
   if (buildCounterList < 3) {
-    checkUnnamed1121(o.items);
+    checkUnnamed1304(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -651,14 +686,14 @@
   buildCounterOutputOutputMulti--;
 }
 
-buildUnnamed1122() {
+buildUnnamed1305() {
   var o = new core.List<api.OutputOutputMulti>();
   o.add(buildOutputOutputMulti());
   o.add(buildOutputOutputMulti());
   return o;
 }
 
-checkUnnamed1122(core.List<api.OutputOutputMulti> o) {
+checkUnnamed1305(core.List<api.OutputOutputMulti> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOutputOutputMulti(o[0]);
   checkOutputOutputMulti(o[1]);
@@ -672,7 +707,7 @@
     o.id = "foo";
     o.kind = "foo";
     o.outputLabel = "foo";
-    o.outputMulti = buildUnnamed1122();
+    o.outputMulti = buildUnnamed1305();
     o.outputValue = 42.0;
     o.selfLink = "foo";
   }
@@ -686,21 +721,21 @@
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.outputLabel, unittest.equals('foo'));
-    checkUnnamed1122(o.outputMulti);
+    checkUnnamed1305(o.outputMulti);
     unittest.expect(o.outputValue, unittest.equals(42.0));
     unittest.expect(o.selfLink, unittest.equals('foo'));
   }
   buildCounterOutput--;
 }
 
-buildUnnamed1123() {
+buildUnnamed1306() {
   var o = new core.List<core.Object>();
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   return o;
 }
 
-checkUnnamed1123(core.List<core.Object> o) {
+checkUnnamed1306(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o[0]) as core.Map; unittest.expect(casted5, unittest.hasLength(3)); unittest.expect(casted5["list"], unittest.equals([1, 2, 3])); unittest.expect(casted5["bool"], unittest.equals(true)); unittest.expect(casted5["string"], unittest.equals('foo')); 
   var casted6 = (o[1]) as core.Map; unittest.expect(casted6, unittest.hasLength(3)); unittest.expect(casted6["list"], unittest.equals([1, 2, 3])); unittest.expect(casted6["bool"], unittest.equals(true)); unittest.expect(casted6["string"], unittest.equals('foo')); 
@@ -711,7 +746,7 @@
   var o = new api.Update();
   buildCounterUpdate++;
   if (buildCounterUpdate < 3) {
-    o.csvInstance = buildUnnamed1123();
+    o.csvInstance = buildUnnamed1306();
     o.output = "foo";
   }
   buildCounterUpdate--;
@@ -721,7 +756,7 @@
 checkUpdate(api.Update o) {
   buildCounterUpdate++;
   if (buildCounterUpdate < 3) {
-    checkUnnamed1123(o.csvInstance);
+    checkUnnamed1306(o.csvInstance);
     unittest.expect(o.output, unittest.equals('foo'));
   }
   buildCounterUpdate--;
@@ -921,7 +956,7 @@
   unittest.group("resource-HostedmodelsResourceApi", () {
     unittest.test("method--predict", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.HostedmodelsResourceApi res = new api.PredictionApi(mock).hostedmodels;
       var arg_request = buildInput();
       var arg_project = "foo";
@@ -959,7 +994,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOutput());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.predict(arg_request, arg_project, arg_hostedModelName).then(unittest.expectAsync(((api.Output response) {
         checkOutput(response);
@@ -972,7 +1007,7 @@
   unittest.group("resource-TrainedmodelsResourceApi", () {
     unittest.test("method--analyze", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TrainedmodelsResourceApi res = new api.PredictionApi(mock).trainedmodels;
       var arg_project = "foo";
       var arg_id = "foo";
@@ -1006,7 +1041,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAnalyze());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.analyze(arg_project, arg_id).then(unittest.expectAsync(((api.Analyze response) {
         checkAnalyze(response);
@@ -1015,7 +1050,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TrainedmodelsResourceApi res = new api.PredictionApi(mock).trainedmodels;
       var arg_project = "foo";
       var arg_id = "foo";
@@ -1049,14 +1084,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_project, arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TrainedmodelsResourceApi res = new api.PredictionApi(mock).trainedmodels;
       var arg_project = "foo";
       var arg_id = "foo";
@@ -1090,7 +1125,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildInsert2());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_project, arg_id).then(unittest.expectAsync(((api.Insert2 response) {
         checkInsert2(response);
@@ -1099,7 +1134,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TrainedmodelsResourceApi res = new api.PredictionApi(mock).trainedmodels;
       var arg_request = buildInsert();
       var arg_project = "foo";
@@ -1136,7 +1171,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildInsert2());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_project).then(unittest.expectAsync(((api.Insert2 response) {
         checkInsert2(response);
@@ -1145,7 +1180,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TrainedmodelsResourceApi res = new api.PredictionApi(mock).trainedmodels;
       var arg_project = "foo";
       var arg_maxResults = 42;
@@ -1182,7 +1217,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.List response) {
         checkList(response);
@@ -1191,7 +1226,7 @@
 
     unittest.test("method--predict", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TrainedmodelsResourceApi res = new api.PredictionApi(mock).trainedmodels;
       var arg_request = buildInput();
       var arg_project = "foo";
@@ -1229,7 +1264,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildOutput());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.predict(arg_request, arg_project, arg_id).then(unittest.expectAsync(((api.Output response) {
         checkOutput(response);
@@ -1238,7 +1273,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TrainedmodelsResourceApi res = new api.PredictionApi(mock).trainedmodels;
       var arg_request = buildUpdate();
       var arg_project = "foo";
@@ -1276,7 +1311,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildInsert2());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_project, arg_id).then(unittest.expectAsync(((api.Insert2 response) {
         checkInsert2(response);
diff --git a/generated/googleapis/test/qpxexpress/v1_test.dart b/generated/googleapis/test/qpxexpress/v1_test.dart
index daea4bc..7307c0b 100644
--- a/generated/googleapis/test/qpxexpress/v1_test.dart
+++ b/generated/googleapis/test/qpxexpress/v1_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/qpxexpress/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterAircraftData = 0;
 buildAircraftData() {
@@ -64,14 +99,14 @@
   buildCounterAirportData--;
 }
 
-buildUnnamed1() {
+buildUnnamed1307() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1(core.List<core.String> o) {
+checkUnnamed1307(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -84,7 +119,7 @@
   if (buildCounterBagDescriptor < 3) {
     o.commercialName = "foo";
     o.count = 42;
-    o.description = buildUnnamed1();
+    o.description = buildUnnamed1307();
     o.kind = "foo";
     o.subcode = "foo";
   }
@@ -97,7 +132,7 @@
   if (buildCounterBagDescriptor < 3) {
     unittest.expect(o.commercialName, unittest.equals('foo'));
     unittest.expect(o.count, unittest.equals(42));
-    checkUnnamed1(o.description);
+    checkUnnamed1307(o.description);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.subcode, unittest.equals('foo'));
   }
@@ -152,66 +187,66 @@
   buildCounterCityData--;
 }
 
-buildUnnamed2() {
+buildUnnamed1308() {
   var o = new core.List<api.AircraftData>();
   o.add(buildAircraftData());
   o.add(buildAircraftData());
   return o;
 }
 
-checkUnnamed2(core.List<api.AircraftData> o) {
+checkUnnamed1308(core.List<api.AircraftData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAircraftData(o[0]);
   checkAircraftData(o[1]);
 }
 
-buildUnnamed3() {
+buildUnnamed1309() {
   var o = new core.List<api.AirportData>();
   o.add(buildAirportData());
   o.add(buildAirportData());
   return o;
 }
 
-checkUnnamed3(core.List<api.AirportData> o) {
+checkUnnamed1309(core.List<api.AirportData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAirportData(o[0]);
   checkAirportData(o[1]);
 }
 
-buildUnnamed4() {
+buildUnnamed1310() {
   var o = new core.List<api.CarrierData>();
   o.add(buildCarrierData());
   o.add(buildCarrierData());
   return o;
 }
 
-checkUnnamed4(core.List<api.CarrierData> o) {
+checkUnnamed1310(core.List<api.CarrierData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCarrierData(o[0]);
   checkCarrierData(o[1]);
 }
 
-buildUnnamed5() {
+buildUnnamed1311() {
   var o = new core.List<api.CityData>();
   o.add(buildCityData());
   o.add(buildCityData());
   return o;
 }
 
-checkUnnamed5(core.List<api.CityData> o) {
+checkUnnamed1311(core.List<api.CityData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCityData(o[0]);
   checkCityData(o[1]);
 }
 
-buildUnnamed6() {
+buildUnnamed1312() {
   var o = new core.List<api.TaxData>();
   o.add(buildTaxData());
   o.add(buildTaxData());
   return o;
 }
 
-checkUnnamed6(core.List<api.TaxData> o) {
+checkUnnamed1312(core.List<api.TaxData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTaxData(o[0]);
   checkTaxData(o[1]);
@@ -222,12 +257,12 @@
   var o = new api.Data();
   buildCounterData++;
   if (buildCounterData < 3) {
-    o.aircraft = buildUnnamed2();
-    o.airport = buildUnnamed3();
-    o.carrier = buildUnnamed4();
-    o.city = buildUnnamed5();
+    o.aircraft = buildUnnamed1308();
+    o.airport = buildUnnamed1309();
+    o.carrier = buildUnnamed1310();
+    o.city = buildUnnamed1311();
     o.kind = "foo";
-    o.tax = buildUnnamed6();
+    o.tax = buildUnnamed1312();
   }
   buildCounterData--;
   return o;
@@ -236,12 +271,12 @@
 checkData(api.Data o) {
   buildCounterData++;
   if (buildCounterData < 3) {
-    checkUnnamed2(o.aircraft);
-    checkUnnamed3(o.airport);
-    checkUnnamed4(o.carrier);
-    checkUnnamed5(o.city);
+    checkUnnamed1308(o.aircraft);
+    checkUnnamed1309(o.airport);
+    checkUnnamed1310(o.carrier);
+    checkUnnamed1311(o.city);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed6(o.tax);
+    checkUnnamed1312(o.tax);
   }
   buildCounterData--;
 }
@@ -298,14 +333,14 @@
   buildCounterFlightInfo--;
 }
 
-buildUnnamed7() {
+buildUnnamed1313() {
   var o = new core.List<api.BagDescriptor>();
   o.add(buildBagDescriptor());
   o.add(buildBagDescriptor());
   return o;
 }
 
-checkUnnamed7(core.List<api.BagDescriptor> o) {
+checkUnnamed1313(core.List<api.BagDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBagDescriptor(o[0]);
   checkBagDescriptor(o[1]);
@@ -316,7 +351,7 @@
   var o = new api.FreeBaggageAllowance();
   buildCounterFreeBaggageAllowance++;
   if (buildCounterFreeBaggageAllowance < 3) {
-    o.bagDescriptor = buildUnnamed7();
+    o.bagDescriptor = buildUnnamed1313();
     o.kilos = 42;
     o.kilosPerPiece = 42;
     o.kind = "foo";
@@ -330,7 +365,7 @@
 checkFreeBaggageAllowance(api.FreeBaggageAllowance o) {
   buildCounterFreeBaggageAllowance++;
   if (buildCounterFreeBaggageAllowance < 3) {
-    checkUnnamed7(o.bagDescriptor);
+    checkUnnamed1313(o.bagDescriptor);
     unittest.expect(o.kilos, unittest.equals(42));
     unittest.expect(o.kilosPerPiece, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
@@ -420,40 +455,40 @@
   buildCounterPassengerCounts--;
 }
 
-buildUnnamed8() {
+buildUnnamed1314() {
   var o = new core.List<api.FareInfo>();
   o.add(buildFareInfo());
   o.add(buildFareInfo());
   return o;
 }
 
-checkUnnamed8(core.List<api.FareInfo> o) {
+checkUnnamed1314(core.List<api.FareInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFareInfo(o[0]);
   checkFareInfo(o[1]);
 }
 
-buildUnnamed9() {
+buildUnnamed1315() {
   var o = new core.List<api.SegmentPricing>();
   o.add(buildSegmentPricing());
   o.add(buildSegmentPricing());
   return o;
 }
 
-checkUnnamed9(core.List<api.SegmentPricing> o) {
+checkUnnamed1315(core.List<api.SegmentPricing> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSegmentPricing(o[0]);
   checkSegmentPricing(o[1]);
 }
 
-buildUnnamed10() {
+buildUnnamed1316() {
   var o = new core.List<api.TaxInfo>();
   o.add(buildTaxInfo());
   o.add(buildTaxInfo());
   return o;
 }
 
-checkUnnamed10(core.List<api.TaxInfo> o) {
+checkUnnamed1316(core.List<api.TaxInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTaxInfo(o[0]);
   checkTaxInfo(o[1]);
@@ -465,7 +500,7 @@
   buildCounterPricingInfo++;
   if (buildCounterPricingInfo < 3) {
     o.baseFareTotal = "foo";
-    o.fare = buildUnnamed8();
+    o.fare = buildUnnamed1314();
     o.fareCalculation = "foo";
     o.kind = "foo";
     o.latestTicketingTime = "foo";
@@ -475,8 +510,8 @@
     o.saleFareTotal = "foo";
     o.saleTaxTotal = "foo";
     o.saleTotal = "foo";
-    o.segmentPricing = buildUnnamed9();
-    o.tax = buildUnnamed10();
+    o.segmentPricing = buildUnnamed1315();
+    o.tax = buildUnnamed1316();
   }
   buildCounterPricingInfo--;
   return o;
@@ -486,7 +521,7 @@
   buildCounterPricingInfo++;
   if (buildCounterPricingInfo < 3) {
     unittest.expect(o.baseFareTotal, unittest.equals('foo'));
-    checkUnnamed8(o.fare);
+    checkUnnamed1314(o.fare);
     unittest.expect(o.fareCalculation, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.latestTicketingTime, unittest.equals('foo'));
@@ -496,20 +531,20 @@
     unittest.expect(o.saleFareTotal, unittest.equals('foo'));
     unittest.expect(o.saleTaxTotal, unittest.equals('foo'));
     unittest.expect(o.saleTotal, unittest.equals('foo'));
-    checkUnnamed9(o.segmentPricing);
-    checkUnnamed10(o.tax);
+    checkUnnamed1315(o.segmentPricing);
+    checkUnnamed1316(o.tax);
   }
   buildCounterPricingInfo--;
 }
 
-buildUnnamed11() {
+buildUnnamed1317() {
   var o = new core.List<api.LegInfo>();
   o.add(buildLegInfo());
   o.add(buildLegInfo());
   return o;
 }
 
-checkUnnamed11(core.List<api.LegInfo> o) {
+checkUnnamed1317(core.List<api.LegInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLegInfo(o[0]);
   checkLegInfo(o[1]);
@@ -528,7 +563,7 @@
     o.flight = buildFlightInfo();
     o.id = "foo";
     o.kind = "foo";
-    o.leg = buildUnnamed11();
+    o.leg = buildUnnamed1317();
     o.marriedSegmentGroup = "foo";
     o.subjectToGovernmentApproval = true;
   }
@@ -547,21 +582,21 @@
     checkFlightInfo(o.flight);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed11(o.leg);
+    checkUnnamed1317(o.leg);
     unittest.expect(o.marriedSegmentGroup, unittest.equals('foo'));
     unittest.expect(o.subjectToGovernmentApproval, unittest.isTrue);
   }
   buildCounterSegmentInfo--;
 }
 
-buildUnnamed12() {
+buildUnnamed1318() {
   var o = new core.List<api.FreeBaggageAllowance>();
   o.add(buildFreeBaggageAllowance());
   o.add(buildFreeBaggageAllowance());
   return o;
 }
 
-checkUnnamed12(core.List<api.FreeBaggageAllowance> o) {
+checkUnnamed1318(core.List<api.FreeBaggageAllowance> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFreeBaggageAllowance(o[0]);
   checkFreeBaggageAllowance(o[1]);
@@ -573,7 +608,7 @@
   buildCounterSegmentPricing++;
   if (buildCounterSegmentPricing < 3) {
     o.fareId = "foo";
-    o.freeBaggageOption = buildUnnamed12();
+    o.freeBaggageOption = buildUnnamed1318();
     o.kind = "foo";
     o.segmentId = "foo";
   }
@@ -585,21 +620,21 @@
   buildCounterSegmentPricing++;
   if (buildCounterSegmentPricing < 3) {
     unittest.expect(o.fareId, unittest.equals('foo'));
-    checkUnnamed12(o.freeBaggageOption);
+    checkUnnamed1318(o.freeBaggageOption);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.segmentId, unittest.equals('foo'));
   }
   buildCounterSegmentPricing--;
 }
 
-buildUnnamed13() {
+buildUnnamed1319() {
   var o = new core.List<api.SegmentInfo>();
   o.add(buildSegmentInfo());
   o.add(buildSegmentInfo());
   return o;
 }
 
-checkUnnamed13(core.List<api.SegmentInfo> o) {
+checkUnnamed1319(core.List<api.SegmentInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSegmentInfo(o[0]);
   checkSegmentInfo(o[1]);
@@ -612,7 +647,7 @@
   if (buildCounterSliceInfo < 3) {
     o.duration = 42;
     o.kind = "foo";
-    o.segment = buildUnnamed13();
+    o.segment = buildUnnamed1319();
   }
   buildCounterSliceInfo--;
   return o;
@@ -623,32 +658,32 @@
   if (buildCounterSliceInfo < 3) {
     unittest.expect(o.duration, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed13(o.segment);
+    checkUnnamed1319(o.segment);
   }
   buildCounterSliceInfo--;
 }
 
-buildUnnamed14() {
+buildUnnamed1320() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed14(core.List<core.String> o) {
+checkUnnamed1320(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed15() {
+buildUnnamed1321() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed15(core.List<core.String> o) {
+checkUnnamed1321(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -666,10 +701,10 @@
     o.maxConnectionDuration = 42;
     o.maxStops = 42;
     o.origin = "foo";
-    o.permittedCarrier = buildUnnamed14();
+    o.permittedCarrier = buildUnnamed1320();
     o.permittedDepartureTime = buildTimeOfDayRange();
     o.preferredCabin = "foo";
-    o.prohibitedCarrier = buildUnnamed15();
+    o.prohibitedCarrier = buildUnnamed1321();
   }
   buildCounterSliceInput--;
   return o;
@@ -685,10 +720,10 @@
     unittest.expect(o.maxConnectionDuration, unittest.equals(42));
     unittest.expect(o.maxStops, unittest.equals(42));
     unittest.expect(o.origin, unittest.equals('foo'));
-    checkUnnamed14(o.permittedCarrier);
+    checkUnnamed1320(o.permittedCarrier);
     checkTimeOfDayRange(o.permittedDepartureTime);
     unittest.expect(o.preferredCabin, unittest.equals('foo'));
-    checkUnnamed15(o.prohibitedCarrier);
+    checkUnnamed1321(o.prohibitedCarrier);
   }
   buildCounterSliceInput--;
 }
@@ -768,27 +803,27 @@
   buildCounterTimeOfDayRange--;
 }
 
-buildUnnamed16() {
+buildUnnamed1322() {
   var o = new core.List<api.PricingInfo>();
   o.add(buildPricingInfo());
   o.add(buildPricingInfo());
   return o;
 }
 
-checkUnnamed16(core.List<api.PricingInfo> o) {
+checkUnnamed1322(core.List<api.PricingInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPricingInfo(o[0]);
   checkPricingInfo(o[1]);
 }
 
-buildUnnamed17() {
+buildUnnamed1323() {
   var o = new core.List<api.SliceInfo>();
   o.add(buildSliceInfo());
   o.add(buildSliceInfo());
   return o;
 }
 
-checkUnnamed17(core.List<api.SliceInfo> o) {
+checkUnnamed1323(core.List<api.SliceInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSliceInfo(o[0]);
   checkSliceInfo(o[1]);
@@ -801,9 +836,9 @@
   if (buildCounterTripOption < 3) {
     o.id = "foo";
     o.kind = "foo";
-    o.pricing = buildUnnamed16();
+    o.pricing = buildUnnamed1322();
     o.saleTotal = "foo";
-    o.slice = buildUnnamed17();
+    o.slice = buildUnnamed1323();
   }
   buildCounterTripOption--;
   return o;
@@ -814,21 +849,21 @@
   if (buildCounterTripOption < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed16(o.pricing);
+    checkUnnamed1322(o.pricing);
     unittest.expect(o.saleTotal, unittest.equals('foo'));
-    checkUnnamed17(o.slice);
+    checkUnnamed1323(o.slice);
   }
   buildCounterTripOption--;
 }
 
-buildUnnamed18() {
+buildUnnamed1324() {
   var o = new core.List<api.SliceInput>();
   o.add(buildSliceInput());
   o.add(buildSliceInput());
   return o;
 }
 
-checkUnnamed18(core.List<api.SliceInput> o) {
+checkUnnamed1324(core.List<api.SliceInput> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSliceInput(o[0]);
   checkSliceInput(o[1]);
@@ -843,7 +878,7 @@
     o.passengers = buildPassengerCounts();
     o.refundable = true;
     o.saleCountry = "foo";
-    o.slice = buildUnnamed18();
+    o.slice = buildUnnamed1324();
     o.solutions = 42;
   }
   buildCounterTripOptionsRequest--;
@@ -857,20 +892,20 @@
     checkPassengerCounts(o.passengers);
     unittest.expect(o.refundable, unittest.isTrue);
     unittest.expect(o.saleCountry, unittest.equals('foo'));
-    checkUnnamed18(o.slice);
+    checkUnnamed1324(o.slice);
     unittest.expect(o.solutions, unittest.equals(42));
   }
   buildCounterTripOptionsRequest--;
 }
 
-buildUnnamed19() {
+buildUnnamed1325() {
   var o = new core.List<api.TripOption>();
   o.add(buildTripOption());
   o.add(buildTripOption());
   return o;
 }
 
-checkUnnamed19(core.List<api.TripOption> o) {
+checkUnnamed1325(core.List<api.TripOption> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTripOption(o[0]);
   checkTripOption(o[1]);
@@ -884,7 +919,7 @@
     o.data = buildData();
     o.kind = "foo";
     o.requestId = "foo";
-    o.tripOption = buildUnnamed19();
+    o.tripOption = buildUnnamed1325();
   }
   buildCounterTripOptionsResponse--;
   return o;
@@ -896,7 +931,7 @@
     checkData(o.data);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.requestId, unittest.equals('foo'));
-    checkUnnamed19(o.tripOption);
+    checkUnnamed1325(o.tripOption);
   }
   buildCounterTripOptionsResponse--;
 }
@@ -1162,7 +1197,7 @@
   unittest.group("resource-TripsResourceApi", () {
     unittest.test("method--search", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TripsResourceApi res = new api.QpxExpressApi(mock).trips;
       var arg_request = buildTripsSearchRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1202,7 +1237,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTripsSearchResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.search(arg_request).then(unittest.expectAsync(((api.TripsSearchResponse response) {
         checkTripsSearchResponse(response);
diff --git a/generated/googleapis/test/reseller/v1_test.dart b/generated/googleapis/test/reseller/v1_test.dart
index f33d7eb..e841cfc 100644
--- a/generated/googleapis/test/reseller/v1_test.dart
+++ b/generated/googleapis/test/reseller/v1_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/reseller/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterAddress = 0;
 buildAddress() {
@@ -286,14 +321,14 @@
   buildCounterSubscription--;
 }
 
-buildUnnamed1332() {
+buildUnnamed1326() {
   var o = new core.List<api.Subscription>();
   o.add(buildSubscription());
   o.add(buildSubscription());
   return o;
 }
 
-checkUnnamed1332(core.List<api.Subscription> o) {
+checkUnnamed1326(core.List<api.Subscription> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSubscription(o[0]);
   checkSubscription(o[1]);
@@ -306,7 +341,7 @@
   if (buildCounterSubscriptions < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.subscriptions = buildUnnamed1332();
+    o.subscriptions = buildUnnamed1326();
   }
   buildCounterSubscriptions--;
   return o;
@@ -317,7 +352,7 @@
   if (buildCounterSubscriptions < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1332(o.subscriptions);
+    checkUnnamed1326(o.subscriptions);
   }
   buildCounterSubscriptions--;
 }
@@ -426,7 +461,7 @@
   unittest.group("resource-CustomersResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CustomersResourceApi res = new api.ResellerApi(mock).customers;
       var arg_customerId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -466,7 +501,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomer());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_customerId).then(unittest.expectAsync(((api.Customer response) {
         checkCustomer(response);
@@ -475,7 +510,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CustomersResourceApi res = new api.ResellerApi(mock).customers;
       var arg_request = buildCustomer();
       var arg_customerAuthToken = "foo";
@@ -517,7 +552,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomer());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, customerAuthToken: arg_customerAuthToken).then(unittest.expectAsync(((api.Customer response) {
         checkCustomer(response);
@@ -526,7 +561,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CustomersResourceApi res = new api.ResellerApi(mock).customers;
       var arg_request = buildCustomer();
       var arg_customerId = "foo";
@@ -570,7 +605,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomer());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_customerId).then(unittest.expectAsync(((api.Customer response) {
         checkCustomer(response);
@@ -579,7 +614,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CustomersResourceApi res = new api.ResellerApi(mock).customers;
       var arg_request = buildCustomer();
       var arg_customerId = "foo";
@@ -623,7 +658,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCustomer());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_customerId).then(unittest.expectAsync(((api.Customer response) {
         checkCustomer(response);
@@ -636,7 +671,7 @@
   unittest.group("resource-SubscriptionsResourceApi", () {
     unittest.test("method--activate", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SubscriptionsResourceApi res = new api.ResellerApi(mock).subscriptions;
       var arg_customerId = "foo";
       var arg_subscriptionId = "foo";
@@ -688,7 +723,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSubscription());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.activate(arg_customerId, arg_subscriptionId).then(unittest.expectAsync(((api.Subscription response) {
         checkSubscription(response);
@@ -697,7 +732,7 @@
 
     unittest.test("method--changePlan", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SubscriptionsResourceApi res = new api.ResellerApi(mock).subscriptions;
       var arg_request = buildChangePlanRequest();
       var arg_customerId = "foo";
@@ -753,7 +788,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSubscription());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.changePlan(arg_request, arg_customerId, arg_subscriptionId).then(unittest.expectAsync(((api.Subscription response) {
         checkSubscription(response);
@@ -762,7 +797,7 @@
 
     unittest.test("method--changeRenewalSettings", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SubscriptionsResourceApi res = new api.ResellerApi(mock).subscriptions;
       var arg_request = buildRenewalSettings();
       var arg_customerId = "foo";
@@ -818,7 +853,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSubscription());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.changeRenewalSettings(arg_request, arg_customerId, arg_subscriptionId).then(unittest.expectAsync(((api.Subscription response) {
         checkSubscription(response);
@@ -827,7 +862,7 @@
 
     unittest.test("method--changeSeats", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SubscriptionsResourceApi res = new api.ResellerApi(mock).subscriptions;
       var arg_request = buildSeats();
       var arg_customerId = "foo";
@@ -883,7 +918,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSubscription());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.changeSeats(arg_request, arg_customerId, arg_subscriptionId).then(unittest.expectAsync(((api.Subscription response) {
         checkSubscription(response);
@@ -892,7 +927,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SubscriptionsResourceApi res = new api.ResellerApi(mock).subscriptions;
       var arg_customerId = "foo";
       var arg_subscriptionId = "foo";
@@ -942,14 +977,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_customerId, arg_subscriptionId, arg_deletionType).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SubscriptionsResourceApi res = new api.ResellerApi(mock).subscriptions;
       var arg_customerId = "foo";
       var arg_subscriptionId = "foo";
@@ -997,7 +1032,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSubscription());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_customerId, arg_subscriptionId).then(unittest.expectAsync(((api.Subscription response) {
         checkSubscription(response);
@@ -1006,7 +1041,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SubscriptionsResourceApi res = new api.ResellerApi(mock).subscriptions;
       var arg_request = buildSubscription();
       var arg_customerId = "foo";
@@ -1056,7 +1091,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSubscription());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_customerId, customerAuthToken: arg_customerAuthToken).then(unittest.expectAsync(((api.Subscription response) {
         checkSubscription(response);
@@ -1065,7 +1100,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SubscriptionsResourceApi res = new api.ResellerApi(mock).subscriptions;
       var arg_customerAuthToken = "foo";
       var arg_customerId = "foo";
@@ -1111,7 +1146,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSubscriptions());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(customerAuthToken: arg_customerAuthToken, customerId: arg_customerId, customerNamePrefix: arg_customerNamePrefix, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.Subscriptions response) {
         checkSubscriptions(response);
@@ -1120,7 +1155,7 @@
 
     unittest.test("method--startPaidService", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SubscriptionsResourceApi res = new api.ResellerApi(mock).subscriptions;
       var arg_customerId = "foo";
       var arg_subscriptionId = "foo";
@@ -1172,7 +1207,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSubscription());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.startPaidService(arg_customerId, arg_subscriptionId).then(unittest.expectAsync(((api.Subscription response) {
         checkSubscription(response);
@@ -1181,7 +1216,7 @@
 
     unittest.test("method--suspend", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SubscriptionsResourceApi res = new api.ResellerApi(mock).subscriptions;
       var arg_customerId = "foo";
       var arg_subscriptionId = "foo";
@@ -1233,7 +1268,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSubscription());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.suspend(arg_customerId, arg_subscriptionId).then(unittest.expectAsync(((api.Subscription response) {
         checkSubscription(response);
diff --git a/generated/googleapis/test/siteverification/v1_test.dart b/generated/googleapis/test/siteverification/v1_test.dart
index d8f7bb2..82ed3bc 100644
--- a/generated/googleapis/test/siteverification/v1_test.dart
+++ b/generated/googleapis/test/siteverification/v1_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/siteverification/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterSiteVerificationWebResourceGettokenRequestSite = 0;
 buildSiteVerificationWebResourceGettokenRequestSite() {
@@ -79,14 +114,14 @@
   buildCounterSiteVerificationWebResourceGettokenResponse--;
 }
 
-buildUnnamed162() {
+buildUnnamed1327() {
   var o = new core.List<api.SiteVerificationWebResourceResource>();
   o.add(buildSiteVerificationWebResourceResource());
   o.add(buildSiteVerificationWebResourceResource());
   return o;
 }
 
-checkUnnamed162(core.List<api.SiteVerificationWebResourceResource> o) {
+checkUnnamed1327(core.List<api.SiteVerificationWebResourceResource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSiteVerificationWebResourceResource(o[0]);
   checkSiteVerificationWebResourceResource(o[1]);
@@ -97,7 +132,7 @@
   var o = new api.SiteVerificationWebResourceListResponse();
   buildCounterSiteVerificationWebResourceListResponse++;
   if (buildCounterSiteVerificationWebResourceListResponse < 3) {
-    o.items = buildUnnamed162();
+    o.items = buildUnnamed1327();
   }
   buildCounterSiteVerificationWebResourceListResponse--;
   return o;
@@ -106,19 +141,19 @@
 checkSiteVerificationWebResourceListResponse(api.SiteVerificationWebResourceListResponse o) {
   buildCounterSiteVerificationWebResourceListResponse++;
   if (buildCounterSiteVerificationWebResourceListResponse < 3) {
-    checkUnnamed162(o.items);
+    checkUnnamed1327(o.items);
   }
   buildCounterSiteVerificationWebResourceListResponse--;
 }
 
-buildUnnamed163() {
+buildUnnamed1328() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed163(core.List<core.String> o) {
+checkUnnamed1328(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -151,7 +186,7 @@
   buildCounterSiteVerificationWebResourceResource++;
   if (buildCounterSiteVerificationWebResourceResource < 3) {
     o.id = "foo";
-    o.owners = buildUnnamed163();
+    o.owners = buildUnnamed1328();
     o.site = buildSiteVerificationWebResourceResourceSite();
   }
   buildCounterSiteVerificationWebResourceResource--;
@@ -162,7 +197,7 @@
   buildCounterSiteVerificationWebResourceResource++;
   if (buildCounterSiteVerificationWebResourceResource < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed163(o.owners);
+    checkUnnamed1328(o.owners);
     checkSiteVerificationWebResourceResourceSite(o.site);
   }
   buildCounterSiteVerificationWebResourceResource--;
@@ -227,7 +262,7 @@
   unittest.group("resource-WebResourceResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.WebResourceResourceApi res = new api.SiteVerificationApi(mock).webResource;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -267,14 +302,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.WebResourceResourceApi res = new api.SiteVerificationApi(mock).webResource;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -314,7 +349,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSiteVerificationWebResourceResource());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_id).then(unittest.expectAsync(((api.SiteVerificationWebResourceResource response) {
         checkSiteVerificationWebResourceResource(response);
@@ -323,7 +358,7 @@
 
     unittest.test("method--getToken", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.WebResourceResourceApi res = new api.SiteVerificationApi(mock).webResource;
       var arg_request = buildSiteVerificationWebResourceGettokenRequest();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -363,7 +398,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSiteVerificationWebResourceGettokenResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.getToken(arg_request).then(unittest.expectAsync(((api.SiteVerificationWebResourceGettokenResponse response) {
         checkSiteVerificationWebResourceGettokenResponse(response);
@@ -372,7 +407,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.WebResourceResourceApi res = new api.SiteVerificationApi(mock).webResource;
       var arg_request = buildSiteVerificationWebResourceResource();
       var arg_verificationMethod = "foo";
@@ -414,7 +449,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSiteVerificationWebResourceResource());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_verificationMethod).then(unittest.expectAsync(((api.SiteVerificationWebResourceResource response) {
         checkSiteVerificationWebResourceResource(response);
@@ -423,7 +458,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.WebResourceResourceApi res = new api.SiteVerificationApi(mock).webResource;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -459,7 +494,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSiteVerificationWebResourceListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list().then(unittest.expectAsync(((api.SiteVerificationWebResourceListResponse response) {
         checkSiteVerificationWebResourceListResponse(response);
@@ -468,7 +503,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.WebResourceResourceApi res = new api.SiteVerificationApi(mock).webResource;
       var arg_request = buildSiteVerificationWebResourceResource();
       var arg_id = "foo";
@@ -512,7 +547,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSiteVerificationWebResourceResource());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_id).then(unittest.expectAsync(((api.SiteVerificationWebResourceResource response) {
         checkSiteVerificationWebResourceResource(response);
@@ -521,7 +556,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.WebResourceResourceApi res = new api.SiteVerificationApi(mock).webResource;
       var arg_request = buildSiteVerificationWebResourceResource();
       var arg_id = "foo";
@@ -565,7 +600,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSiteVerificationWebResourceResource());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_id).then(unittest.expectAsync(((api.SiteVerificationWebResourceResource response) {
         checkSiteVerificationWebResourceResource(response);
diff --git a/generated/googleapis/test/storage/v1_test.dart b/generated/googleapis/test/storage/v1_test.dart
index d641dc5..316b538 100644
--- a/generated/googleapis/test/storage/v1_test.dart
+++ b/generated/googleapis/test/storage/v1_test.dart
@@ -8,61 +8,96 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/storage/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
 
-buildUnnamed790() {
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+buildUnnamed1329() {
   var o = new core.List<api.BucketAccessControl>();
   o.add(buildBucketAccessControl());
   o.add(buildBucketAccessControl());
   return o;
 }
 
-checkUnnamed790(core.List<api.BucketAccessControl> o) {
+checkUnnamed1329(core.List<api.BucketAccessControl> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBucketAccessControl(o[0]);
   checkBucketAccessControl(o[1]);
 }
 
-buildUnnamed791() {
+buildUnnamed1330() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed791(core.List<core.String> o) {
+checkUnnamed1330(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed792() {
+buildUnnamed1331() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed792(core.List<core.String> o) {
+checkUnnamed1331(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed793() {
+buildUnnamed1332() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed793(core.List<core.String> o) {
+checkUnnamed1332(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -74,9 +109,9 @@
   buildCounterBucketCors++;
   if (buildCounterBucketCors < 3) {
     o.maxAgeSeconds = 42;
-    o.method = buildUnnamed791();
-    o.origin = buildUnnamed792();
-    o.responseHeader = buildUnnamed793();
+    o.method = buildUnnamed1330();
+    o.origin = buildUnnamed1331();
+    o.responseHeader = buildUnnamed1332();
   }
   buildCounterBucketCors--;
   return o;
@@ -86,34 +121,34 @@
   buildCounterBucketCors++;
   if (buildCounterBucketCors < 3) {
     unittest.expect(o.maxAgeSeconds, unittest.equals(42));
-    checkUnnamed791(o.method);
-    checkUnnamed792(o.origin);
-    checkUnnamed793(o.responseHeader);
+    checkUnnamed1330(o.method);
+    checkUnnamed1331(o.origin);
+    checkUnnamed1332(o.responseHeader);
   }
   buildCounterBucketCors--;
 }
 
-buildUnnamed794() {
+buildUnnamed1333() {
   var o = new core.List<api.BucketCors>();
   o.add(buildBucketCors());
   o.add(buildBucketCors());
   return o;
 }
 
-checkUnnamed794(core.List<api.BucketCors> o) {
+checkUnnamed1333(core.List<api.BucketCors> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBucketCors(o[0]);
   checkBucketCors(o[1]);
 }
 
-buildUnnamed795() {
+buildUnnamed1334() {
   var o = new core.List<api.ObjectAccessControl>();
   o.add(buildObjectAccessControl());
   o.add(buildObjectAccessControl());
   return o;
 }
 
-checkUnnamed795(core.List<api.ObjectAccessControl> o) {
+checkUnnamed1334(core.List<api.ObjectAccessControl> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkObjectAccessControl(o[0]);
   checkObjectAccessControl(o[1]);
@@ -184,14 +219,14 @@
   buildCounterBucketLifecycleRule--;
 }
 
-buildUnnamed796() {
+buildUnnamed1335() {
   var o = new core.List<api.BucketLifecycleRule>();
   o.add(buildBucketLifecycleRule());
   o.add(buildBucketLifecycleRule());
   return o;
 }
 
-checkUnnamed796(core.List<api.BucketLifecycleRule> o) {
+checkUnnamed1335(core.List<api.BucketLifecycleRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBucketLifecycleRule(o[0]);
   checkBucketLifecycleRule(o[1]);
@@ -202,7 +237,7 @@
   var o = new api.BucketLifecycle();
   buildCounterBucketLifecycle++;
   if (buildCounterBucketLifecycle < 3) {
-    o.rule = buildUnnamed796();
+    o.rule = buildUnnamed1335();
   }
   buildCounterBucketLifecycle--;
   return o;
@@ -211,7 +246,7 @@
 checkBucketLifecycle(api.BucketLifecycle o) {
   buildCounterBucketLifecycle++;
   if (buildCounterBucketLifecycle < 3) {
-    checkUnnamed796(o.rule);
+    checkUnnamed1335(o.rule);
   }
   buildCounterBucketLifecycle--;
 }
@@ -303,9 +338,9 @@
   var o = new api.Bucket();
   buildCounterBucket++;
   if (buildCounterBucket < 3) {
-    o.acl = buildUnnamed790();
-    o.cors = buildUnnamed794();
-    o.defaultObjectAcl = buildUnnamed795();
+    o.acl = buildUnnamed1329();
+    o.cors = buildUnnamed1333();
+    o.defaultObjectAcl = buildUnnamed1334();
     o.etag = "foo";
     o.id = "foo";
     o.kind = "foo";
@@ -329,9 +364,9 @@
 checkBucket(api.Bucket o) {
   buildCounterBucket++;
   if (buildCounterBucket < 3) {
-    checkUnnamed790(o.acl);
-    checkUnnamed794(o.cors);
-    checkUnnamed795(o.defaultObjectAcl);
+    checkUnnamed1329(o.acl);
+    checkUnnamed1333(o.cors);
+    checkUnnamed1334(o.defaultObjectAcl);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
@@ -411,14 +446,14 @@
   buildCounterBucketAccessControl--;
 }
 
-buildUnnamed797() {
+buildUnnamed1336() {
   var o = new core.List<api.BucketAccessControl>();
   o.add(buildBucketAccessControl());
   o.add(buildBucketAccessControl());
   return o;
 }
 
-checkUnnamed797(core.List<api.BucketAccessControl> o) {
+checkUnnamed1336(core.List<api.BucketAccessControl> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBucketAccessControl(o[0]);
   checkBucketAccessControl(o[1]);
@@ -429,7 +464,7 @@
   var o = new api.BucketAccessControls();
   buildCounterBucketAccessControls++;
   if (buildCounterBucketAccessControls < 3) {
-    o.items = buildUnnamed797();
+    o.items = buildUnnamed1336();
     o.kind = "foo";
   }
   buildCounterBucketAccessControls--;
@@ -439,20 +474,20 @@
 checkBucketAccessControls(api.BucketAccessControls o) {
   buildCounterBucketAccessControls++;
   if (buildCounterBucketAccessControls < 3) {
-    checkUnnamed797(o.items);
+    checkUnnamed1336(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterBucketAccessControls--;
 }
 
-buildUnnamed798() {
+buildUnnamed1337() {
   var o = new core.List<api.Bucket>();
   o.add(buildBucket());
   o.add(buildBucket());
   return o;
 }
 
-checkUnnamed798(core.List<api.Bucket> o) {
+checkUnnamed1337(core.List<api.Bucket> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBucket(o[0]);
   checkBucket(o[1]);
@@ -463,7 +498,7 @@
   var o = new api.Buckets();
   buildCounterBuckets++;
   if (buildCounterBuckets < 3) {
-    o.items = buildUnnamed798();
+    o.items = buildUnnamed1337();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -474,21 +509,21 @@
 checkBuckets(api.Buckets o) {
   buildCounterBuckets++;
   if (buildCounterBuckets < 3) {
-    checkUnnamed798(o.items);
+    checkUnnamed1337(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterBuckets--;
 }
 
-buildUnnamed799() {
+buildUnnamed1338() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed799(core.Map<core.String, core.String> o) {
+checkUnnamed1338(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -503,7 +538,7 @@
     o.expiration = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.params = buildUnnamed799();
+    o.params = buildUnnamed1338();
     o.payload = true;
     o.resourceId = "foo";
     o.resourceUri = "foo";
@@ -521,7 +556,7 @@
     unittest.expect(o.expiration, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed799(o.params);
+    checkUnnamed1338(o.params);
     unittest.expect(o.payload, unittest.isTrue);
     unittest.expect(o.resourceId, unittest.equals('foo'));
     unittest.expect(o.resourceUri, unittest.equals('foo'));
@@ -573,14 +608,14 @@
   buildCounterComposeRequestSourceObjects--;
 }
 
-buildUnnamed800() {
+buildUnnamed1339() {
   var o = new core.List<api.ComposeRequestSourceObjects>();
   o.add(buildComposeRequestSourceObjects());
   o.add(buildComposeRequestSourceObjects());
   return o;
 }
 
-checkUnnamed800(core.List<api.ComposeRequestSourceObjects> o) {
+checkUnnamed1339(core.List<api.ComposeRequestSourceObjects> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkComposeRequestSourceObjects(o[0]);
   checkComposeRequestSourceObjects(o[1]);
@@ -593,7 +628,7 @@
   if (buildCounterComposeRequest < 3) {
     o.destination = buildObject();
     o.kind = "foo";
-    o.sourceObjects = buildUnnamed800();
+    o.sourceObjects = buildUnnamed1339();
   }
   buildCounterComposeRequest--;
   return o;
@@ -604,32 +639,32 @@
   if (buildCounterComposeRequest < 3) {
     checkObject(o.destination);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed800(o.sourceObjects);
+    checkUnnamed1339(o.sourceObjects);
   }
   buildCounterComposeRequest--;
 }
 
-buildUnnamed801() {
+buildUnnamed1340() {
   var o = new core.List<api.ObjectAccessControl>();
   o.add(buildObjectAccessControl());
   o.add(buildObjectAccessControl());
   return o;
 }
 
-checkUnnamed801(core.List<api.ObjectAccessControl> o) {
+checkUnnamed1340(core.List<api.ObjectAccessControl> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkObjectAccessControl(o[0]);
   checkObjectAccessControl(o[1]);
 }
 
-buildUnnamed802() {
+buildUnnamed1341() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed802(core.Map<core.String, core.String> o) {
+checkUnnamed1341(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -661,7 +696,7 @@
   var o = new api.Object();
   buildCounterObject++;
   if (buildCounterObject < 3) {
-    o.acl = buildUnnamed801();
+    o.acl = buildUnnamed1340();
     o.bucket = "foo";
     o.cacheControl = "foo";
     o.componentCount = 42;
@@ -676,7 +711,7 @@
     o.kind = "foo";
     o.md5Hash = "foo";
     o.mediaLink = "foo";
-    o.metadata = buildUnnamed802();
+    o.metadata = buildUnnamed1341();
     o.metageneration = "foo";
     o.name = "foo";
     o.owner = buildObjectOwner();
@@ -693,7 +728,7 @@
 checkObject(api.Object o) {
   buildCounterObject++;
   if (buildCounterObject < 3) {
-    checkUnnamed801(o.acl);
+    checkUnnamed1340(o.acl);
     unittest.expect(o.bucket, unittest.equals('foo'));
     unittest.expect(o.cacheControl, unittest.equals('foo'));
     unittest.expect(o.componentCount, unittest.equals(42));
@@ -708,7 +743,7 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.md5Hash, unittest.equals('foo'));
     unittest.expect(o.mediaLink, unittest.equals('foo'));
-    checkUnnamed802(o.metadata);
+    checkUnnamed1341(o.metadata);
     unittest.expect(o.metageneration, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     checkObjectOwner(o.owner);
@@ -785,14 +820,14 @@
   buildCounterObjectAccessControl--;
 }
 
-buildUnnamed803() {
+buildUnnamed1342() {
   var o = new core.List<core.Object>();
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   return o;
 }
 
-checkUnnamed803(core.List<core.Object> o) {
+checkUnnamed1342(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o[0]) as core.Map; unittest.expect(casted1, unittest.hasLength(3)); unittest.expect(casted1["list"], unittest.equals([1, 2, 3])); unittest.expect(casted1["bool"], unittest.equals(true)); unittest.expect(casted1["string"], unittest.equals('foo')); 
   var casted2 = (o[1]) as core.Map; unittest.expect(casted2, unittest.hasLength(3)); unittest.expect(casted2["list"], unittest.equals([1, 2, 3])); unittest.expect(casted2["bool"], unittest.equals(true)); unittest.expect(casted2["string"], unittest.equals('foo')); 
@@ -803,7 +838,7 @@
   var o = new api.ObjectAccessControls();
   buildCounterObjectAccessControls++;
   if (buildCounterObjectAccessControls < 3) {
-    o.items = buildUnnamed803();
+    o.items = buildUnnamed1342();
     o.kind = "foo";
   }
   buildCounterObjectAccessControls--;
@@ -813,33 +848,33 @@
 checkObjectAccessControls(api.ObjectAccessControls o) {
   buildCounterObjectAccessControls++;
   if (buildCounterObjectAccessControls < 3) {
-    checkUnnamed803(o.items);
+    checkUnnamed1342(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterObjectAccessControls--;
 }
 
-buildUnnamed804() {
+buildUnnamed1343() {
   var o = new core.List<api.Object>();
   o.add(buildObject());
   o.add(buildObject());
   return o;
 }
 
-checkUnnamed804(core.List<api.Object> o) {
+checkUnnamed1343(core.List<api.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkObject(o[0]);
   checkObject(o[1]);
 }
 
-buildUnnamed805() {
+buildUnnamed1344() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed805(core.List<core.String> o) {
+checkUnnamed1344(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -850,10 +885,10 @@
   var o = new api.Objects();
   buildCounterObjects++;
   if (buildCounterObjects < 3) {
-    o.items = buildUnnamed804();
+    o.items = buildUnnamed1343();
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.prefixes = buildUnnamed805();
+    o.prefixes = buildUnnamed1344();
   }
   buildCounterObjects--;
   return o;
@@ -862,10 +897,10 @@
 checkObjects(api.Objects o) {
   buildCounterObjects++;
   if (buildCounterObjects < 3) {
-    checkUnnamed804(o.items);
+    checkUnnamed1343(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed805(o.prefixes);
+    checkUnnamed1344(o.prefixes);
   }
   buildCounterObjects--;
 }
@@ -1091,7 +1126,7 @@
   unittest.group("resource-BucketAccessControlsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BucketAccessControlsResourceApi res = new api.StorageApi(mock).bucketAccessControls;
       var arg_bucket = "foo";
       var arg_entity = "foo";
@@ -1139,14 +1174,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_bucket, arg_entity).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BucketAccessControlsResourceApi res = new api.StorageApi(mock).bucketAccessControls;
       var arg_bucket = "foo";
       var arg_entity = "foo";
@@ -1194,7 +1229,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBucketAccessControl());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_bucket, arg_entity).then(unittest.expectAsync(((api.BucketAccessControl response) {
         checkBucketAccessControl(response);
@@ -1203,7 +1238,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BucketAccessControlsResourceApi res = new api.StorageApi(mock).bucketAccessControls;
       var arg_request = buildBucketAccessControl();
       var arg_bucket = "foo";
@@ -1251,7 +1286,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBucketAccessControl());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_bucket).then(unittest.expectAsync(((api.BucketAccessControl response) {
         checkBucketAccessControl(response);
@@ -1260,7 +1295,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BucketAccessControlsResourceApi res = new api.StorageApi(mock).bucketAccessControls;
       var arg_bucket = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1304,7 +1339,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBucketAccessControls());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_bucket).then(unittest.expectAsync(((api.BucketAccessControls response) {
         checkBucketAccessControls(response);
@@ -1313,7 +1348,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BucketAccessControlsResourceApi res = new api.StorageApi(mock).bucketAccessControls;
       var arg_request = buildBucketAccessControl();
       var arg_bucket = "foo";
@@ -1365,7 +1400,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBucketAccessControl());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_bucket, arg_entity).then(unittest.expectAsync(((api.BucketAccessControl response) {
         checkBucketAccessControl(response);
@@ -1374,7 +1409,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BucketAccessControlsResourceApi res = new api.StorageApi(mock).bucketAccessControls;
       var arg_request = buildBucketAccessControl();
       var arg_bucket = "foo";
@@ -1426,7 +1461,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBucketAccessControl());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_bucket, arg_entity).then(unittest.expectAsync(((api.BucketAccessControl response) {
         checkBucketAccessControl(response);
@@ -1439,7 +1474,7 @@
   unittest.group("resource-BucketsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BucketsResourceApi res = new api.StorageApi(mock).buckets;
       var arg_bucket = "foo";
       var arg_ifMetagenerationMatch = "foo";
@@ -1483,14 +1518,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_bucket, ifMetagenerationMatch: arg_ifMetagenerationMatch, ifMetagenerationNotMatch: arg_ifMetagenerationNotMatch).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BucketsResourceApi res = new api.StorageApi(mock).buckets;
       var arg_bucket = "foo";
       var arg_ifMetagenerationMatch = "foo";
@@ -1536,7 +1571,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBucket());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_bucket, ifMetagenerationMatch: arg_ifMetagenerationMatch, ifMetagenerationNotMatch: arg_ifMetagenerationNotMatch, projection: arg_projection).then(unittest.expectAsync(((api.Bucket response) {
         checkBucket(response);
@@ -1545,7 +1580,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BucketsResourceApi res = new api.StorageApi(mock).buckets;
       var arg_request = buildBucket();
       var arg_project = "foo";
@@ -1593,7 +1628,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBucket());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_project, predefinedAcl: arg_predefinedAcl, predefinedDefaultObjectAcl: arg_predefinedDefaultObjectAcl, projection: arg_projection).then(unittest.expectAsync(((api.Bucket response) {
         checkBucket(response);
@@ -1602,7 +1637,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BucketsResourceApi res = new api.StorageApi(mock).buckets;
       var arg_project = "foo";
       var arg_maxResults = 42;
@@ -1648,7 +1683,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBuckets());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_project, maxResults: arg_maxResults, pageToken: arg_pageToken, prefix: arg_prefix, projection: arg_projection).then(unittest.expectAsync(((api.Buckets response) {
         checkBuckets(response);
@@ -1657,7 +1692,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BucketsResourceApi res = new api.StorageApi(mock).buckets;
       var arg_request = buildBucket();
       var arg_bucket = "foo";
@@ -1711,7 +1746,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBucket());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_bucket, ifMetagenerationMatch: arg_ifMetagenerationMatch, ifMetagenerationNotMatch: arg_ifMetagenerationNotMatch, predefinedAcl: arg_predefinedAcl, predefinedDefaultObjectAcl: arg_predefinedDefaultObjectAcl, projection: arg_projection).then(unittest.expectAsync(((api.Bucket response) {
         checkBucket(response);
@@ -1720,7 +1755,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BucketsResourceApi res = new api.StorageApi(mock).buckets;
       var arg_request = buildBucket();
       var arg_bucket = "foo";
@@ -1774,7 +1809,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBucket());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_bucket, ifMetagenerationMatch: arg_ifMetagenerationMatch, ifMetagenerationNotMatch: arg_ifMetagenerationNotMatch, predefinedAcl: arg_predefinedAcl, predefinedDefaultObjectAcl: arg_predefinedDefaultObjectAcl, projection: arg_projection).then(unittest.expectAsync(((api.Bucket response) {
         checkBucket(response);
@@ -1787,7 +1822,7 @@
   unittest.group("resource-ChannelsResourceApi", () {
     unittest.test("method--stop", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ChannelsResourceApi res = new api.StorageApi(mock).channels;
       var arg_request = buildChannel();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1827,7 +1862,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.stop(arg_request).then(unittest.expectAsync((_) {}));
     });
@@ -1838,7 +1873,7 @@
   unittest.group("resource-DefaultObjectAccessControlsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DefaultObjectAccessControlsResourceApi res = new api.StorageApi(mock).defaultObjectAccessControls;
       var arg_bucket = "foo";
       var arg_entity = "foo";
@@ -1886,14 +1921,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_bucket, arg_entity).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DefaultObjectAccessControlsResourceApi res = new api.StorageApi(mock).defaultObjectAccessControls;
       var arg_bucket = "foo";
       var arg_entity = "foo";
@@ -1941,7 +1976,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildObjectAccessControl());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_bucket, arg_entity).then(unittest.expectAsync(((api.ObjectAccessControl response) {
         checkObjectAccessControl(response);
@@ -1950,7 +1985,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DefaultObjectAccessControlsResourceApi res = new api.StorageApi(mock).defaultObjectAccessControls;
       var arg_request = buildObjectAccessControl();
       var arg_bucket = "foo";
@@ -1998,7 +2033,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildObjectAccessControl());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_bucket).then(unittest.expectAsync(((api.ObjectAccessControl response) {
         checkObjectAccessControl(response);
@@ -2007,7 +2042,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DefaultObjectAccessControlsResourceApi res = new api.StorageApi(mock).defaultObjectAccessControls;
       var arg_bucket = "foo";
       var arg_ifMetagenerationMatch = "foo";
@@ -2055,7 +2090,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildObjectAccessControls());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_bucket, ifMetagenerationMatch: arg_ifMetagenerationMatch, ifMetagenerationNotMatch: arg_ifMetagenerationNotMatch).then(unittest.expectAsync(((api.ObjectAccessControls response) {
         checkObjectAccessControls(response);
@@ -2064,7 +2099,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DefaultObjectAccessControlsResourceApi res = new api.StorageApi(mock).defaultObjectAccessControls;
       var arg_request = buildObjectAccessControl();
       var arg_bucket = "foo";
@@ -2116,7 +2151,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildObjectAccessControl());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_bucket, arg_entity).then(unittest.expectAsync(((api.ObjectAccessControl response) {
         checkObjectAccessControl(response);
@@ -2125,7 +2160,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DefaultObjectAccessControlsResourceApi res = new api.StorageApi(mock).defaultObjectAccessControls;
       var arg_request = buildObjectAccessControl();
       var arg_bucket = "foo";
@@ -2177,7 +2212,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildObjectAccessControl());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_bucket, arg_entity).then(unittest.expectAsync(((api.ObjectAccessControl response) {
         checkObjectAccessControl(response);
@@ -2190,7 +2225,7 @@
   unittest.group("resource-ObjectAccessControlsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ObjectAccessControlsResourceApi res = new api.StorageApi(mock).objectAccessControls;
       var arg_bucket = "foo";
       var arg_object = "foo";
@@ -2248,14 +2283,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_bucket, arg_object, arg_entity, generation: arg_generation).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ObjectAccessControlsResourceApi res = new api.StorageApi(mock).objectAccessControls;
       var arg_bucket = "foo";
       var arg_object = "foo";
@@ -2313,7 +2348,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildObjectAccessControl());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_bucket, arg_object, arg_entity, generation: arg_generation).then(unittest.expectAsync(((api.ObjectAccessControl response) {
         checkObjectAccessControl(response);
@@ -2322,7 +2357,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ObjectAccessControlsResourceApi res = new api.StorageApi(mock).objectAccessControls;
       var arg_request = buildObjectAccessControl();
       var arg_bucket = "foo";
@@ -2380,7 +2415,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildObjectAccessControl());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_bucket, arg_object, generation: arg_generation).then(unittest.expectAsync(((api.ObjectAccessControl response) {
         checkObjectAccessControl(response);
@@ -2389,7 +2424,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ObjectAccessControlsResourceApi res = new api.StorageApi(mock).objectAccessControls;
       var arg_bucket = "foo";
       var arg_object = "foo";
@@ -2443,7 +2478,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildObjectAccessControls());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_bucket, arg_object, generation: arg_generation).then(unittest.expectAsync(((api.ObjectAccessControls response) {
         checkObjectAccessControls(response);
@@ -2452,7 +2487,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ObjectAccessControlsResourceApi res = new api.StorageApi(mock).objectAccessControls;
       var arg_request = buildObjectAccessControl();
       var arg_bucket = "foo";
@@ -2514,7 +2549,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildObjectAccessControl());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_bucket, arg_object, arg_entity, generation: arg_generation).then(unittest.expectAsync(((api.ObjectAccessControl response) {
         checkObjectAccessControl(response);
@@ -2523,7 +2558,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ObjectAccessControlsResourceApi res = new api.StorageApi(mock).objectAccessControls;
       var arg_request = buildObjectAccessControl();
       var arg_bucket = "foo";
@@ -2585,7 +2620,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildObjectAccessControl());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_bucket, arg_object, arg_entity, generation: arg_generation).then(unittest.expectAsync(((api.ObjectAccessControl response) {
         checkObjectAccessControl(response);
@@ -2600,12 +2635,15 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ObjectsResourceApi res = new api.StorageApi(mock).objects;
       var arg_request = buildComposeRequest();
       var arg_destinationBucket = "foo";
       var arg_destinationObject = "foo";
       var arg_destinationPredefinedAcl = "foo";
+      var arg_encryptionAlgorithm = "foo";
+      var arg_encryptionKey = "foo";
+      var arg_encryptionKeyHash = "foo";
       var arg_ifGenerationMatch = "foo";
       var arg_ifMetagenerationMatch = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -2654,6 +2692,9 @@
           }
         }
         unittest.expect(queryMap["destinationPredefinedAcl"].first, unittest.equals(arg_destinationPredefinedAcl));
+        unittest.expect(queryMap["encryptionAlgorithm"].first, unittest.equals(arg_encryptionAlgorithm));
+        unittest.expect(queryMap["encryptionKey"].first, unittest.equals(arg_encryptionKey));
+        unittest.expect(queryMap["encryptionKeyHash"].first, unittest.equals(arg_encryptionKeyHash));
         unittest.expect(queryMap["ifGenerationMatch"].first, unittest.equals(arg_ifGenerationMatch));
         unittest.expect(queryMap["ifMetagenerationMatch"].first, unittest.equals(arg_ifMetagenerationMatch));
 
@@ -2662,9 +2703,9 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildObject());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.compose(arg_request, arg_destinationBucket, arg_destinationObject, destinationPredefinedAcl: arg_destinationPredefinedAcl, ifGenerationMatch: arg_ifGenerationMatch, ifMetagenerationMatch: arg_ifMetagenerationMatch).then(unittest.expectAsync(((api.Object response) {
+      res.compose(arg_request, arg_destinationBucket, arg_destinationObject, destinationPredefinedAcl: arg_destinationPredefinedAcl, encryptionAlgorithm: arg_encryptionAlgorithm, encryptionKey: arg_encryptionKey, encryptionKeyHash: arg_encryptionKeyHash, ifGenerationMatch: arg_ifGenerationMatch, ifMetagenerationMatch: arg_ifMetagenerationMatch).then(unittest.expectAsync(((api.Object response) {
         checkObject(response);
       })));
     });
@@ -2673,7 +2714,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ObjectsResourceApi res = new api.StorageApi(mock).objects;
       var arg_request = buildObject();
       var arg_sourceBucket = "foo";
@@ -2681,6 +2722,9 @@
       var arg_destinationBucket = "foo";
       var arg_destinationObject = "foo";
       var arg_destinationPredefinedAcl = "foo";
+      var arg_encryptionAlgorithm = "foo";
+      var arg_encryptionKey = "foo";
+      var arg_encryptionKeyHash = "foo";
       var arg_ifGenerationMatch = "foo";
       var arg_ifGenerationNotMatch = "foo";
       var arg_ifMetagenerationMatch = "foo";
@@ -2747,6 +2791,9 @@
           }
         }
         unittest.expect(queryMap["destinationPredefinedAcl"].first, unittest.equals(arg_destinationPredefinedAcl));
+        unittest.expect(queryMap["encryptionAlgorithm"].first, unittest.equals(arg_encryptionAlgorithm));
+        unittest.expect(queryMap["encryptionKey"].first, unittest.equals(arg_encryptionKey));
+        unittest.expect(queryMap["encryptionKeyHash"].first, unittest.equals(arg_encryptionKeyHash));
         unittest.expect(queryMap["ifGenerationMatch"].first, unittest.equals(arg_ifGenerationMatch));
         unittest.expect(queryMap["ifGenerationNotMatch"].first, unittest.equals(arg_ifGenerationNotMatch));
         unittest.expect(queryMap["ifMetagenerationMatch"].first, unittest.equals(arg_ifMetagenerationMatch));
@@ -2763,16 +2810,16 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildObject());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.copy(arg_request, arg_sourceBucket, arg_sourceObject, arg_destinationBucket, arg_destinationObject, destinationPredefinedAcl: arg_destinationPredefinedAcl, ifGenerationMatch: arg_ifGenerationMatch, ifGenerationNotMatch: arg_ifGenerationNotMatch, ifMetagenerationMatch: arg_ifMetagenerationMatch, ifMetagenerationNotMatch: arg_ifMetagenerationNotMatch, ifSourceGenerationMatch: arg_ifSourceGenerationMatch, ifSourceGenerationNotMatch: arg_ifSourceGenerationNotMatch, ifSourceMetagenerationMatch: arg_ifSourceMetagenerationMatch, ifSourceMetagenerationNotMatch: arg_ifSourceMetagenerationNotMatch, projection: arg_projection, sourceGeneration: arg_sourceGeneration).then(unittest.expectAsync(((api.Object response) {
+      res.copy(arg_request, arg_sourceBucket, arg_sourceObject, arg_destinationBucket, arg_destinationObject, destinationPredefinedAcl: arg_destinationPredefinedAcl, encryptionAlgorithm: arg_encryptionAlgorithm, encryptionKey: arg_encryptionKey, encryptionKeyHash: arg_encryptionKeyHash, ifGenerationMatch: arg_ifGenerationMatch, ifGenerationNotMatch: arg_ifGenerationNotMatch, ifMetagenerationMatch: arg_ifMetagenerationMatch, ifMetagenerationNotMatch: arg_ifMetagenerationNotMatch, ifSourceGenerationMatch: arg_ifSourceGenerationMatch, ifSourceGenerationNotMatch: arg_ifSourceGenerationNotMatch, ifSourceMetagenerationMatch: arg_ifSourceMetagenerationMatch, ifSourceMetagenerationNotMatch: arg_ifSourceMetagenerationNotMatch, projection: arg_projection, sourceGeneration: arg_sourceGeneration).then(unittest.expectAsync(((api.Object response) {
         checkObject(response);
       })));
     });
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ObjectsResourceApi res = new api.StorageApi(mock).objects;
       var arg_bucket = "foo";
       var arg_object = "foo";
@@ -2830,7 +2877,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_bucket, arg_object, generation: arg_generation, ifGenerationMatch: arg_ifGenerationMatch, ifGenerationNotMatch: arg_ifGenerationNotMatch, ifMetagenerationMatch: arg_ifMetagenerationMatch, ifMetagenerationNotMatch: arg_ifMetagenerationNotMatch).then(unittest.expectAsync((_) {}));
     });
@@ -2839,10 +2886,13 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ObjectsResourceApi res = new api.StorageApi(mock).objects;
       var arg_bucket = "foo";
       var arg_object = "foo";
+      var arg_encryptionAlgorithm = "foo";
+      var arg_encryptionKey = "foo";
+      var arg_encryptionKeyHash = "foo";
       var arg_generation = "foo";
       var arg_ifGenerationMatch = "foo";
       var arg_ifGenerationNotMatch = "foo";
@@ -2887,6 +2937,9 @@
             addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
           }
         }
+        unittest.expect(queryMap["encryptionAlgorithm"].first, unittest.equals(arg_encryptionAlgorithm));
+        unittest.expect(queryMap["encryptionKey"].first, unittest.equals(arg_encryptionKey));
+        unittest.expect(queryMap["encryptionKeyHash"].first, unittest.equals(arg_encryptionKeyHash));
         unittest.expect(queryMap["generation"].first, unittest.equals(arg_generation));
         unittest.expect(queryMap["ifGenerationMatch"].first, unittest.equals(arg_ifGenerationMatch));
         unittest.expect(queryMap["ifGenerationNotMatch"].first, unittest.equals(arg_ifGenerationNotMatch));
@@ -2899,9 +2952,9 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildObject());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_bucket, arg_object, generation: arg_generation, ifGenerationMatch: arg_ifGenerationMatch, ifGenerationNotMatch: arg_ifGenerationNotMatch, ifMetagenerationMatch: arg_ifMetagenerationMatch, ifMetagenerationNotMatch: arg_ifMetagenerationNotMatch, projection: arg_projection).then(unittest.expectAsync(((api.Object response) {
+      res.get(arg_bucket, arg_object, encryptionAlgorithm: arg_encryptionAlgorithm, encryptionKey: arg_encryptionKey, encryptionKeyHash: arg_encryptionKeyHash, generation: arg_generation, ifGenerationMatch: arg_ifGenerationMatch, ifGenerationNotMatch: arg_ifGenerationNotMatch, ifMetagenerationMatch: arg_ifMetagenerationMatch, ifMetagenerationNotMatch: arg_ifMetagenerationNotMatch, projection: arg_projection).then(unittest.expectAsync(((api.Object response) {
         checkObject(response);
       })));
     });
@@ -2910,11 +2963,14 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ObjectsResourceApi res = new api.StorageApi(mock).objects;
       var arg_request = buildObject();
       var arg_bucket = "foo";
       var arg_contentEncoding = "foo";
+      var arg_encryptionAlgorithm = "foo";
+      var arg_encryptionKey = "foo";
+      var arg_encryptionKeyHash = "foo";
       var arg_ifGenerationMatch = "foo";
       var arg_ifGenerationNotMatch = "foo";
       var arg_ifMetagenerationMatch = "foo";
@@ -2961,6 +3017,9 @@
           }
         }
         unittest.expect(queryMap["contentEncoding"].first, unittest.equals(arg_contentEncoding));
+        unittest.expect(queryMap["encryptionAlgorithm"].first, unittest.equals(arg_encryptionAlgorithm));
+        unittest.expect(queryMap["encryptionKey"].first, unittest.equals(arg_encryptionKey));
+        unittest.expect(queryMap["encryptionKeyHash"].first, unittest.equals(arg_encryptionKeyHash));
         unittest.expect(queryMap["ifGenerationMatch"].first, unittest.equals(arg_ifGenerationMatch));
         unittest.expect(queryMap["ifGenerationNotMatch"].first, unittest.equals(arg_ifGenerationNotMatch));
         unittest.expect(queryMap["ifMetagenerationMatch"].first, unittest.equals(arg_ifMetagenerationMatch));
@@ -2974,16 +3033,16 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildObject());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.insert(arg_request, arg_bucket, contentEncoding: arg_contentEncoding, ifGenerationMatch: arg_ifGenerationMatch, ifGenerationNotMatch: arg_ifGenerationNotMatch, ifMetagenerationMatch: arg_ifMetagenerationMatch, ifMetagenerationNotMatch: arg_ifMetagenerationNotMatch, name: arg_name, predefinedAcl: arg_predefinedAcl, projection: arg_projection).then(unittest.expectAsync(((api.Object response) {
+      res.insert(arg_request, arg_bucket, contentEncoding: arg_contentEncoding, encryptionAlgorithm: arg_encryptionAlgorithm, encryptionKey: arg_encryptionKey, encryptionKeyHash: arg_encryptionKeyHash, ifGenerationMatch: arg_ifGenerationMatch, ifGenerationNotMatch: arg_ifGenerationNotMatch, ifMetagenerationMatch: arg_ifMetagenerationMatch, ifMetagenerationNotMatch: arg_ifMetagenerationNotMatch, name: arg_name, predefinedAcl: arg_predefinedAcl, projection: arg_projection).then(unittest.expectAsync(((api.Object response) {
         checkObject(response);
       })));
     });
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ObjectsResourceApi res = new api.StorageApi(mock).objects;
       var arg_bucket = "foo";
       var arg_delimiter = "foo";
@@ -3039,7 +3098,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildObjects());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_bucket, delimiter: arg_delimiter, maxResults: arg_maxResults, pageToken: arg_pageToken, prefix: arg_prefix, projection: arg_projection, versions: arg_versions).then(unittest.expectAsync(((api.Objects response) {
         checkObjects(response);
@@ -3048,11 +3107,14 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ObjectsResourceApi res = new api.StorageApi(mock).objects;
       var arg_request = buildObject();
       var arg_bucket = "foo";
       var arg_object = "foo";
+      var arg_encryptionAlgorithm = "foo";
+      var arg_encryptionKey = "foo";
+      var arg_encryptionKeyHash = "foo";
       var arg_generation = "foo";
       var arg_ifGenerationMatch = "foo";
       var arg_ifGenerationNotMatch = "foo";
@@ -3101,6 +3163,9 @@
             addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
           }
         }
+        unittest.expect(queryMap["encryptionAlgorithm"].first, unittest.equals(arg_encryptionAlgorithm));
+        unittest.expect(queryMap["encryptionKey"].first, unittest.equals(arg_encryptionKey));
+        unittest.expect(queryMap["encryptionKeyHash"].first, unittest.equals(arg_encryptionKeyHash));
         unittest.expect(queryMap["generation"].first, unittest.equals(arg_generation));
         unittest.expect(queryMap["ifGenerationMatch"].first, unittest.equals(arg_ifGenerationMatch));
         unittest.expect(queryMap["ifGenerationNotMatch"].first, unittest.equals(arg_ifGenerationNotMatch));
@@ -3114,9 +3179,9 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildObject());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.patch(arg_request, arg_bucket, arg_object, generation: arg_generation, ifGenerationMatch: arg_ifGenerationMatch, ifGenerationNotMatch: arg_ifGenerationNotMatch, ifMetagenerationMatch: arg_ifMetagenerationMatch, ifMetagenerationNotMatch: arg_ifMetagenerationNotMatch, predefinedAcl: arg_predefinedAcl, projection: arg_projection).then(unittest.expectAsync(((api.Object response) {
+      res.patch(arg_request, arg_bucket, arg_object, encryptionAlgorithm: arg_encryptionAlgorithm, encryptionKey: arg_encryptionKey, encryptionKeyHash: arg_encryptionKeyHash, generation: arg_generation, ifGenerationMatch: arg_ifGenerationMatch, ifGenerationNotMatch: arg_ifGenerationNotMatch, ifMetagenerationMatch: arg_ifMetagenerationMatch, ifMetagenerationNotMatch: arg_ifMetagenerationNotMatch, predefinedAcl: arg_predefinedAcl, projection: arg_projection).then(unittest.expectAsync(((api.Object response) {
         checkObject(response);
       })));
     });
@@ -3125,11 +3190,14 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ObjectsResourceApi res = new api.StorageApi(mock).objects;
       var arg_request = buildObject();
       var arg_bucket = "foo";
       var arg_object = "foo";
+      var arg_encryptionAlgorithm = "foo";
+      var arg_encryptionKey = "foo";
+      var arg_encryptionKeyHash = "foo";
       var arg_generation = "foo";
       var arg_ifGenerationMatch = "foo";
       var arg_ifGenerationNotMatch = "foo";
@@ -3178,6 +3246,9 @@
             addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
           }
         }
+        unittest.expect(queryMap["encryptionAlgorithm"].first, unittest.equals(arg_encryptionAlgorithm));
+        unittest.expect(queryMap["encryptionKey"].first, unittest.equals(arg_encryptionKey));
+        unittest.expect(queryMap["encryptionKeyHash"].first, unittest.equals(arg_encryptionKeyHash));
         unittest.expect(queryMap["generation"].first, unittest.equals(arg_generation));
         unittest.expect(queryMap["ifGenerationMatch"].first, unittest.equals(arg_ifGenerationMatch));
         unittest.expect(queryMap["ifGenerationNotMatch"].first, unittest.equals(arg_ifGenerationNotMatch));
@@ -3191,16 +3262,16 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildObject());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.update(arg_request, arg_bucket, arg_object, generation: arg_generation, ifGenerationMatch: arg_ifGenerationMatch, ifGenerationNotMatch: arg_ifGenerationNotMatch, ifMetagenerationMatch: arg_ifMetagenerationMatch, ifMetagenerationNotMatch: arg_ifMetagenerationNotMatch, predefinedAcl: arg_predefinedAcl, projection: arg_projection).then(unittest.expectAsync(((api.Object response) {
+      res.update(arg_request, arg_bucket, arg_object, encryptionAlgorithm: arg_encryptionAlgorithm, encryptionKey: arg_encryptionKey, encryptionKeyHash: arg_encryptionKeyHash, generation: arg_generation, ifGenerationMatch: arg_ifGenerationMatch, ifGenerationNotMatch: arg_ifGenerationNotMatch, ifMetagenerationMatch: arg_ifMetagenerationMatch, ifMetagenerationNotMatch: arg_ifMetagenerationNotMatch, predefinedAcl: arg_predefinedAcl, projection: arg_projection).then(unittest.expectAsync(((api.Object response) {
         checkObject(response);
       })));
     });
 
     unittest.test("method--watchAll", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ObjectsResourceApi res = new api.StorageApi(mock).objects;
       var arg_request = buildChannel();
       var arg_bucket = "foo";
@@ -3260,7 +3331,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChannel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.watchAll(arg_request, arg_bucket, delimiter: arg_delimiter, maxResults: arg_maxResults, pageToken: arg_pageToken, prefix: arg_prefix, projection: arg_projection, versions: arg_versions).then(unittest.expectAsync(((api.Channel response) {
         checkChannel(response);
diff --git a/generated/googleapis/test/tagmanager/v1_test.dart b/generated/googleapis/test/tagmanager/v1_test.dart
index 48a6159..ffb4d3e 100644
--- a/generated/googleapis/test/tagmanager/v1_test.dart
+++ b/generated/googleapis/test/tagmanager/v1_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/tagmanager/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterAccount = 0;
 buildAccount() {
@@ -41,14 +76,14 @@
   buildCounterAccount--;
 }
 
-buildUnnamed1087() {
+buildUnnamed1345() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1087(core.List<core.String> o) {
+checkUnnamed1345(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -59,7 +94,7 @@
   var o = new api.AccountAccess();
   buildCounterAccountAccess++;
   if (buildCounterAccountAccess < 3) {
-    o.permission = buildUnnamed1087();
+    o.permission = buildUnnamed1345();
   }
   buildCounterAccountAccess--;
   return o;
@@ -68,19 +103,19 @@
 checkAccountAccess(api.AccountAccess o) {
   buildCounterAccountAccess++;
   if (buildCounterAccountAccess < 3) {
-    checkUnnamed1087(o.permission);
+    checkUnnamed1345(o.permission);
   }
   buildCounterAccountAccess--;
 }
 
-buildUnnamed1088() {
+buildUnnamed1346() {
   var o = new core.List<api.Parameter>();
   o.add(buildParameter());
   o.add(buildParameter());
   return o;
 }
 
-checkUnnamed1088(core.List<api.Parameter> o) {
+checkUnnamed1346(core.List<api.Parameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParameter(o[0]);
   checkParameter(o[1]);
@@ -91,7 +126,7 @@
   var o = new api.Condition();
   buildCounterCondition++;
   if (buildCounterCondition < 3) {
-    o.parameter = buildUnnamed1088();
+    o.parameter = buildUnnamed1346();
     o.type = "foo";
   }
   buildCounterCondition--;
@@ -101,46 +136,46 @@
 checkCondition(api.Condition o) {
   buildCounterCondition++;
   if (buildCounterCondition < 3) {
-    checkUnnamed1088(o.parameter);
+    checkUnnamed1346(o.parameter);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterCondition--;
 }
 
-buildUnnamed1089() {
+buildUnnamed1347() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1089(core.List<core.String> o) {
+checkUnnamed1347(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1090() {
+buildUnnamed1348() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1090(core.List<core.String> o) {
+checkUnnamed1348(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1091() {
+buildUnnamed1349() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1091(core.List<core.String> o) {
+checkUnnamed1349(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -153,15 +188,15 @@
   if (buildCounterContainer < 3) {
     o.accountId = "foo";
     o.containerId = "foo";
-    o.domainName = buildUnnamed1089();
-    o.enabledBuiltInVariable = buildUnnamed1090();
+    o.domainName = buildUnnamed1347();
+    o.enabledBuiltInVariable = buildUnnamed1348();
     o.fingerprint = "foo";
     o.name = "foo";
     o.notes = "foo";
     o.publicId = "foo";
     o.timeZoneCountryId = "foo";
     o.timeZoneId = "foo";
-    o.usageContext = buildUnnamed1091();
+    o.usageContext = buildUnnamed1349();
   }
   buildCounterContainer--;
   return o;
@@ -172,27 +207,27 @@
   if (buildCounterContainer < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
     unittest.expect(o.containerId, unittest.equals('foo'));
-    checkUnnamed1089(o.domainName);
-    checkUnnamed1090(o.enabledBuiltInVariable);
+    checkUnnamed1347(o.domainName);
+    checkUnnamed1348(o.enabledBuiltInVariable);
     unittest.expect(o.fingerprint, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.notes, unittest.equals('foo'));
     unittest.expect(o.publicId, unittest.equals('foo'));
     unittest.expect(o.timeZoneCountryId, unittest.equals('foo'));
     unittest.expect(o.timeZoneId, unittest.equals('foo'));
-    checkUnnamed1091(o.usageContext);
+    checkUnnamed1349(o.usageContext);
   }
   buildCounterContainer--;
 }
 
-buildUnnamed1092() {
+buildUnnamed1350() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1092(core.List<core.String> o) {
+checkUnnamed1350(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -204,7 +239,7 @@
   buildCounterContainerAccess++;
   if (buildCounterContainerAccess < 3) {
     o.containerId = "foo";
-    o.permission = buildUnnamed1092();
+    o.permission = buildUnnamed1350();
   }
   buildCounterContainerAccess--;
   return o;
@@ -214,71 +249,71 @@
   buildCounterContainerAccess++;
   if (buildCounterContainerAccess < 3) {
     unittest.expect(o.containerId, unittest.equals('foo'));
-    checkUnnamed1092(o.permission);
+    checkUnnamed1350(o.permission);
   }
   buildCounterContainerAccess--;
 }
 
-buildUnnamed1093() {
+buildUnnamed1351() {
   var o = new core.List<api.Macro>();
   o.add(buildMacro());
   o.add(buildMacro());
   return o;
 }
 
-checkUnnamed1093(core.List<api.Macro> o) {
+checkUnnamed1351(core.List<api.Macro> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMacro(o[0]);
   checkMacro(o[1]);
 }
 
-buildUnnamed1094() {
+buildUnnamed1352() {
   var o = new core.List<api.Rule>();
   o.add(buildRule());
   o.add(buildRule());
   return o;
 }
 
-checkUnnamed1094(core.List<api.Rule> o) {
+checkUnnamed1352(core.List<api.Rule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRule(o[0]);
   checkRule(o[1]);
 }
 
-buildUnnamed1095() {
+buildUnnamed1353() {
   var o = new core.List<api.Tag>();
   o.add(buildTag());
   o.add(buildTag());
   return o;
 }
 
-checkUnnamed1095(core.List<api.Tag> o) {
+checkUnnamed1353(core.List<api.Tag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTag(o[0]);
   checkTag(o[1]);
 }
 
-buildUnnamed1096() {
+buildUnnamed1354() {
   var o = new core.List<api.Trigger>();
   o.add(buildTrigger());
   o.add(buildTrigger());
   return o;
 }
 
-checkUnnamed1096(core.List<api.Trigger> o) {
+checkUnnamed1354(core.List<api.Trigger> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTrigger(o[0]);
   checkTrigger(o[1]);
 }
 
-buildUnnamed1097() {
+buildUnnamed1355() {
   var o = new core.List<api.Variable>();
   o.add(buildVariable());
   o.add(buildVariable());
   return o;
 }
 
-checkUnnamed1097(core.List<api.Variable> o) {
+checkUnnamed1355(core.List<api.Variable> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVariable(o[0]);
   checkVariable(o[1]);
@@ -295,13 +330,13 @@
     o.containerVersionId = "foo";
     o.deleted = true;
     o.fingerprint = "foo";
-    o.macro = buildUnnamed1093();
+    o.macro = buildUnnamed1351();
     o.name = "foo";
     o.notes = "foo";
-    o.rule = buildUnnamed1094();
-    o.tag = buildUnnamed1095();
-    o.trigger = buildUnnamed1096();
-    o.variable = buildUnnamed1097();
+    o.rule = buildUnnamed1352();
+    o.tag = buildUnnamed1353();
+    o.trigger = buildUnnamed1354();
+    o.variable = buildUnnamed1355();
   }
   buildCounterContainerVersion--;
   return o;
@@ -316,13 +351,13 @@
     unittest.expect(o.containerVersionId, unittest.equals('foo'));
     unittest.expect(o.deleted, unittest.isTrue);
     unittest.expect(o.fingerprint, unittest.equals('foo'));
-    checkUnnamed1093(o.macro);
+    checkUnnamed1351(o.macro);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.notes, unittest.equals('foo'));
-    checkUnnamed1094(o.rule);
-    checkUnnamed1095(o.tag);
-    checkUnnamed1096(o.trigger);
-    checkUnnamed1097(o.variable);
+    checkUnnamed1352(o.rule);
+    checkUnnamed1353(o.tag);
+    checkUnnamed1354(o.trigger);
+    checkUnnamed1355(o.variable);
   }
   buildCounterContainerVersion--;
 }
@@ -408,14 +443,14 @@
   buildCounterCreateContainerVersionResponse--;
 }
 
-buildUnnamed1098() {
+buildUnnamed1356() {
   var o = new core.List<api.UserAccess>();
   o.add(buildUserAccess());
   o.add(buildUserAccess());
   return o;
 }
 
-checkUnnamed1098(core.List<api.UserAccess> o) {
+checkUnnamed1356(core.List<api.UserAccess> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserAccess(o[0]);
   checkUserAccess(o[1]);
@@ -426,7 +461,7 @@
   var o = new api.ListAccountUsersResponse();
   buildCounterListAccountUsersResponse++;
   if (buildCounterListAccountUsersResponse < 3) {
-    o.userAccess = buildUnnamed1098();
+    o.userAccess = buildUnnamed1356();
   }
   buildCounterListAccountUsersResponse--;
   return o;
@@ -435,19 +470,19 @@
 checkListAccountUsersResponse(api.ListAccountUsersResponse o) {
   buildCounterListAccountUsersResponse++;
   if (buildCounterListAccountUsersResponse < 3) {
-    checkUnnamed1098(o.userAccess);
+    checkUnnamed1356(o.userAccess);
   }
   buildCounterListAccountUsersResponse--;
 }
 
-buildUnnamed1099() {
+buildUnnamed1357() {
   var o = new core.List<api.Account>();
   o.add(buildAccount());
   o.add(buildAccount());
   return o;
 }
 
-checkUnnamed1099(core.List<api.Account> o) {
+checkUnnamed1357(core.List<api.Account> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccount(o[0]);
   checkAccount(o[1]);
@@ -458,7 +493,7 @@
   var o = new api.ListAccountsResponse();
   buildCounterListAccountsResponse++;
   if (buildCounterListAccountsResponse < 3) {
-    o.accounts = buildUnnamed1099();
+    o.accounts = buildUnnamed1357();
   }
   buildCounterListAccountsResponse--;
   return o;
@@ -467,32 +502,32 @@
 checkListAccountsResponse(api.ListAccountsResponse o) {
   buildCounterListAccountsResponse++;
   if (buildCounterListAccountsResponse < 3) {
-    checkUnnamed1099(o.accounts);
+    checkUnnamed1357(o.accounts);
   }
   buildCounterListAccountsResponse--;
 }
 
-buildUnnamed1100() {
+buildUnnamed1358() {
   var o = new core.List<api.ContainerVersion>();
   o.add(buildContainerVersion());
   o.add(buildContainerVersion());
   return o;
 }
 
-checkUnnamed1100(core.List<api.ContainerVersion> o) {
+checkUnnamed1358(core.List<api.ContainerVersion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContainerVersion(o[0]);
   checkContainerVersion(o[1]);
 }
 
-buildUnnamed1101() {
+buildUnnamed1359() {
   var o = new core.List<api.ContainerVersionHeader>();
   o.add(buildContainerVersionHeader());
   o.add(buildContainerVersionHeader());
   return o;
 }
 
-checkUnnamed1101(core.List<api.ContainerVersionHeader> o) {
+checkUnnamed1359(core.List<api.ContainerVersionHeader> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContainerVersionHeader(o[0]);
   checkContainerVersionHeader(o[1]);
@@ -503,8 +538,8 @@
   var o = new api.ListContainerVersionsResponse();
   buildCounterListContainerVersionsResponse++;
   if (buildCounterListContainerVersionsResponse < 3) {
-    o.containerVersion = buildUnnamed1100();
-    o.containerVersionHeader = buildUnnamed1101();
+    o.containerVersion = buildUnnamed1358();
+    o.containerVersionHeader = buildUnnamed1359();
   }
   buildCounterListContainerVersionsResponse--;
   return o;
@@ -513,20 +548,20 @@
 checkListContainerVersionsResponse(api.ListContainerVersionsResponse o) {
   buildCounterListContainerVersionsResponse++;
   if (buildCounterListContainerVersionsResponse < 3) {
-    checkUnnamed1100(o.containerVersion);
-    checkUnnamed1101(o.containerVersionHeader);
+    checkUnnamed1358(o.containerVersion);
+    checkUnnamed1359(o.containerVersionHeader);
   }
   buildCounterListContainerVersionsResponse--;
 }
 
-buildUnnamed1102() {
+buildUnnamed1360() {
   var o = new core.List<api.Container>();
   o.add(buildContainer());
   o.add(buildContainer());
   return o;
 }
 
-checkUnnamed1102(core.List<api.Container> o) {
+checkUnnamed1360(core.List<api.Container> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContainer(o[0]);
   checkContainer(o[1]);
@@ -537,7 +572,7 @@
   var o = new api.ListContainersResponse();
   buildCounterListContainersResponse++;
   if (buildCounterListContainersResponse < 3) {
-    o.containers = buildUnnamed1102();
+    o.containers = buildUnnamed1360();
   }
   buildCounterListContainersResponse--;
   return o;
@@ -546,19 +581,19 @@
 checkListContainersResponse(api.ListContainersResponse o) {
   buildCounterListContainersResponse++;
   if (buildCounterListContainersResponse < 3) {
-    checkUnnamed1102(o.containers);
+    checkUnnamed1360(o.containers);
   }
   buildCounterListContainersResponse--;
 }
 
-buildUnnamed1103() {
+buildUnnamed1361() {
   var o = new core.List<api.Macro>();
   o.add(buildMacro());
   o.add(buildMacro());
   return o;
 }
 
-checkUnnamed1103(core.List<api.Macro> o) {
+checkUnnamed1361(core.List<api.Macro> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMacro(o[0]);
   checkMacro(o[1]);
@@ -569,7 +604,7 @@
   var o = new api.ListMacrosResponse();
   buildCounterListMacrosResponse++;
   if (buildCounterListMacrosResponse < 3) {
-    o.macros = buildUnnamed1103();
+    o.macros = buildUnnamed1361();
   }
   buildCounterListMacrosResponse--;
   return o;
@@ -578,19 +613,19 @@
 checkListMacrosResponse(api.ListMacrosResponse o) {
   buildCounterListMacrosResponse++;
   if (buildCounterListMacrosResponse < 3) {
-    checkUnnamed1103(o.macros);
+    checkUnnamed1361(o.macros);
   }
   buildCounterListMacrosResponse--;
 }
 
-buildUnnamed1104() {
+buildUnnamed1362() {
   var o = new core.List<api.Rule>();
   o.add(buildRule());
   o.add(buildRule());
   return o;
 }
 
-checkUnnamed1104(core.List<api.Rule> o) {
+checkUnnamed1362(core.List<api.Rule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRule(o[0]);
   checkRule(o[1]);
@@ -601,7 +636,7 @@
   var o = new api.ListRulesResponse();
   buildCounterListRulesResponse++;
   if (buildCounterListRulesResponse < 3) {
-    o.rules = buildUnnamed1104();
+    o.rules = buildUnnamed1362();
   }
   buildCounterListRulesResponse--;
   return o;
@@ -610,19 +645,19 @@
 checkListRulesResponse(api.ListRulesResponse o) {
   buildCounterListRulesResponse++;
   if (buildCounterListRulesResponse < 3) {
-    checkUnnamed1104(o.rules);
+    checkUnnamed1362(o.rules);
   }
   buildCounterListRulesResponse--;
 }
 
-buildUnnamed1105() {
+buildUnnamed1363() {
   var o = new core.List<api.Tag>();
   o.add(buildTag());
   o.add(buildTag());
   return o;
 }
 
-checkUnnamed1105(core.List<api.Tag> o) {
+checkUnnamed1363(core.List<api.Tag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTag(o[0]);
   checkTag(o[1]);
@@ -633,7 +668,7 @@
   var o = new api.ListTagsResponse();
   buildCounterListTagsResponse++;
   if (buildCounterListTagsResponse < 3) {
-    o.tags = buildUnnamed1105();
+    o.tags = buildUnnamed1363();
   }
   buildCounterListTagsResponse--;
   return o;
@@ -642,19 +677,19 @@
 checkListTagsResponse(api.ListTagsResponse o) {
   buildCounterListTagsResponse++;
   if (buildCounterListTagsResponse < 3) {
-    checkUnnamed1105(o.tags);
+    checkUnnamed1363(o.tags);
   }
   buildCounterListTagsResponse--;
 }
 
-buildUnnamed1106() {
+buildUnnamed1364() {
   var o = new core.List<api.Trigger>();
   o.add(buildTrigger());
   o.add(buildTrigger());
   return o;
 }
 
-checkUnnamed1106(core.List<api.Trigger> o) {
+checkUnnamed1364(core.List<api.Trigger> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTrigger(o[0]);
   checkTrigger(o[1]);
@@ -665,7 +700,7 @@
   var o = new api.ListTriggersResponse();
   buildCounterListTriggersResponse++;
   if (buildCounterListTriggersResponse < 3) {
-    o.triggers = buildUnnamed1106();
+    o.triggers = buildUnnamed1364();
   }
   buildCounterListTriggersResponse--;
   return o;
@@ -674,19 +709,19 @@
 checkListTriggersResponse(api.ListTriggersResponse o) {
   buildCounterListTriggersResponse++;
   if (buildCounterListTriggersResponse < 3) {
-    checkUnnamed1106(o.triggers);
+    checkUnnamed1364(o.triggers);
   }
   buildCounterListTriggersResponse--;
 }
 
-buildUnnamed1107() {
+buildUnnamed1365() {
   var o = new core.List<api.Variable>();
   o.add(buildVariable());
   o.add(buildVariable());
   return o;
 }
 
-checkUnnamed1107(core.List<api.Variable> o) {
+checkUnnamed1365(core.List<api.Variable> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVariable(o[0]);
   checkVariable(o[1]);
@@ -697,7 +732,7 @@
   var o = new api.ListVariablesResponse();
   buildCounterListVariablesResponse++;
   if (buildCounterListVariablesResponse < 3) {
-    o.variables = buildUnnamed1107();
+    o.variables = buildUnnamed1365();
   }
   buildCounterListVariablesResponse--;
   return o;
@@ -706,45 +741,45 @@
 checkListVariablesResponse(api.ListVariablesResponse o) {
   buildCounterListVariablesResponse++;
   if (buildCounterListVariablesResponse < 3) {
-    checkUnnamed1107(o.variables);
+    checkUnnamed1365(o.variables);
   }
   buildCounterListVariablesResponse--;
 }
 
-buildUnnamed1108() {
+buildUnnamed1366() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1108(core.List<core.String> o) {
+checkUnnamed1366(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1109() {
+buildUnnamed1367() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1109(core.List<core.String> o) {
+checkUnnamed1367(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1110() {
+buildUnnamed1368() {
   var o = new core.List<api.Parameter>();
   o.add(buildParameter());
   o.add(buildParameter());
   return o;
 }
 
-checkUnnamed1110(core.List<api.Parameter> o) {
+checkUnnamed1368(core.List<api.Parameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParameter(o[0]);
   checkParameter(o[1]);
@@ -757,13 +792,13 @@
   if (buildCounterMacro < 3) {
     o.accountId = "foo";
     o.containerId = "foo";
-    o.disablingRuleId = buildUnnamed1108();
-    o.enablingRuleId = buildUnnamed1109();
+    o.disablingRuleId = buildUnnamed1366();
+    o.enablingRuleId = buildUnnamed1367();
     o.fingerprint = "foo";
     o.macroId = "foo";
     o.name = "foo";
     o.notes = "foo";
-    o.parameter = buildUnnamed1110();
+    o.parameter = buildUnnamed1368();
     o.scheduleEndMs = "foo";
     o.scheduleStartMs = "foo";
     o.type = "foo";
@@ -777,13 +812,13 @@
   if (buildCounterMacro < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
     unittest.expect(o.containerId, unittest.equals('foo'));
-    checkUnnamed1108(o.disablingRuleId);
-    checkUnnamed1109(o.enablingRuleId);
+    checkUnnamed1366(o.disablingRuleId);
+    checkUnnamed1367(o.enablingRuleId);
     unittest.expect(o.fingerprint, unittest.equals('foo'));
     unittest.expect(o.macroId, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.notes, unittest.equals('foo'));
-    checkUnnamed1110(o.parameter);
+    checkUnnamed1368(o.parameter);
     unittest.expect(o.scheduleEndMs, unittest.equals('foo'));
     unittest.expect(o.scheduleStartMs, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
@@ -791,27 +826,27 @@
   buildCounterMacro--;
 }
 
-buildUnnamed1111() {
+buildUnnamed1369() {
   var o = new core.List<api.Parameter>();
   o.add(buildParameter());
   o.add(buildParameter());
   return o;
 }
 
-checkUnnamed1111(core.List<api.Parameter> o) {
+checkUnnamed1369(core.List<api.Parameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParameter(o[0]);
   checkParameter(o[1]);
 }
 
-buildUnnamed1112() {
+buildUnnamed1370() {
   var o = new core.List<api.Parameter>();
   o.add(buildParameter());
   o.add(buildParameter());
   return o;
 }
 
-checkUnnamed1112(core.List<api.Parameter> o) {
+checkUnnamed1370(core.List<api.Parameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParameter(o[0]);
   checkParameter(o[1]);
@@ -823,8 +858,8 @@
   buildCounterParameter++;
   if (buildCounterParameter < 3) {
     o.key = "foo";
-    o.list = buildUnnamed1111();
-    o.map = buildUnnamed1112();
+    o.list = buildUnnamed1369();
+    o.map = buildUnnamed1370();
     o.type = "foo";
     o.value = "foo";
   }
@@ -836,8 +871,8 @@
   buildCounterParameter++;
   if (buildCounterParameter < 3) {
     unittest.expect(o.key, unittest.equals('foo'));
-    checkUnnamed1111(o.list);
-    checkUnnamed1112(o.map);
+    checkUnnamed1369(o.list);
+    checkUnnamed1370(o.map);
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(o.value, unittest.equals('foo'));
   }
@@ -865,14 +900,14 @@
   buildCounterPublishContainerVersionResponse--;
 }
 
-buildUnnamed1113() {
+buildUnnamed1371() {
   var o = new core.List<api.Condition>();
   o.add(buildCondition());
   o.add(buildCondition());
   return o;
 }
 
-checkUnnamed1113(core.List<api.Condition> o) {
+checkUnnamed1371(core.List<api.Condition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCondition(o[0]);
   checkCondition(o[1]);
@@ -884,7 +919,7 @@
   buildCounterRule++;
   if (buildCounterRule < 3) {
     o.accountId = "foo";
-    o.condition = buildUnnamed1113();
+    o.condition = buildUnnamed1371();
     o.containerId = "foo";
     o.fingerprint = "foo";
     o.name = "foo";
@@ -899,7 +934,7 @@
   buildCounterRule++;
   if (buildCounterRule < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
-    checkUnnamed1113(o.condition);
+    checkUnnamed1371(o.condition);
     unittest.expect(o.containerId, unittest.equals('foo'));
     unittest.expect(o.fingerprint, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
@@ -909,66 +944,66 @@
   buildCounterRule--;
 }
 
-buildUnnamed1114() {
+buildUnnamed1372() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1114(core.List<core.String> o) {
+checkUnnamed1372(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1115() {
+buildUnnamed1373() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1115(core.List<core.String> o) {
+checkUnnamed1373(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1116() {
+buildUnnamed1374() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1116(core.List<core.String> o) {
+checkUnnamed1374(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1117() {
+buildUnnamed1375() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1117(core.List<core.String> o) {
+checkUnnamed1375(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1118() {
+buildUnnamed1376() {
   var o = new core.List<api.Parameter>();
   o.add(buildParameter());
   o.add(buildParameter());
   return o;
 }
 
-checkUnnamed1118(core.List<api.Parameter> o) {
+checkUnnamed1376(core.List<api.Parameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParameter(o[0]);
   checkParameter(o[1]);
@@ -980,16 +1015,16 @@
   buildCounterTag++;
   if (buildCounterTag < 3) {
     o.accountId = "foo";
-    o.blockingRuleId = buildUnnamed1114();
-    o.blockingTriggerId = buildUnnamed1115();
+    o.blockingRuleId = buildUnnamed1372();
+    o.blockingTriggerId = buildUnnamed1373();
     o.containerId = "foo";
     o.fingerprint = "foo";
-    o.firingRuleId = buildUnnamed1116();
-    o.firingTriggerId = buildUnnamed1117();
+    o.firingRuleId = buildUnnamed1374();
+    o.firingTriggerId = buildUnnamed1375();
     o.liveOnly = true;
     o.name = "foo";
     o.notes = "foo";
-    o.parameter = buildUnnamed1118();
+    o.parameter = buildUnnamed1376();
     o.priority = buildParameter();
     o.scheduleEndMs = "foo";
     o.scheduleStartMs = "foo";
@@ -1004,16 +1039,16 @@
   buildCounterTag++;
   if (buildCounterTag < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
-    checkUnnamed1114(o.blockingRuleId);
-    checkUnnamed1115(o.blockingTriggerId);
+    checkUnnamed1372(o.blockingRuleId);
+    checkUnnamed1373(o.blockingTriggerId);
     unittest.expect(o.containerId, unittest.equals('foo'));
     unittest.expect(o.fingerprint, unittest.equals('foo'));
-    checkUnnamed1116(o.firingRuleId);
-    checkUnnamed1117(o.firingTriggerId);
+    checkUnnamed1374(o.firingRuleId);
+    checkUnnamed1375(o.firingTriggerId);
     unittest.expect(o.liveOnly, unittest.isTrue);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.notes, unittest.equals('foo'));
-    checkUnnamed1118(o.parameter);
+    checkUnnamed1376(o.parameter);
     checkParameter(o.priority);
     unittest.expect(o.scheduleEndMs, unittest.equals('foo'));
     unittest.expect(o.scheduleStartMs, unittest.equals('foo'));
@@ -1023,40 +1058,40 @@
   buildCounterTag--;
 }
 
-buildUnnamed1119() {
+buildUnnamed1377() {
   var o = new core.List<api.Condition>();
   o.add(buildCondition());
   o.add(buildCondition());
   return o;
 }
 
-checkUnnamed1119(core.List<api.Condition> o) {
+checkUnnamed1377(core.List<api.Condition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCondition(o[0]);
   checkCondition(o[1]);
 }
 
-buildUnnamed1120() {
+buildUnnamed1378() {
   var o = new core.List<api.Condition>();
   o.add(buildCondition());
   o.add(buildCondition());
   return o;
 }
 
-checkUnnamed1120(core.List<api.Condition> o) {
+checkUnnamed1378(core.List<api.Condition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCondition(o[0]);
   checkCondition(o[1]);
 }
 
-buildUnnamed1121() {
+buildUnnamed1379() {
   var o = new core.List<api.Condition>();
   o.add(buildCondition());
   o.add(buildCondition());
   return o;
 }
 
-checkUnnamed1121(core.List<api.Condition> o) {
+checkUnnamed1379(core.List<api.Condition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCondition(o[0]);
   checkCondition(o[1]);
@@ -1068,13 +1103,13 @@
   buildCounterTrigger++;
   if (buildCounterTrigger < 3) {
     o.accountId = "foo";
-    o.autoEventFilter = buildUnnamed1119();
+    o.autoEventFilter = buildUnnamed1377();
     o.checkValidation = buildParameter();
     o.containerId = "foo";
-    o.customEventFilter = buildUnnamed1120();
+    o.customEventFilter = buildUnnamed1378();
     o.enableAllVideos = buildParameter();
     o.eventName = buildParameter();
-    o.filter = buildUnnamed1121();
+    o.filter = buildUnnamed1379();
     o.fingerprint = "foo";
     o.interval = buildParameter();
     o.limit = buildParameter();
@@ -1094,13 +1129,13 @@
   buildCounterTrigger++;
   if (buildCounterTrigger < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
-    checkUnnamed1119(o.autoEventFilter);
+    checkUnnamed1377(o.autoEventFilter);
     checkParameter(o.checkValidation);
     unittest.expect(o.containerId, unittest.equals('foo'));
-    checkUnnamed1120(o.customEventFilter);
+    checkUnnamed1378(o.customEventFilter);
     checkParameter(o.enableAllVideos);
     checkParameter(o.eventName);
-    checkUnnamed1121(o.filter);
+    checkUnnamed1379(o.filter);
     unittest.expect(o.fingerprint, unittest.equals('foo'));
     checkParameter(o.interval);
     checkParameter(o.limit);
@@ -1115,14 +1150,14 @@
   buildCounterTrigger--;
 }
 
-buildUnnamed1122() {
+buildUnnamed1380() {
   var o = new core.List<api.ContainerAccess>();
   o.add(buildContainerAccess());
   o.add(buildContainerAccess());
   return o;
 }
 
-checkUnnamed1122(core.List<api.ContainerAccess> o) {
+checkUnnamed1380(core.List<api.ContainerAccess> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContainerAccess(o[0]);
   checkContainerAccess(o[1]);
@@ -1135,7 +1170,7 @@
   if (buildCounterUserAccess < 3) {
     o.accountAccess = buildAccountAccess();
     o.accountId = "foo";
-    o.containerAccess = buildUnnamed1122();
+    o.containerAccess = buildUnnamed1380();
     o.emailAddress = "foo";
     o.permissionId = "foo";
   }
@@ -1148,47 +1183,47 @@
   if (buildCounterUserAccess < 3) {
     checkAccountAccess(o.accountAccess);
     unittest.expect(o.accountId, unittest.equals('foo'));
-    checkUnnamed1122(o.containerAccess);
+    checkUnnamed1380(o.containerAccess);
     unittest.expect(o.emailAddress, unittest.equals('foo'));
     unittest.expect(o.permissionId, unittest.equals('foo'));
   }
   buildCounterUserAccess--;
 }
 
-buildUnnamed1123() {
+buildUnnamed1381() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1123(core.List<core.String> o) {
+checkUnnamed1381(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1124() {
+buildUnnamed1382() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1124(core.List<core.String> o) {
+checkUnnamed1382(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1125() {
+buildUnnamed1383() {
   var o = new core.List<api.Parameter>();
   o.add(buildParameter());
   o.add(buildParameter());
   return o;
 }
 
-checkUnnamed1125(core.List<api.Parameter> o) {
+checkUnnamed1383(core.List<api.Parameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParameter(o[0]);
   checkParameter(o[1]);
@@ -1201,12 +1236,12 @@
   if (buildCounterVariable < 3) {
     o.accountId = "foo";
     o.containerId = "foo";
-    o.disablingTriggerId = buildUnnamed1123();
-    o.enablingTriggerId = buildUnnamed1124();
+    o.disablingTriggerId = buildUnnamed1381();
+    o.enablingTriggerId = buildUnnamed1382();
     o.fingerprint = "foo";
     o.name = "foo";
     o.notes = "foo";
-    o.parameter = buildUnnamed1125();
+    o.parameter = buildUnnamed1383();
     o.scheduleEndMs = "foo";
     o.scheduleStartMs = "foo";
     o.type = "foo";
@@ -1221,12 +1256,12 @@
   if (buildCounterVariable < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
     unittest.expect(o.containerId, unittest.equals('foo'));
-    checkUnnamed1123(o.disablingTriggerId);
-    checkUnnamed1124(o.enablingTriggerId);
+    checkUnnamed1381(o.disablingTriggerId);
+    checkUnnamed1382(o.enablingTriggerId);
     unittest.expect(o.fingerprint, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.notes, unittest.equals('foo'));
-    checkUnnamed1125(o.parameter);
+    checkUnnamed1383(o.parameter);
     unittest.expect(o.scheduleEndMs, unittest.equals('foo'));
     unittest.expect(o.scheduleStartMs, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
@@ -1474,7 +1509,7 @@
   unittest.group("resource-AccountsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.TagmanagerApi(mock).accounts;
       var arg_accountId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1514,7 +1549,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccount());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId).then(unittest.expectAsync(((api.Account response) {
         checkAccount(response);
@@ -1523,7 +1558,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.TagmanagerApi(mock).accounts;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1559,7 +1594,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListAccountsResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list().then(unittest.expectAsync(((api.ListAccountsResponse response) {
         checkListAccountsResponse(response);
@@ -1568,7 +1603,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.TagmanagerApi(mock).accounts;
       var arg_request = buildAccount();
       var arg_accountId = "foo";
@@ -1614,7 +1649,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAccount());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_accountId, fingerprint: arg_fingerprint).then(unittest.expectAsync(((api.Account response) {
         checkAccount(response);
@@ -1627,7 +1662,7 @@
   unittest.group("resource-AccountsContainersResourceApi", () {
     unittest.test("method--create", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersResourceApi res = new api.TagmanagerApi(mock).accounts.containers;
       var arg_request = buildContainer();
       var arg_accountId = "foo";
@@ -1675,7 +1710,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildContainer());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.create(arg_request, arg_accountId).then(unittest.expectAsync(((api.Container response) {
         checkContainer(response);
@@ -1684,7 +1719,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersResourceApi res = new api.TagmanagerApi(mock).accounts.containers;
       var arg_accountId = "foo";
       var arg_containerId = "foo";
@@ -1732,14 +1767,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_accountId, arg_containerId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersResourceApi res = new api.TagmanagerApi(mock).accounts.containers;
       var arg_accountId = "foo";
       var arg_containerId = "foo";
@@ -1787,7 +1822,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildContainer());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_containerId).then(unittest.expectAsync(((api.Container response) {
         checkContainer(response);
@@ -1796,7 +1831,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersResourceApi res = new api.TagmanagerApi(mock).accounts.containers;
       var arg_accountId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -1840,7 +1875,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListContainersResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId).then(unittest.expectAsync(((api.ListContainersResponse response) {
         checkListContainersResponse(response);
@@ -1849,7 +1884,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersResourceApi res = new api.TagmanagerApi(mock).accounts.containers;
       var arg_request = buildContainer();
       var arg_accountId = "foo";
@@ -1903,7 +1938,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildContainer());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_accountId, arg_containerId, fingerprint: arg_fingerprint).then(unittest.expectAsync(((api.Container response) {
         checkContainer(response);
@@ -1916,7 +1951,7 @@
   unittest.group("resource-AccountsContainersMacrosResourceApi", () {
     unittest.test("method--create", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersMacrosResourceApi res = new api.TagmanagerApi(mock).accounts.containers.macros;
       var arg_request = buildMacro();
       var arg_accountId = "foo";
@@ -1972,7 +2007,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMacro());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.create(arg_request, arg_accountId, arg_containerId).then(unittest.expectAsync(((api.Macro response) {
         checkMacro(response);
@@ -1981,7 +2016,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersMacrosResourceApi res = new api.TagmanagerApi(mock).accounts.containers.macros;
       var arg_accountId = "foo";
       var arg_containerId = "foo";
@@ -2037,14 +2072,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_accountId, arg_containerId, arg_macroId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersMacrosResourceApi res = new api.TagmanagerApi(mock).accounts.containers.macros;
       var arg_accountId = "foo";
       var arg_containerId = "foo";
@@ -2100,7 +2135,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMacro());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_containerId, arg_macroId).then(unittest.expectAsync(((api.Macro response) {
         checkMacro(response);
@@ -2109,7 +2144,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersMacrosResourceApi res = new api.TagmanagerApi(mock).accounts.containers.macros;
       var arg_accountId = "foo";
       var arg_containerId = "foo";
@@ -2161,7 +2196,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListMacrosResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_containerId).then(unittest.expectAsync(((api.ListMacrosResponse response) {
         checkListMacrosResponse(response);
@@ -2170,7 +2205,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersMacrosResourceApi res = new api.TagmanagerApi(mock).accounts.containers.macros;
       var arg_request = buildMacro();
       var arg_accountId = "foo";
@@ -2232,7 +2267,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMacro());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_accountId, arg_containerId, arg_macroId, fingerprint: arg_fingerprint).then(unittest.expectAsync(((api.Macro response) {
         checkMacro(response);
@@ -2245,7 +2280,7 @@
   unittest.group("resource-AccountsContainersRulesResourceApi", () {
     unittest.test("method--create", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersRulesResourceApi res = new api.TagmanagerApi(mock).accounts.containers.rules;
       var arg_request = buildRule();
       var arg_accountId = "foo";
@@ -2301,7 +2336,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRule());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.create(arg_request, arg_accountId, arg_containerId).then(unittest.expectAsync(((api.Rule response) {
         checkRule(response);
@@ -2310,7 +2345,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersRulesResourceApi res = new api.TagmanagerApi(mock).accounts.containers.rules;
       var arg_accountId = "foo";
       var arg_containerId = "foo";
@@ -2366,14 +2401,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_accountId, arg_containerId, arg_ruleId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersRulesResourceApi res = new api.TagmanagerApi(mock).accounts.containers.rules;
       var arg_accountId = "foo";
       var arg_containerId = "foo";
@@ -2429,7 +2464,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRule());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_containerId, arg_ruleId).then(unittest.expectAsync(((api.Rule response) {
         checkRule(response);
@@ -2438,7 +2473,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersRulesResourceApi res = new api.TagmanagerApi(mock).accounts.containers.rules;
       var arg_accountId = "foo";
       var arg_containerId = "foo";
@@ -2490,7 +2525,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListRulesResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_containerId).then(unittest.expectAsync(((api.ListRulesResponse response) {
         checkListRulesResponse(response);
@@ -2499,7 +2534,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersRulesResourceApi res = new api.TagmanagerApi(mock).accounts.containers.rules;
       var arg_request = buildRule();
       var arg_accountId = "foo";
@@ -2561,7 +2596,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildRule());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_accountId, arg_containerId, arg_ruleId, fingerprint: arg_fingerprint).then(unittest.expectAsync(((api.Rule response) {
         checkRule(response);
@@ -2574,7 +2609,7 @@
   unittest.group("resource-AccountsContainersTagsResourceApi", () {
     unittest.test("method--create", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersTagsResourceApi res = new api.TagmanagerApi(mock).accounts.containers.tags;
       var arg_request = buildTag();
       var arg_accountId = "foo";
@@ -2630,7 +2665,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTag());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.create(arg_request, arg_accountId, arg_containerId).then(unittest.expectAsync(((api.Tag response) {
         checkTag(response);
@@ -2639,7 +2674,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersTagsResourceApi res = new api.TagmanagerApi(mock).accounts.containers.tags;
       var arg_accountId = "foo";
       var arg_containerId = "foo";
@@ -2695,14 +2730,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_accountId, arg_containerId, arg_tagId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersTagsResourceApi res = new api.TagmanagerApi(mock).accounts.containers.tags;
       var arg_accountId = "foo";
       var arg_containerId = "foo";
@@ -2758,7 +2793,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTag());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_containerId, arg_tagId).then(unittest.expectAsync(((api.Tag response) {
         checkTag(response);
@@ -2767,7 +2802,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersTagsResourceApi res = new api.TagmanagerApi(mock).accounts.containers.tags;
       var arg_accountId = "foo";
       var arg_containerId = "foo";
@@ -2819,7 +2854,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListTagsResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_containerId).then(unittest.expectAsync(((api.ListTagsResponse response) {
         checkListTagsResponse(response);
@@ -2828,7 +2863,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersTagsResourceApi res = new api.TagmanagerApi(mock).accounts.containers.tags;
       var arg_request = buildTag();
       var arg_accountId = "foo";
@@ -2890,7 +2925,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTag());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_accountId, arg_containerId, arg_tagId, fingerprint: arg_fingerprint).then(unittest.expectAsync(((api.Tag response) {
         checkTag(response);
@@ -2903,7 +2938,7 @@
   unittest.group("resource-AccountsContainersTriggersResourceApi", () {
     unittest.test("method--create", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersTriggersResourceApi res = new api.TagmanagerApi(mock).accounts.containers.triggers;
       var arg_request = buildTrigger();
       var arg_accountId = "foo";
@@ -2959,7 +2994,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTrigger());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.create(arg_request, arg_accountId, arg_containerId).then(unittest.expectAsync(((api.Trigger response) {
         checkTrigger(response);
@@ -2968,7 +3003,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersTriggersResourceApi res = new api.TagmanagerApi(mock).accounts.containers.triggers;
       var arg_accountId = "foo";
       var arg_containerId = "foo";
@@ -3024,14 +3059,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_accountId, arg_containerId, arg_triggerId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersTriggersResourceApi res = new api.TagmanagerApi(mock).accounts.containers.triggers;
       var arg_accountId = "foo";
       var arg_containerId = "foo";
@@ -3087,7 +3122,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTrigger());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_containerId, arg_triggerId).then(unittest.expectAsync(((api.Trigger response) {
         checkTrigger(response);
@@ -3096,7 +3131,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersTriggersResourceApi res = new api.TagmanagerApi(mock).accounts.containers.triggers;
       var arg_accountId = "foo";
       var arg_containerId = "foo";
@@ -3148,7 +3183,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListTriggersResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_containerId).then(unittest.expectAsync(((api.ListTriggersResponse response) {
         checkListTriggersResponse(response);
@@ -3157,7 +3192,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersTriggersResourceApi res = new api.TagmanagerApi(mock).accounts.containers.triggers;
       var arg_request = buildTrigger();
       var arg_accountId = "foo";
@@ -3219,7 +3254,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTrigger());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_accountId, arg_containerId, arg_triggerId, fingerprint: arg_fingerprint).then(unittest.expectAsync(((api.Trigger response) {
         checkTrigger(response);
@@ -3232,7 +3267,7 @@
   unittest.group("resource-AccountsContainersVariablesResourceApi", () {
     unittest.test("method--create", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersVariablesResourceApi res = new api.TagmanagerApi(mock).accounts.containers.variables;
       var arg_request = buildVariable();
       var arg_accountId = "foo";
@@ -3288,7 +3323,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildVariable());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.create(arg_request, arg_accountId, arg_containerId).then(unittest.expectAsync(((api.Variable response) {
         checkVariable(response);
@@ -3297,7 +3332,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersVariablesResourceApi res = new api.TagmanagerApi(mock).accounts.containers.variables;
       var arg_accountId = "foo";
       var arg_containerId = "foo";
@@ -3353,14 +3388,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_accountId, arg_containerId, arg_variableId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersVariablesResourceApi res = new api.TagmanagerApi(mock).accounts.containers.variables;
       var arg_accountId = "foo";
       var arg_containerId = "foo";
@@ -3416,7 +3451,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildVariable());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_containerId, arg_variableId).then(unittest.expectAsync(((api.Variable response) {
         checkVariable(response);
@@ -3425,7 +3460,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersVariablesResourceApi res = new api.TagmanagerApi(mock).accounts.containers.variables;
       var arg_accountId = "foo";
       var arg_containerId = "foo";
@@ -3477,7 +3512,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListVariablesResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_containerId).then(unittest.expectAsync(((api.ListVariablesResponse response) {
         checkListVariablesResponse(response);
@@ -3486,7 +3521,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersVariablesResourceApi res = new api.TagmanagerApi(mock).accounts.containers.variables;
       var arg_request = buildVariable();
       var arg_accountId = "foo";
@@ -3548,7 +3583,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildVariable());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_accountId, arg_containerId, arg_variableId, fingerprint: arg_fingerprint).then(unittest.expectAsync(((api.Variable response) {
         checkVariable(response);
@@ -3561,7 +3596,7 @@
   unittest.group("resource-AccountsContainersVersionsResourceApi", () {
     unittest.test("method--create", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersVersionsResourceApi res = new api.TagmanagerApi(mock).accounts.containers.versions;
       var arg_request = buildCreateContainerVersionRequestVersionOptions();
       var arg_accountId = "foo";
@@ -3617,7 +3652,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCreateContainerVersionResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.create(arg_request, arg_accountId, arg_containerId).then(unittest.expectAsync(((api.CreateContainerVersionResponse response) {
         checkCreateContainerVersionResponse(response);
@@ -3626,7 +3661,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersVersionsResourceApi res = new api.TagmanagerApi(mock).accounts.containers.versions;
       var arg_accountId = "foo";
       var arg_containerId = "foo";
@@ -3682,14 +3717,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_accountId, arg_containerId, arg_containerVersionId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersVersionsResourceApi res = new api.TagmanagerApi(mock).accounts.containers.versions;
       var arg_accountId = "foo";
       var arg_containerId = "foo";
@@ -3745,7 +3780,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildContainerVersion());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_containerId, arg_containerVersionId).then(unittest.expectAsync(((api.ContainerVersion response) {
         checkContainerVersion(response);
@@ -3754,7 +3789,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersVersionsResourceApi res = new api.TagmanagerApi(mock).accounts.containers.versions;
       var arg_accountId = "foo";
       var arg_containerId = "foo";
@@ -3808,7 +3843,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListContainerVersionsResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId, arg_containerId, headers: arg_headers).then(unittest.expectAsync(((api.ListContainerVersionsResponse response) {
         checkListContainerVersionsResponse(response);
@@ -3817,7 +3852,7 @@
 
     unittest.test("method--publish", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersVersionsResourceApi res = new api.TagmanagerApi(mock).accounts.containers.versions;
       var arg_accountId = "foo";
       var arg_containerId = "foo";
@@ -3879,7 +3914,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPublishContainerVersionResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.publish(arg_accountId, arg_containerId, arg_containerVersionId, fingerprint: arg_fingerprint).then(unittest.expectAsync(((api.PublishContainerVersionResponse response) {
         checkPublishContainerVersionResponse(response);
@@ -3888,7 +3923,7 @@
 
     unittest.test("method--restore", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersVersionsResourceApi res = new api.TagmanagerApi(mock).accounts.containers.versions;
       var arg_accountId = "foo";
       var arg_containerId = "foo";
@@ -3948,7 +3983,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildContainerVersion());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.restore(arg_accountId, arg_containerId, arg_containerVersionId).then(unittest.expectAsync(((api.ContainerVersion response) {
         checkContainerVersion(response);
@@ -3957,7 +3992,7 @@
 
     unittest.test("method--undelete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersVersionsResourceApi res = new api.TagmanagerApi(mock).accounts.containers.versions;
       var arg_accountId = "foo";
       var arg_containerId = "foo";
@@ -4017,7 +4052,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildContainerVersion());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.undelete(arg_accountId, arg_containerId, arg_containerVersionId).then(unittest.expectAsync(((api.ContainerVersion response) {
         checkContainerVersion(response);
@@ -4026,7 +4061,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsContainersVersionsResourceApi res = new api.TagmanagerApi(mock).accounts.containers.versions;
       var arg_request = buildContainerVersion();
       var arg_accountId = "foo";
@@ -4088,7 +4123,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildContainerVersion());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_accountId, arg_containerId, arg_containerVersionId, fingerprint: arg_fingerprint).then(unittest.expectAsync(((api.ContainerVersion response) {
         checkContainerVersion(response);
@@ -4101,7 +4136,7 @@
   unittest.group("resource-AccountsPermissionsResourceApi", () {
     unittest.test("method--create", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsPermissionsResourceApi res = new api.TagmanagerApi(mock).accounts.permissions;
       var arg_request = buildUserAccess();
       var arg_accountId = "foo";
@@ -4149,7 +4184,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUserAccess());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.create(arg_request, arg_accountId).then(unittest.expectAsync(((api.UserAccess response) {
         checkUserAccess(response);
@@ -4158,7 +4193,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsPermissionsResourceApi res = new api.TagmanagerApi(mock).accounts.permissions;
       var arg_accountId = "foo";
       var arg_permissionId = "foo";
@@ -4206,14 +4241,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_accountId, arg_permissionId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsPermissionsResourceApi res = new api.TagmanagerApi(mock).accounts.permissions;
       var arg_accountId = "foo";
       var arg_permissionId = "foo";
@@ -4261,7 +4296,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUserAccess());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_accountId, arg_permissionId).then(unittest.expectAsync(((api.UserAccess response) {
         checkUserAccess(response);
@@ -4270,7 +4305,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsPermissionsResourceApi res = new api.TagmanagerApi(mock).accounts.permissions;
       var arg_accountId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -4314,7 +4349,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildListAccountUsersResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_accountId).then(unittest.expectAsync(((api.ListAccountUsersResponse response) {
         checkListAccountUsersResponse(response);
@@ -4323,7 +4358,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AccountsPermissionsResourceApi res = new api.TagmanagerApi(mock).accounts.permissions;
       var arg_request = buildUserAccess();
       var arg_accountId = "foo";
@@ -4375,7 +4410,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUserAccess());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_accountId, arg_permissionId).then(unittest.expectAsync(((api.UserAccess response) {
         checkUserAccess(response);
diff --git a/generated/googleapis/test/tasks/v1_test.dart b/generated/googleapis/test/tasks/v1_test.dart
index 50a6866..c38e00f 100644
--- a/generated/googleapis/test/tasks/v1_test.dart
+++ b/generated/googleapis/test/tasks/v1_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/tasks/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterTaskLinks = 0;
 buildTaskLinks() {
@@ -39,14 +74,14 @@
   buildCounterTaskLinks--;
 }
 
-buildUnnamed1454() {
+buildUnnamed1384() {
   var o = new core.List<api.TaskLinks>();
   o.add(buildTaskLinks());
   o.add(buildTaskLinks());
   return o;
 }
 
-checkUnnamed1454(core.List<api.TaskLinks> o) {
+checkUnnamed1384(core.List<api.TaskLinks> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTaskLinks(o[0]);
   checkTaskLinks(o[1]);
@@ -64,7 +99,7 @@
     o.hidden = true;
     o.id = "foo";
     o.kind = "foo";
-    o.links = buildUnnamed1454();
+    o.links = buildUnnamed1384();
     o.notes = "foo";
     o.parent = "foo";
     o.position = "foo";
@@ -87,7 +122,7 @@
     unittest.expect(o.hidden, unittest.isTrue);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1454(o.links);
+    checkUnnamed1384(o.links);
     unittest.expect(o.notes, unittest.equals('foo'));
     unittest.expect(o.parent, unittest.equals('foo'));
     unittest.expect(o.position, unittest.equals('foo'));
@@ -128,14 +163,14 @@
   buildCounterTaskList--;
 }
 
-buildUnnamed1455() {
+buildUnnamed1385() {
   var o = new core.List<api.TaskList>();
   o.add(buildTaskList());
   o.add(buildTaskList());
   return o;
 }
 
-checkUnnamed1455(core.List<api.TaskList> o) {
+checkUnnamed1385(core.List<api.TaskList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTaskList(o[0]);
   checkTaskList(o[1]);
@@ -147,7 +182,7 @@
   buildCounterTaskLists++;
   if (buildCounterTaskLists < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1455();
+    o.items = buildUnnamed1385();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -159,21 +194,21 @@
   buildCounterTaskLists++;
   if (buildCounterTaskLists < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1455(o.items);
+    checkUnnamed1385(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterTaskLists--;
 }
 
-buildUnnamed1456() {
+buildUnnamed1386() {
   var o = new core.List<api.Task>();
   o.add(buildTask());
   o.add(buildTask());
   return o;
 }
 
-checkUnnamed1456(core.List<api.Task> o) {
+checkUnnamed1386(core.List<api.Task> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTask(o[0]);
   checkTask(o[1]);
@@ -185,7 +220,7 @@
   buildCounterTasks++;
   if (buildCounterTasks < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1456();
+    o.items = buildUnnamed1386();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -197,7 +232,7 @@
   buildCounterTasks++;
   if (buildCounterTasks < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1456(o.items);
+    checkUnnamed1386(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -254,7 +289,7 @@
   unittest.group("resource-TasklistsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TasklistsResourceApi res = new api.TasksApi(mock).tasklists;
       var arg_tasklist = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -294,14 +329,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_tasklist).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TasklistsResourceApi res = new api.TasksApi(mock).tasklists;
       var arg_tasklist = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -341,7 +376,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTaskList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_tasklist).then(unittest.expectAsync(((api.TaskList response) {
         checkTaskList(response);
@@ -350,7 +385,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TasklistsResourceApi res = new api.TasksApi(mock).tasklists;
       var arg_request = buildTaskList();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -390,7 +425,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTaskList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request).then(unittest.expectAsync(((api.TaskList response) {
         checkTaskList(response);
@@ -399,7 +434,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TasklistsResourceApi res = new api.TasksApi(mock).tasklists;
       var arg_maxResults = "foo";
       var arg_pageToken = "foo";
@@ -439,7 +474,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTaskLists());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.TaskLists response) {
         checkTaskLists(response);
@@ -448,7 +483,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TasklistsResourceApi res = new api.TasksApi(mock).tasklists;
       var arg_request = buildTaskList();
       var arg_tasklist = "foo";
@@ -492,7 +527,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTaskList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_tasklist).then(unittest.expectAsync(((api.TaskList response) {
         checkTaskList(response);
@@ -501,7 +536,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TasklistsResourceApi res = new api.TasksApi(mock).tasklists;
       var arg_request = buildTaskList();
       var arg_tasklist = "foo";
@@ -545,7 +580,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTaskList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_tasklist).then(unittest.expectAsync(((api.TaskList response) {
         checkTaskList(response);
@@ -558,7 +593,7 @@
   unittest.group("resource-TasksResourceApi", () {
     unittest.test("method--clear", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TasksResourceApi res = new api.TasksApi(mock).tasks;
       var arg_tasklist = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -602,14 +637,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.clear(arg_tasklist).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TasksResourceApi res = new api.TasksApi(mock).tasks;
       var arg_tasklist = "foo";
       var arg_task = "foo";
@@ -657,14 +692,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_tasklist, arg_task).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TasksResourceApi res = new api.TasksApi(mock).tasks;
       var arg_tasklist = "foo";
       var arg_task = "foo";
@@ -712,7 +747,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTask());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_tasklist, arg_task).then(unittest.expectAsync(((api.Task response) {
         checkTask(response);
@@ -721,7 +756,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TasksResourceApi res = new api.TasksApi(mock).tasks;
       var arg_request = buildTask();
       var arg_tasklist = "foo";
@@ -773,7 +808,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTask());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_tasklist, parent: arg_parent, previous: arg_previous).then(unittest.expectAsync(((api.Task response) {
         checkTask(response);
@@ -782,7 +817,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TasksResourceApi res = new api.TasksApi(mock).tasks;
       var arg_tasklist = "foo";
       var arg_completedMax = "foo";
@@ -846,7 +881,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTasks());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_tasklist, completedMax: arg_completedMax, completedMin: arg_completedMin, dueMax: arg_dueMax, dueMin: arg_dueMin, maxResults: arg_maxResults, pageToken: arg_pageToken, showCompleted: arg_showCompleted, showDeleted: arg_showDeleted, showHidden: arg_showHidden, updatedMin: arg_updatedMin).then(unittest.expectAsync(((api.Tasks response) {
         checkTasks(response);
@@ -855,7 +890,7 @@
 
     unittest.test("method--move", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TasksResourceApi res = new api.TasksApi(mock).tasks;
       var arg_tasklist = "foo";
       var arg_task = "foo";
@@ -911,7 +946,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTask());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.move(arg_tasklist, arg_task, parent: arg_parent, previous: arg_previous).then(unittest.expectAsync(((api.Task response) {
         checkTask(response);
@@ -920,7 +955,7 @@
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TasksResourceApi res = new api.TasksApi(mock).tasks;
       var arg_request = buildTask();
       var arg_tasklist = "foo";
@@ -972,7 +1007,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTask());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_tasklist, arg_task).then(unittest.expectAsync(((api.Task response) {
         checkTask(response);
@@ -981,7 +1016,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TasksResourceApi res = new api.TasksApi(mock).tasks;
       var arg_request = buildTask();
       var arg_tasklist = "foo";
@@ -1033,7 +1068,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTask());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_tasklist, arg_task).then(unittest.expectAsync(((api.Task response) {
         checkTask(response);
diff --git a/generated/googleapis/test/translate/v2_test.dart b/generated/googleapis/test/translate/v2_test.dart
index 1bba5f6..fd06454 100644
--- a/generated/googleapis/test/translate/v2_test.dart
+++ b/generated/googleapis/test/translate/v2_test.dart
@@ -8,22 +8,57 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/translate/v2.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
 
-buildUnnamed736() {
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+buildUnnamed1387() {
   var o = new core.List<api.DetectionsResource>();
   o.add(buildDetectionsResource());
   o.add(buildDetectionsResource());
   return o;
 }
 
-checkUnnamed736(core.List<api.DetectionsResource> o) {
+checkUnnamed1387(core.List<api.DetectionsResource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDetectionsResource(o[0]);
   checkDetectionsResource(o[1]);
@@ -34,7 +69,7 @@
   var o = new api.DetectionsListResponse();
   buildCounterDetectionsListResponse++;
   if (buildCounterDetectionsListResponse < 3) {
-    o.detections = buildUnnamed736();
+    o.detections = buildUnnamed1387();
   }
   buildCounterDetectionsListResponse--;
   return o;
@@ -43,7 +78,7 @@
 checkDetectionsListResponse(api.DetectionsListResponse o) {
   buildCounterDetectionsListResponse++;
   if (buildCounterDetectionsListResponse < 3) {
-    checkUnnamed736(o.detections);
+    checkUnnamed1387(o.detections);
   }
   buildCounterDetectionsListResponse--;
 }
@@ -84,14 +119,14 @@
   checkDetectionsResourceElement(o[1]);
 }
 
-buildUnnamed737() {
+buildUnnamed1388() {
   var o = new core.List<api.LanguagesResource>();
   o.add(buildLanguagesResource());
   o.add(buildLanguagesResource());
   return o;
 }
 
-checkUnnamed737(core.List<api.LanguagesResource> o) {
+checkUnnamed1388(core.List<api.LanguagesResource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLanguagesResource(o[0]);
   checkLanguagesResource(o[1]);
@@ -102,7 +137,7 @@
   var o = new api.LanguagesListResponse();
   buildCounterLanguagesListResponse++;
   if (buildCounterLanguagesListResponse < 3) {
-    o.languages = buildUnnamed737();
+    o.languages = buildUnnamed1388();
   }
   buildCounterLanguagesListResponse--;
   return o;
@@ -111,7 +146,7 @@
 checkLanguagesListResponse(api.LanguagesListResponse o) {
   buildCounterLanguagesListResponse++;
   if (buildCounterLanguagesListResponse < 3) {
-    checkUnnamed737(o.languages);
+    checkUnnamed1388(o.languages);
   }
   buildCounterLanguagesListResponse--;
 }
@@ -137,14 +172,14 @@
   buildCounterLanguagesResource--;
 }
 
-buildUnnamed738() {
+buildUnnamed1389() {
   var o = new core.List<api.TranslationsResource>();
   o.add(buildTranslationsResource());
   o.add(buildTranslationsResource());
   return o;
 }
 
-checkUnnamed738(core.List<api.TranslationsResource> o) {
+checkUnnamed1389(core.List<api.TranslationsResource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTranslationsResource(o[0]);
   checkTranslationsResource(o[1]);
@@ -155,7 +190,7 @@
   var o = new api.TranslationsListResponse();
   buildCounterTranslationsListResponse++;
   if (buildCounterTranslationsListResponse < 3) {
-    o.translations = buildUnnamed738();
+    o.translations = buildUnnamed1389();
   }
   buildCounterTranslationsListResponse--;
   return o;
@@ -164,7 +199,7 @@
 checkTranslationsListResponse(api.TranslationsListResponse o) {
   buildCounterTranslationsListResponse++;
   if (buildCounterTranslationsListResponse < 3) {
-    checkUnnamed738(o.translations);
+    checkUnnamed1389(o.translations);
   }
   buildCounterTranslationsListResponse--;
 }
@@ -190,40 +225,40 @@
   buildCounterTranslationsResource--;
 }
 
-buildUnnamed739() {
+buildUnnamed1390() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed739(core.List<core.String> o) {
+checkUnnamed1390(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed740() {
+buildUnnamed1391() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed740(core.List<core.String> o) {
+checkUnnamed1391(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed741() {
+buildUnnamed1392() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed741(core.List<core.String> o) {
+checkUnnamed1392(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -297,9 +332,9 @@
   unittest.group("resource-DetectionsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.DetectionsResourceApi res = new api.TranslateApi(mock).detections;
-      var arg_q = buildUnnamed739();
+      var arg_q = buildUnnamed1390();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
@@ -335,7 +370,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildDetectionsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_q).then(unittest.expectAsync(((api.DetectionsListResponse response) {
         checkDetectionsListResponse(response);
@@ -348,7 +383,7 @@
   unittest.group("resource-LanguagesResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LanguagesResourceApi res = new api.TranslateApi(mock).languages;
       var arg_target = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -386,7 +421,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLanguagesListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(target: arg_target).then(unittest.expectAsync(((api.LanguagesListResponse response) {
         checkLanguagesListResponse(response);
@@ -399,11 +434,11 @@
   unittest.group("resource-TranslationsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.TranslationsResourceApi res = new api.TranslateApi(mock).translations;
-      var arg_q = buildUnnamed740();
+      var arg_q = buildUnnamed1391();
       var arg_target = "foo";
-      var arg_cid = buildUnnamed741();
+      var arg_cid = buildUnnamed1392();
       var arg_format = "foo";
       var arg_source = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -445,7 +480,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildTranslationsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_q, arg_target, cid: arg_cid, format: arg_format, source: arg_source).then(unittest.expectAsync(((api.TranslationsListResponse response) {
         checkTranslationsListResponse(response);
diff --git a/generated/googleapis/test/urlshortener/v1_test.dart b/generated/googleapis/test/urlshortener/v1_test.dart
index 5d4276f..b8f270e 100644
--- a/generated/googleapis/test/urlshortener/v1_test.dart
+++ b/generated/googleapis/test/urlshortener/v1_test.dart
@@ -8,61 +8,96 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/urlshortener/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
 
-buildUnnamed742() {
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+buildUnnamed1393() {
   var o = new core.List<api.StringCount>();
   o.add(buildStringCount());
   o.add(buildStringCount());
   return o;
 }
 
-checkUnnamed742(core.List<api.StringCount> o) {
+checkUnnamed1393(core.List<api.StringCount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStringCount(o[0]);
   checkStringCount(o[1]);
 }
 
-buildUnnamed743() {
+buildUnnamed1394() {
   var o = new core.List<api.StringCount>();
   o.add(buildStringCount());
   o.add(buildStringCount());
   return o;
 }
 
-checkUnnamed743(core.List<api.StringCount> o) {
+checkUnnamed1394(core.List<api.StringCount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStringCount(o[0]);
   checkStringCount(o[1]);
 }
 
-buildUnnamed744() {
+buildUnnamed1395() {
   var o = new core.List<api.StringCount>();
   o.add(buildStringCount());
   o.add(buildStringCount());
   return o;
 }
 
-checkUnnamed744(core.List<api.StringCount> o) {
+checkUnnamed1395(core.List<api.StringCount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStringCount(o[0]);
   checkStringCount(o[1]);
 }
 
-buildUnnamed745() {
+buildUnnamed1396() {
   var o = new core.List<api.StringCount>();
   o.add(buildStringCount());
   o.add(buildStringCount());
   return o;
 }
 
-checkUnnamed745(core.List<api.StringCount> o) {
+checkUnnamed1396(core.List<api.StringCount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStringCount(o[0]);
   checkStringCount(o[1]);
@@ -73,11 +108,11 @@
   var o = new api.AnalyticsSnapshot();
   buildCounterAnalyticsSnapshot++;
   if (buildCounterAnalyticsSnapshot < 3) {
-    o.browsers = buildUnnamed742();
-    o.countries = buildUnnamed743();
+    o.browsers = buildUnnamed1393();
+    o.countries = buildUnnamed1394();
     o.longUrlClicks = "foo";
-    o.platforms = buildUnnamed744();
-    o.referrers = buildUnnamed745();
+    o.platforms = buildUnnamed1395();
+    o.referrers = buildUnnamed1396();
     o.shortUrlClicks = "foo";
   }
   buildCounterAnalyticsSnapshot--;
@@ -87,11 +122,11 @@
 checkAnalyticsSnapshot(api.AnalyticsSnapshot o) {
   buildCounterAnalyticsSnapshot++;
   if (buildCounterAnalyticsSnapshot < 3) {
-    checkUnnamed742(o.browsers);
-    checkUnnamed743(o.countries);
+    checkUnnamed1393(o.browsers);
+    checkUnnamed1394(o.countries);
     unittest.expect(o.longUrlClicks, unittest.equals('foo'));
-    checkUnnamed744(o.platforms);
-    checkUnnamed745(o.referrers);
+    checkUnnamed1395(o.platforms);
+    checkUnnamed1396(o.referrers);
     unittest.expect(o.shortUrlClicks, unittest.equals('foo'));
   }
   buildCounterAnalyticsSnapshot--;
@@ -174,14 +209,14 @@
   buildCounterUrl--;
 }
 
-buildUnnamed746() {
+buildUnnamed1397() {
   var o = new core.List<api.Url>();
   o.add(buildUrl());
   o.add(buildUrl());
   return o;
 }
 
-checkUnnamed746(core.List<api.Url> o) {
+checkUnnamed1397(core.List<api.Url> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrl(o[0]);
   checkUrl(o[1]);
@@ -192,7 +227,7 @@
   var o = new api.UrlHistory();
   buildCounterUrlHistory++;
   if (buildCounterUrlHistory < 3) {
-    o.items = buildUnnamed746();
+    o.items = buildUnnamed1397();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextPageToken = "foo";
@@ -205,7 +240,7 @@
 checkUrlHistory(api.UrlHistory o) {
   buildCounterUrlHistory++;
   if (buildCounterUrlHistory < 3) {
-    checkUnnamed746(o.items);
+    checkUnnamed1397(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -264,7 +299,7 @@
   unittest.group("resource-UrlResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UrlResourceApi res = new api.UrlshortenerApi(mock).url;
       var arg_shortUrl = "foo";
       var arg_projection = "foo";
@@ -304,7 +339,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUrl());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_shortUrl, projection: arg_projection).then(unittest.expectAsync(((api.Url response) {
         checkUrl(response);
@@ -313,7 +348,7 @@
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UrlResourceApi res = new api.UrlshortenerApi(mock).url;
       var arg_request = buildUrl();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -353,7 +388,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUrl());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request).then(unittest.expectAsync(((api.Url response) {
         checkUrl(response);
@@ -362,7 +397,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UrlResourceApi res = new api.UrlshortenerApi(mock).url;
       var arg_projection = "foo";
       var arg_start_token = "foo";
@@ -402,7 +437,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUrlHistory());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(projection: arg_projection, start_token: arg_start_token).then(unittest.expectAsync(((api.UrlHistory response) {
         checkUrlHistory(response);
diff --git a/generated/googleapis/test/webfonts/v1_test.dart b/generated/googleapis/test/webfonts/v1_test.dart
index 07017f4..9fd0658 100644
--- a/generated/googleapis/test/webfonts/v1_test.dart
+++ b/generated/googleapis/test/webfonts/v1_test.dart
@@ -8,48 +8,83 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/webfonts/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
 
-buildUnnamed1126() {
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+buildUnnamed1398() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1126(core.Map<core.String, core.String> o) {
+checkUnnamed1398(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed1127() {
+buildUnnamed1399() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1127(core.List<core.String> o) {
+checkUnnamed1399(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1128() {
+buildUnnamed1400() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1128(core.List<core.String> o) {
+checkUnnamed1400(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -62,11 +97,11 @@
   if (buildCounterWebfont < 3) {
     o.category = "foo";
     o.family = "foo";
-    o.files = buildUnnamed1126();
+    o.files = buildUnnamed1398();
     o.kind = "foo";
     o.lastModified = core.DateTime.parse("2002-02-27T14:01:02Z");
-    o.subsets = buildUnnamed1127();
-    o.variants = buildUnnamed1128();
+    o.subsets = buildUnnamed1399();
+    o.variants = buildUnnamed1400();
     o.version = "foo";
   }
   buildCounterWebfont--;
@@ -78,24 +113,24 @@
   if (buildCounterWebfont < 3) {
     unittest.expect(o.category, unittest.equals('foo'));
     unittest.expect(o.family, unittest.equals('foo'));
-    checkUnnamed1126(o.files);
+    checkUnnamed1398(o.files);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.lastModified, unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
-    checkUnnamed1127(o.subsets);
-    checkUnnamed1128(o.variants);
+    checkUnnamed1399(o.subsets);
+    checkUnnamed1400(o.variants);
     unittest.expect(o.version, unittest.equals('foo'));
   }
   buildCounterWebfont--;
 }
 
-buildUnnamed1129() {
+buildUnnamed1401() {
   var o = new core.List<api.Webfont>();
   o.add(buildWebfont());
   o.add(buildWebfont());
   return o;
 }
 
-checkUnnamed1129(core.List<api.Webfont> o) {
+checkUnnamed1401(core.List<api.Webfont> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWebfont(o[0]);
   checkWebfont(o[1]);
@@ -106,7 +141,7 @@
   var o = new api.WebfontList();
   buildCounterWebfontList++;
   if (buildCounterWebfontList < 3) {
-    o.items = buildUnnamed1129();
+    o.items = buildUnnamed1401();
     o.kind = "foo";
   }
   buildCounterWebfontList--;
@@ -116,7 +151,7 @@
 checkWebfontList(api.WebfontList o) {
   buildCounterWebfontList++;
   if (buildCounterWebfontList < 3) {
-    checkUnnamed1129(o.items);
+    checkUnnamed1401(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterWebfontList--;
@@ -145,7 +180,7 @@
   unittest.group("resource-WebfontsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.WebfontsResourceApi res = new api.WebfontsApi(mock).webfonts;
       var arg_sort = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -183,7 +218,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildWebfontList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(sort: arg_sort).then(unittest.expectAsync(((api.WebfontList response) {
         checkWebfontList(response);
diff --git a/generated/googleapis/test/webmasters/v3_test.dart b/generated/googleapis/test/webmasters/v3_test.dart
index abf4c13..c7522bc 100644
--- a/generated/googleapis/test/webmasters/v3_test.dart
+++ b/generated/googleapis/test/webmasters/v3_test.dart
@@ -8,22 +8,57 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/webmasters/v3.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
 
-buildUnnamed667() {
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+buildUnnamed1402() {
   var o = new core.List<api.WmxSitemap>();
   o.add(buildWmxSitemap());
   o.add(buildWmxSitemap());
   return o;
 }
 
-checkUnnamed667(core.List<api.WmxSitemap> o) {
+checkUnnamed1402(core.List<api.WmxSitemap> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWmxSitemap(o[0]);
   checkWmxSitemap(o[1]);
@@ -34,7 +69,7 @@
   var o = new api.SitemapsListResponse();
   buildCounterSitemapsListResponse++;
   if (buildCounterSitemapsListResponse < 3) {
-    o.sitemap = buildUnnamed667();
+    o.sitemap = buildUnnamed1402();
   }
   buildCounterSitemapsListResponse--;
   return o;
@@ -43,19 +78,19 @@
 checkSitemapsListResponse(api.SitemapsListResponse o) {
   buildCounterSitemapsListResponse++;
   if (buildCounterSitemapsListResponse < 3) {
-    checkUnnamed667(o.sitemap);
+    checkUnnamed1402(o.sitemap);
   }
   buildCounterSitemapsListResponse--;
 }
 
-buildUnnamed668() {
+buildUnnamed1403() {
   var o = new core.List<api.WmxSite>();
   o.add(buildWmxSite());
   o.add(buildWmxSite());
   return o;
 }
 
-checkUnnamed668(core.List<api.WmxSite> o) {
+checkUnnamed1403(core.List<api.WmxSite> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWmxSite(o[0]);
   checkWmxSite(o[1]);
@@ -66,7 +101,7 @@
   var o = new api.SitesListResponse();
   buildCounterSitesListResponse++;
   if (buildCounterSitesListResponse < 3) {
-    o.siteEntry = buildUnnamed668();
+    o.siteEntry = buildUnnamed1403();
   }
   buildCounterSitesListResponse--;
   return o;
@@ -75,7 +110,7 @@
 checkSitesListResponse(api.SitesListResponse o) {
   buildCounterSitesListResponse++;
   if (buildCounterSitesListResponse < 3) {
-    checkUnnamed668(o.siteEntry);
+    checkUnnamed1403(o.siteEntry);
   }
   buildCounterSitesListResponse--;
 }
@@ -101,14 +136,14 @@
   buildCounterUrlCrawlErrorCount--;
 }
 
-buildUnnamed669() {
+buildUnnamed1404() {
   var o = new core.List<api.UrlCrawlErrorCount>();
   o.add(buildUrlCrawlErrorCount());
   o.add(buildUrlCrawlErrorCount());
   return o;
 }
 
-checkUnnamed669(core.List<api.UrlCrawlErrorCount> o) {
+checkUnnamed1404(core.List<api.UrlCrawlErrorCount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlCrawlErrorCount(o[0]);
   checkUrlCrawlErrorCount(o[1]);
@@ -120,7 +155,7 @@
   buildCounterUrlCrawlErrorCountsPerType++;
   if (buildCounterUrlCrawlErrorCountsPerType < 3) {
     o.category = "foo";
-    o.entries = buildUnnamed669();
+    o.entries = buildUnnamed1404();
     o.platform = "foo";
   }
   buildCounterUrlCrawlErrorCountsPerType--;
@@ -131,20 +166,20 @@
   buildCounterUrlCrawlErrorCountsPerType++;
   if (buildCounterUrlCrawlErrorCountsPerType < 3) {
     unittest.expect(o.category, unittest.equals('foo'));
-    checkUnnamed669(o.entries);
+    checkUnnamed1404(o.entries);
     unittest.expect(o.platform, unittest.equals('foo'));
   }
   buildCounterUrlCrawlErrorCountsPerType--;
 }
 
-buildUnnamed670() {
+buildUnnamed1405() {
   var o = new core.List<api.UrlCrawlErrorCountsPerType>();
   o.add(buildUrlCrawlErrorCountsPerType());
   o.add(buildUrlCrawlErrorCountsPerType());
   return o;
 }
 
-checkUnnamed670(core.List<api.UrlCrawlErrorCountsPerType> o) {
+checkUnnamed1405(core.List<api.UrlCrawlErrorCountsPerType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlCrawlErrorCountsPerType(o[0]);
   checkUrlCrawlErrorCountsPerType(o[1]);
@@ -155,7 +190,7 @@
   var o = new api.UrlCrawlErrorsCountsQueryResponse();
   buildCounterUrlCrawlErrorsCountsQueryResponse++;
   if (buildCounterUrlCrawlErrorsCountsQueryResponse < 3) {
-    o.countPerTypes = buildUnnamed670();
+    o.countPerTypes = buildUnnamed1405();
   }
   buildCounterUrlCrawlErrorsCountsQueryResponse--;
   return o;
@@ -164,7 +199,7 @@
 checkUrlCrawlErrorsCountsQueryResponse(api.UrlCrawlErrorsCountsQueryResponse o) {
   buildCounterUrlCrawlErrorsCountsQueryResponse++;
   if (buildCounterUrlCrawlErrorsCountsQueryResponse < 3) {
-    checkUnnamed670(o.countPerTypes);
+    checkUnnamed1405(o.countPerTypes);
   }
   buildCounterUrlCrawlErrorsCountsQueryResponse--;
 }
@@ -196,14 +231,14 @@
   buildCounterUrlCrawlErrorsSample--;
 }
 
-buildUnnamed671() {
+buildUnnamed1406() {
   var o = new core.List<api.UrlCrawlErrorsSample>();
   o.add(buildUrlCrawlErrorsSample());
   o.add(buildUrlCrawlErrorsSample());
   return o;
 }
 
-checkUnnamed671(core.List<api.UrlCrawlErrorsSample> o) {
+checkUnnamed1406(core.List<api.UrlCrawlErrorsSample> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlCrawlErrorsSample(o[0]);
   checkUrlCrawlErrorsSample(o[1]);
@@ -214,7 +249,7 @@
   var o = new api.UrlCrawlErrorsSamplesListResponse();
   buildCounterUrlCrawlErrorsSamplesListResponse++;
   if (buildCounterUrlCrawlErrorsSamplesListResponse < 3) {
-    o.urlCrawlErrorSample = buildUnnamed671();
+    o.urlCrawlErrorSample = buildUnnamed1406();
   }
   buildCounterUrlCrawlErrorsSamplesListResponse--;
   return o;
@@ -223,32 +258,32 @@
 checkUrlCrawlErrorsSamplesListResponse(api.UrlCrawlErrorsSamplesListResponse o) {
   buildCounterUrlCrawlErrorsSamplesListResponse++;
   if (buildCounterUrlCrawlErrorsSamplesListResponse < 3) {
-    checkUnnamed671(o.urlCrawlErrorSample);
+    checkUnnamed1406(o.urlCrawlErrorSample);
   }
   buildCounterUrlCrawlErrorsSamplesListResponse--;
 }
 
-buildUnnamed672() {
+buildUnnamed1407() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed672(core.List<core.String> o) {
+checkUnnamed1407(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed673() {
+buildUnnamed1408() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed673(core.List<core.String> o) {
+checkUnnamed1408(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -259,8 +294,8 @@
   var o = new api.UrlSampleDetails();
   buildCounterUrlSampleDetails++;
   if (buildCounterUrlSampleDetails < 3) {
-    o.containingSitemaps = buildUnnamed672();
-    o.linkedFromUrls = buildUnnamed673();
+    o.containingSitemaps = buildUnnamed1407();
+    o.linkedFromUrls = buildUnnamed1408();
   }
   buildCounterUrlSampleDetails--;
   return o;
@@ -269,8 +304,8 @@
 checkUrlSampleDetails(api.UrlSampleDetails o) {
   buildCounterUrlSampleDetails++;
   if (buildCounterUrlSampleDetails < 3) {
-    checkUnnamed672(o.containingSitemaps);
-    checkUnnamed673(o.linkedFromUrls);
+    checkUnnamed1407(o.containingSitemaps);
+    checkUnnamed1408(o.linkedFromUrls);
   }
   buildCounterUrlSampleDetails--;
 }
@@ -296,14 +331,14 @@
   buildCounterWmxSite--;
 }
 
-buildUnnamed674() {
+buildUnnamed1409() {
   var o = new core.List<api.WmxSitemapContent>();
   o.add(buildWmxSitemapContent());
   o.add(buildWmxSitemapContent());
   return o;
 }
 
-checkUnnamed674(core.List<api.WmxSitemapContent> o) {
+checkUnnamed1409(core.List<api.WmxSitemapContent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWmxSitemapContent(o[0]);
   checkWmxSitemapContent(o[1]);
@@ -314,7 +349,7 @@
   var o = new api.WmxSitemap();
   buildCounterWmxSitemap++;
   if (buildCounterWmxSitemap < 3) {
-    o.contents = buildUnnamed674();
+    o.contents = buildUnnamed1409();
     o.errors = "foo";
     o.isPending = true;
     o.isSitemapsIndex = true;
@@ -331,7 +366,7 @@
 checkWmxSitemap(api.WmxSitemap o) {
   buildCounterWmxSitemap++;
   if (buildCounterWmxSitemap < 3) {
-    checkUnnamed674(o.contents);
+    checkUnnamed1409(o.contents);
     unittest.expect(o.errors, unittest.equals('foo'));
     unittest.expect(o.isPending, unittest.isTrue);
     unittest.expect(o.isSitemapsIndex, unittest.isTrue);
@@ -471,7 +506,7 @@
   unittest.group("resource-SitemapsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SitemapsResourceApi res = new api.WebmastersApi(mock).sitemaps;
       var arg_siteUrl = "foo";
       var arg_feedpath = "foo";
@@ -519,14 +554,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_siteUrl, arg_feedpath).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SitemapsResourceApi res = new api.WebmastersApi(mock).sitemaps;
       var arg_siteUrl = "foo";
       var arg_feedpath = "foo";
@@ -574,7 +609,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildWmxSitemap());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_siteUrl, arg_feedpath).then(unittest.expectAsync(((api.WmxSitemap response) {
         checkWmxSitemap(response);
@@ -583,7 +618,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SitemapsResourceApi res = new api.WebmastersApi(mock).sitemaps;
       var arg_siteUrl = "foo";
       var arg_sitemapIndex = "foo";
@@ -629,7 +664,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSitemapsListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_siteUrl, sitemapIndex: arg_sitemapIndex).then(unittest.expectAsync(((api.SitemapsListResponse response) {
         checkSitemapsListResponse(response);
@@ -638,7 +673,7 @@
 
     unittest.test("method--submit", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SitemapsResourceApi res = new api.WebmastersApi(mock).sitemaps;
       var arg_siteUrl = "foo";
       var arg_feedpath = "foo";
@@ -686,7 +721,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.submit(arg_siteUrl, arg_feedpath).then(unittest.expectAsync((_) {}));
     });
@@ -697,7 +732,7 @@
   unittest.group("resource-SitesResourceApi", () {
     unittest.test("method--add", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SitesResourceApi res = new api.WebmastersApi(mock).sites;
       var arg_siteUrl = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -737,14 +772,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.add(arg_siteUrl).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SitesResourceApi res = new api.WebmastersApi(mock).sites;
       var arg_siteUrl = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -784,14 +819,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_siteUrl).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SitesResourceApi res = new api.WebmastersApi(mock).sites;
       var arg_siteUrl = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -831,7 +866,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildWmxSite());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_siteUrl).then(unittest.expectAsync(((api.WmxSite response) {
         checkWmxSite(response);
@@ -840,7 +875,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SitesResourceApi res = new api.WebmastersApi(mock).sites;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -876,7 +911,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSitesListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list().then(unittest.expectAsync(((api.SitesListResponse response) {
         checkSitesListResponse(response);
@@ -889,7 +924,7 @@
   unittest.group("resource-UrlcrawlerrorscountsResourceApi", () {
     unittest.test("method--query", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UrlcrawlerrorscountsResourceApi res = new api.WebmastersApi(mock).urlcrawlerrorscounts;
       var arg_siteUrl = "foo";
       var arg_category = "foo";
@@ -939,7 +974,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUrlCrawlErrorsCountsQueryResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.query(arg_siteUrl, category: arg_category, latestCountsOnly: arg_latestCountsOnly, platform: arg_platform).then(unittest.expectAsync(((api.UrlCrawlErrorsCountsQueryResponse response) {
         checkUrlCrawlErrorsCountsQueryResponse(response);
@@ -952,7 +987,7 @@
   unittest.group("resource-UrlcrawlerrorssamplesResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UrlcrawlerrorssamplesResourceApi res = new api.WebmastersApi(mock).urlcrawlerrorssamples;
       var arg_siteUrl = "foo";
       var arg_url = "foo";
@@ -1004,7 +1039,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUrlCrawlErrorsSample());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_siteUrl, arg_url, arg_category, arg_platform).then(unittest.expectAsync(((api.UrlCrawlErrorsSample response) {
         checkUrlCrawlErrorsSample(response);
@@ -1013,7 +1048,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UrlcrawlerrorssamplesResourceApi res = new api.WebmastersApi(mock).urlcrawlerrorssamples;
       var arg_siteUrl = "foo";
       var arg_category = "foo";
@@ -1061,7 +1096,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildUrlCrawlErrorsSamplesListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_siteUrl, arg_category, arg_platform).then(unittest.expectAsync(((api.UrlCrawlErrorsSamplesListResponse response) {
         checkUrlCrawlErrorsSamplesListResponse(response);
@@ -1070,7 +1105,7 @@
 
     unittest.test("method--markAsFixed", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.UrlcrawlerrorssamplesResourceApi res = new api.WebmastersApi(mock).urlcrawlerrorssamples;
       var arg_siteUrl = "foo";
       var arg_url = "foo";
@@ -1122,7 +1157,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.markAsFixed(arg_siteUrl, arg_url, arg_category, arg_platform).then(unittest.expectAsync((_) {}));
     });
diff --git a/generated/googleapis/test/youtube/v3_test.dart b/generated/googleapis/test/youtube/v3_test.dart
index 527c342..aed2260 100644
--- a/generated/googleapis/test/youtube/v3_test.dart
+++ b/generated/googleapis/test/youtube/v3_test.dart
@@ -8,22 +8,57 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/youtube/v3.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
 
-buildUnnamed619() {
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+buildUnnamed1410() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed619(core.List<core.String> o) {
+checkUnnamed1410(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -35,7 +70,7 @@
   buildCounterAccessPolicy++;
   if (buildCounterAccessPolicy < 3) {
     o.allowed = true;
-    o.exception = buildUnnamed619();
+    o.exception = buildUnnamed1410();
   }
   buildCounterAccessPolicy--;
   return o;
@@ -45,7 +80,7 @@
   buildCounterAccessPolicy++;
   if (buildCounterAccessPolicy < 3) {
     unittest.expect(o.allowed, unittest.isTrue);
-    checkUnnamed619(o.exception);
+    checkUnnamed1410(o.exception);
   }
   buildCounterAccessPolicy--;
 }
@@ -234,27 +269,27 @@
   buildCounterActivityContentDetailsPlaylistItem--;
 }
 
-buildUnnamed620() {
+buildUnnamed1411() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed620(core.List<core.String> o) {
+checkUnnamed1411(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed621() {
+buildUnnamed1412() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed621(core.List<core.String> o) {
+checkUnnamed1412(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -272,8 +307,8 @@
     o.customCtaButtonText = "foo";
     o.descriptionText = "foo";
     o.destinationUrl = "foo";
-    o.forecastingUrl = buildUnnamed620();
-    o.impressionUrl = buildUnnamed621();
+    o.forecastingUrl = buildUnnamed1411();
+    o.impressionUrl = buildUnnamed1412();
     o.videoId = "foo";
   }
   buildCounterActivityContentDetailsPromotedItem--;
@@ -290,8 +325,8 @@
     unittest.expect(o.customCtaButtonText, unittest.equals('foo'));
     unittest.expect(o.descriptionText, unittest.equals('foo'));
     unittest.expect(o.destinationUrl, unittest.equals('foo'));
-    checkUnnamed620(o.forecastingUrl);
-    checkUnnamed621(o.impressionUrl);
+    checkUnnamed1411(o.forecastingUrl);
+    checkUnnamed1412(o.impressionUrl);
     unittest.expect(o.videoId, unittest.equals('foo'));
   }
   buildCounterActivityContentDetailsPromotedItem--;
@@ -385,14 +420,14 @@
   buildCounterActivityContentDetailsUpload--;
 }
 
-buildUnnamed622() {
+buildUnnamed1413() {
   var o = new core.List<api.Activity>();
   o.add(buildActivity());
   o.add(buildActivity());
   return o;
 }
 
-checkUnnamed622(core.List<api.Activity> o) {
+checkUnnamed1413(core.List<api.Activity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivity(o[0]);
   checkActivity(o[1]);
@@ -405,7 +440,7 @@
   if (buildCounterActivityListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed622();
+    o.items = buildUnnamed1413();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -422,7 +457,7 @@
   if (buildCounterActivityListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed622(o.items);
+    checkUnnamed1413(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -466,6 +501,114 @@
   buildCounterActivitySnippet--;
 }
 
+core.int buildCounterCaption = 0;
+buildCaption() {
+  var o = new api.Caption();
+  buildCounterCaption++;
+  if (buildCounterCaption < 3) {
+    o.etag = "foo";
+    o.id = "foo";
+    o.kind = "foo";
+    o.snippet = buildCaptionSnippet();
+  }
+  buildCounterCaption--;
+  return o;
+}
+
+checkCaption(api.Caption o) {
+  buildCounterCaption++;
+  if (buildCounterCaption < 3) {
+    unittest.expect(o.etag, unittest.equals('foo'));
+    unittest.expect(o.id, unittest.equals('foo'));
+    unittest.expect(o.kind, unittest.equals('foo'));
+    checkCaptionSnippet(o.snippet);
+  }
+  buildCounterCaption--;
+}
+
+buildUnnamed1414() {
+  var o = new core.List<api.Caption>();
+  o.add(buildCaption());
+  o.add(buildCaption());
+  return o;
+}
+
+checkUnnamed1414(core.List<api.Caption> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkCaption(o[0]);
+  checkCaption(o[1]);
+}
+
+core.int buildCounterCaptionListResponse = 0;
+buildCaptionListResponse() {
+  var o = new api.CaptionListResponse();
+  buildCounterCaptionListResponse++;
+  if (buildCounterCaptionListResponse < 3) {
+    o.etag = "foo";
+    o.eventId = "foo";
+    o.items = buildUnnamed1414();
+    o.kind = "foo";
+    o.visitorId = "foo";
+  }
+  buildCounterCaptionListResponse--;
+  return o;
+}
+
+checkCaptionListResponse(api.CaptionListResponse o) {
+  buildCounterCaptionListResponse++;
+  if (buildCounterCaptionListResponse < 3) {
+    unittest.expect(o.etag, unittest.equals('foo'));
+    unittest.expect(o.eventId, unittest.equals('foo'));
+    checkUnnamed1414(o.items);
+    unittest.expect(o.kind, unittest.equals('foo'));
+    unittest.expect(o.visitorId, unittest.equals('foo'));
+  }
+  buildCounterCaptionListResponse--;
+}
+
+core.int buildCounterCaptionSnippet = 0;
+buildCaptionSnippet() {
+  var o = new api.CaptionSnippet();
+  buildCounterCaptionSnippet++;
+  if (buildCounterCaptionSnippet < 3) {
+    o.audioTrackType = "foo";
+    o.failureReason = "foo";
+    o.isAutoSynced = true;
+    o.isCC = true;
+    o.isDraft = true;
+    o.isEasyReader = true;
+    o.isLarge = true;
+    o.language = "foo";
+    o.lastUpdated = core.DateTime.parse("2002-02-27T14:01:02");
+    o.name = "foo";
+    o.status = "foo";
+    o.trackKind = "foo";
+    o.videoId = "foo";
+  }
+  buildCounterCaptionSnippet--;
+  return o;
+}
+
+checkCaptionSnippet(api.CaptionSnippet o) {
+  buildCounterCaptionSnippet++;
+  if (buildCounterCaptionSnippet < 3) {
+    unittest.expect(o.audioTrackType, unittest.equals('foo'));
+    unittest.expect(o.failureReason, unittest.equals('foo'));
+    unittest.expect(o.isAutoSynced, unittest.isTrue);
+    unittest.expect(o.isCC, unittest.isTrue);
+    unittest.expect(o.isDraft, unittest.isTrue);
+    unittest.expect(o.isEasyReader, unittest.isTrue);
+    unittest.expect(o.isLarge, unittest.isTrue);
+    unittest.expect(o.language, unittest.equals('foo'));
+    unittest.expect(o.lastUpdated, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
+    unittest.expect(o.name, unittest.equals('foo'));
+    unittest.expect(o.status, unittest.equals('foo'));
+    unittest.expect(o.trackKind, unittest.equals('foo'));
+    unittest.expect(o.videoId, unittest.equals('foo'));
+  }
+  buildCounterCaptionSnippet--;
+}
+
 core.int buildCounterCdnSettings = 0;
 buildCdnSettings() {
   var o = new api.CdnSettings();
@@ -489,14 +632,14 @@
   buildCounterCdnSettings--;
 }
 
-buildUnnamed623() {
+buildUnnamed1415() {
   var o = new core.Map<core.String, api.ChannelLocalization>();
   o["x"] = buildChannelLocalization();
   o["y"] = buildChannelLocalization();
   return o;
 }
 
-checkUnnamed623(core.Map<core.String, api.ChannelLocalization> o) {
+checkUnnamed1415(core.Map<core.String, api.ChannelLocalization> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChannelLocalization(o["x"]);
   checkChannelLocalization(o["y"]);
@@ -516,7 +659,7 @@
     o.id = "foo";
     o.invideoPromotion = buildInvideoPromotion();
     o.kind = "foo";
-    o.localizations = buildUnnamed623();
+    o.localizations = buildUnnamed1415();
     o.snippet = buildChannelSnippet();
     o.statistics = buildChannelStatistics();
     o.status = buildChannelStatus();
@@ -538,7 +681,7 @@
     unittest.expect(o.id, unittest.equals('foo'));
     checkInvideoPromotion(o.invideoPromotion);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed623(o.localizations);
+    checkUnnamed1415(o.localizations);
     checkChannelSnippet(o.snippet);
     checkChannelStatistics(o.statistics);
     checkChannelStatus(o.status);
@@ -595,14 +738,14 @@
   buildCounterChannelBannerResource--;
 }
 
-buildUnnamed624() {
+buildUnnamed1416() {
   var o = new core.List<api.PropertyValue>();
   o.add(buildPropertyValue());
   o.add(buildPropertyValue());
   return o;
 }
 
-checkUnnamed624(core.List<api.PropertyValue> o) {
+checkUnnamed1416(core.List<api.PropertyValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPropertyValue(o[0]);
   checkPropertyValue(o[1]);
@@ -614,7 +757,7 @@
   buildCounterChannelBrandingSettings++;
   if (buildCounterChannelBrandingSettings < 3) {
     o.channel = buildChannelSettings();
-    o.hints = buildUnnamed624();
+    o.hints = buildUnnamed1416();
     o.image = buildImageSettings();
     o.watch = buildWatchSettings();
   }
@@ -626,7 +769,7 @@
   buildCounterChannelBrandingSettings++;
   if (buildCounterChannelBrandingSettings < 3) {
     checkChannelSettings(o.channel);
-    checkUnnamed624(o.hints);
+    checkUnnamed1416(o.hints);
     checkImageSettings(o.image);
     checkWatchSettings(o.watch);
   }
@@ -723,14 +866,14 @@
   buildCounterChannelConversionPing--;
 }
 
-buildUnnamed625() {
+buildUnnamed1417() {
   var o = new core.List<api.ChannelConversionPing>();
   o.add(buildChannelConversionPing());
   o.add(buildChannelConversionPing());
   return o;
 }
 
-checkUnnamed625(core.List<api.ChannelConversionPing> o) {
+checkUnnamed1417(core.List<api.ChannelConversionPing> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChannelConversionPing(o[0]);
   checkChannelConversionPing(o[1]);
@@ -741,7 +884,7 @@
   var o = new api.ChannelConversionPings();
   buildCounterChannelConversionPings++;
   if (buildCounterChannelConversionPings < 3) {
-    o.pings = buildUnnamed625();
+    o.pings = buildUnnamed1417();
   }
   buildCounterChannelConversionPings--;
   return o;
@@ -750,19 +893,19 @@
 checkChannelConversionPings(api.ChannelConversionPings o) {
   buildCounterChannelConversionPings++;
   if (buildCounterChannelConversionPings < 3) {
-    checkUnnamed625(o.pings);
+    checkUnnamed1417(o.pings);
   }
   buildCounterChannelConversionPings--;
 }
 
-buildUnnamed626() {
+buildUnnamed1418() {
   var o = new core.List<api.Channel>();
   o.add(buildChannel());
   o.add(buildChannel());
   return o;
 }
 
-checkUnnamed626(core.List<api.Channel> o) {
+checkUnnamed1418(core.List<api.Channel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChannel(o[0]);
   checkChannel(o[1]);
@@ -775,7 +918,7 @@
   if (buildCounterChannelListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed626();
+    o.items = buildUnnamed1418();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -792,7 +935,7 @@
   if (buildCounterChannelListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed626(o.items);
+    checkUnnamed1418(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -824,14 +967,14 @@
   buildCounterChannelLocalization--;
 }
 
-buildUnnamed627() {
+buildUnnamed1419() {
   var o = new core.Map<core.String, api.ChannelSectionLocalization>();
   o["x"] = buildChannelSectionLocalization();
   o["y"] = buildChannelSectionLocalization();
   return o;
 }
 
-checkUnnamed627(core.Map<core.String, api.ChannelSectionLocalization> o) {
+checkUnnamed1419(core.Map<core.String, api.ChannelSectionLocalization> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChannelSectionLocalization(o["x"]);
   checkChannelSectionLocalization(o["y"]);
@@ -846,7 +989,7 @@
     o.etag = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.localizations = buildUnnamed627();
+    o.localizations = buildUnnamed1419();
     o.snippet = buildChannelSectionSnippet();
   }
   buildCounterChannelSection--;
@@ -860,33 +1003,33 @@
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed627(o.localizations);
+    checkUnnamed1419(o.localizations);
     checkChannelSectionSnippet(o.snippet);
   }
   buildCounterChannelSection--;
 }
 
-buildUnnamed628() {
+buildUnnamed1420() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed628(core.List<core.String> o) {
+checkUnnamed1420(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed629() {
+buildUnnamed1421() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed629(core.List<core.String> o) {
+checkUnnamed1421(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -897,8 +1040,8 @@
   var o = new api.ChannelSectionContentDetails();
   buildCounterChannelSectionContentDetails++;
   if (buildCounterChannelSectionContentDetails < 3) {
-    o.channels = buildUnnamed628();
-    o.playlists = buildUnnamed629();
+    o.channels = buildUnnamed1420();
+    o.playlists = buildUnnamed1421();
   }
   buildCounterChannelSectionContentDetails--;
   return o;
@@ -907,20 +1050,20 @@
 checkChannelSectionContentDetails(api.ChannelSectionContentDetails o) {
   buildCounterChannelSectionContentDetails++;
   if (buildCounterChannelSectionContentDetails < 3) {
-    checkUnnamed628(o.channels);
-    checkUnnamed629(o.playlists);
+    checkUnnamed1420(o.channels);
+    checkUnnamed1421(o.playlists);
   }
   buildCounterChannelSectionContentDetails--;
 }
 
-buildUnnamed630() {
+buildUnnamed1422() {
   var o = new core.List<api.ChannelSection>();
   o.add(buildChannelSection());
   o.add(buildChannelSection());
   return o;
 }
 
-checkUnnamed630(core.List<api.ChannelSection> o) {
+checkUnnamed1422(core.List<api.ChannelSection> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChannelSection(o[0]);
   checkChannelSection(o[1]);
@@ -933,7 +1076,7 @@
   if (buildCounterChannelSectionListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed630();
+    o.items = buildUnnamed1422();
     o.kind = "foo";
     o.visitorId = "foo";
   }
@@ -946,7 +1089,7 @@
   if (buildCounterChannelSectionListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed630(o.items);
+    checkUnnamed1422(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.visitorId, unittest.equals('foo'));
   }
@@ -1003,14 +1146,14 @@
   buildCounterChannelSectionSnippet--;
 }
 
-buildUnnamed631() {
+buildUnnamed1423() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed631(core.List<core.String> o) {
+checkUnnamed1423(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1025,7 +1168,7 @@
     o.defaultTab = "foo";
     o.description = "foo";
     o.featuredChannelsTitle = "foo";
-    o.featuredChannelsUrls = buildUnnamed631();
+    o.featuredChannelsUrls = buildUnnamed1423();
     o.keywords = "foo";
     o.moderateComments = true;
     o.profileColor = "foo";
@@ -1046,7 +1189,7 @@
     unittest.expect(o.defaultTab, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.featuredChannelsTitle, unittest.equals('foo'));
-    checkUnnamed631(o.featuredChannelsUrls);
+    checkUnnamed1423(o.featuredChannelsUrls);
     unittest.expect(o.keywords, unittest.equals('foo'));
     unittest.expect(o.moderateComments, unittest.isTrue);
     unittest.expect(o.profileColor, unittest.equals('foo'));
@@ -1138,14 +1281,14 @@
   buildCounterChannelStatus--;
 }
 
-buildUnnamed632() {
+buildUnnamed1424() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed632(core.List<core.String> o) {
+checkUnnamed1424(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1156,7 +1299,7 @@
   var o = new api.ChannelTopicDetails();
   buildCounterChannelTopicDetails++;
   if (buildCounterChannelTopicDetails < 3) {
-    o.topicIds = buildUnnamed632();
+    o.topicIds = buildUnnamed1424();
   }
   buildCounterChannelTopicDetails--;
   return o;
@@ -1165,19 +1308,19 @@
 checkChannelTopicDetails(api.ChannelTopicDetails o) {
   buildCounterChannelTopicDetails++;
   if (buildCounterChannelTopicDetails < 3) {
-    checkUnnamed632(o.topicIds);
+    checkUnnamed1424(o.topicIds);
   }
   buildCounterChannelTopicDetails--;
 }
 
-buildUnnamed633() {
+buildUnnamed1425() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed633(core.List<core.String> o) {
+checkUnnamed1425(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1207,7 +1350,7 @@
     o.cscfRating = "foo";
     o.czfilmRating = "foo";
     o.djctqRating = "foo";
-    o.djctqRatingReasons = buildUnnamed633();
+    o.djctqRatingReasons = buildUnnamed1425();
     o.eefilmRating = "foo";
     o.egfilmRating = "foo";
     o.eirinRating = "foo";
@@ -1279,7 +1422,7 @@
     unittest.expect(o.cscfRating, unittest.equals('foo'));
     unittest.expect(o.czfilmRating, unittest.equals('foo'));
     unittest.expect(o.djctqRating, unittest.equals('foo'));
-    checkUnnamed633(o.djctqRatingReasons);
+    checkUnnamed1425(o.djctqRatingReasons);
     unittest.expect(o.eefilmRating, unittest.equals('foo'));
     unittest.expect(o.egfilmRating, unittest.equals('foo'));
     unittest.expect(o.eirinRating, unittest.equals('foo'));
@@ -1376,14 +1519,14 @@
   buildCounterGuideCategory--;
 }
 
-buildUnnamed634() {
+buildUnnamed1426() {
   var o = new core.List<api.GuideCategory>();
   o.add(buildGuideCategory());
   o.add(buildGuideCategory());
   return o;
 }
 
-checkUnnamed634(core.List<api.GuideCategory> o) {
+checkUnnamed1426(core.List<api.GuideCategory> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGuideCategory(o[0]);
   checkGuideCategory(o[1]);
@@ -1396,7 +1539,7 @@
   if (buildCounterGuideCategoryListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed634();
+    o.items = buildUnnamed1426();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -1413,7 +1556,7 @@
   if (buildCounterGuideCategoryListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed634(o.items);
+    checkUnnamed1426(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -1470,14 +1613,14 @@
   buildCounterI18nLanguage--;
 }
 
-buildUnnamed635() {
+buildUnnamed1427() {
   var o = new core.List<api.I18nLanguage>();
   o.add(buildI18nLanguage());
   o.add(buildI18nLanguage());
   return o;
 }
 
-checkUnnamed635(core.List<api.I18nLanguage> o) {
+checkUnnamed1427(core.List<api.I18nLanguage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkI18nLanguage(o[0]);
   checkI18nLanguage(o[1]);
@@ -1490,7 +1633,7 @@
   if (buildCounterI18nLanguageListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed635();
+    o.items = buildUnnamed1427();
     o.kind = "foo";
     o.visitorId = "foo";
   }
@@ -1503,7 +1646,7 @@
   if (buildCounterI18nLanguageListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed635(o.items);
+    checkUnnamed1427(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.visitorId, unittest.equals('foo'));
   }
@@ -1556,14 +1699,14 @@
   buildCounterI18nRegion--;
 }
 
-buildUnnamed636() {
+buildUnnamed1428() {
   var o = new core.List<api.I18nRegion>();
   o.add(buildI18nRegion());
   o.add(buildI18nRegion());
   return o;
 }
 
-checkUnnamed636(core.List<api.I18nRegion> o) {
+checkUnnamed1428(core.List<api.I18nRegion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkI18nRegion(o[0]);
   checkI18nRegion(o[1]);
@@ -1576,7 +1719,7 @@
   if (buildCounterI18nRegionListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed636();
+    o.items = buildUnnamed1428();
     o.kind = "foo";
     o.visitorId = "foo";
   }
@@ -1589,7 +1732,7 @@
   if (buildCounterI18nRegionListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed636(o.items);
+    checkUnnamed1428(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.visitorId, unittest.equals('foo'));
   }
@@ -1749,14 +1892,14 @@
   buildCounterInvideoPosition--;
 }
 
-buildUnnamed637() {
+buildUnnamed1429() {
   var o = new core.List<api.PromotedItem>();
   o.add(buildPromotedItem());
   o.add(buildPromotedItem());
   return o;
 }
 
-checkUnnamed637(core.List<api.PromotedItem> o) {
+checkUnnamed1429(core.List<api.PromotedItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPromotedItem(o[0]);
   checkPromotedItem(o[1]);
@@ -1768,7 +1911,7 @@
   buildCounterInvideoPromotion++;
   if (buildCounterInvideoPromotion < 3) {
     o.defaultTiming = buildInvideoTiming();
-    o.items = buildUnnamed637();
+    o.items = buildUnnamed1429();
     o.position = buildInvideoPosition();
     o.useSmartTiming = true;
   }
@@ -1780,7 +1923,7 @@
   buildCounterInvideoPromotion++;
   if (buildCounterInvideoPromotion < 3) {
     checkInvideoTiming(o.defaultTiming);
-    checkUnnamed637(o.items);
+    checkUnnamed1429(o.items);
     checkInvideoPosition(o.position);
     unittest.expect(o.useSmartTiming, unittest.isTrue);
   }
@@ -1891,14 +2034,14 @@
   buildCounterLiveBroadcastContentDetails--;
 }
 
-buildUnnamed638() {
+buildUnnamed1430() {
   var o = new core.List<api.LiveBroadcast>();
   o.add(buildLiveBroadcast());
   o.add(buildLiveBroadcast());
   return o;
 }
 
-checkUnnamed638(core.List<api.LiveBroadcast> o) {
+checkUnnamed1430(core.List<api.LiveBroadcast> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLiveBroadcast(o[0]);
   checkLiveBroadcast(o[1]);
@@ -1911,7 +2054,7 @@
   if (buildCounterLiveBroadcastListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed638();
+    o.items = buildUnnamed1430();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -1928,7 +2071,7 @@
   if (buildCounterLiveBroadcastListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed638(o.items);
+    checkUnnamed1430(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -2051,14 +2194,14 @@
   buildCounterLiveStreamContentDetails--;
 }
 
-buildUnnamed639() {
+buildUnnamed1431() {
   var o = new core.List<api.LiveStream>();
   o.add(buildLiveStream());
   o.add(buildLiveStream());
   return o;
 }
 
-checkUnnamed639(core.List<api.LiveStream> o) {
+checkUnnamed1431(core.List<api.LiveStream> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLiveStream(o[0]);
   checkLiveStream(o[1]);
@@ -2071,7 +2214,7 @@
   if (buildCounterLiveStreamListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed639();
+    o.items = buildUnnamed1431();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -2088,7 +2231,7 @@
   if (buildCounterLiveStreamListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed639(o.items);
+    checkUnnamed1431(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -2143,14 +2286,14 @@
   buildCounterLiveStreamStatus--;
 }
 
-buildUnnamed640() {
+buildUnnamed1432() {
   var o = new core.List<api.LocalizedString>();
   o.add(buildLocalizedString());
   o.add(buildLocalizedString());
   return o;
 }
 
-checkUnnamed640(core.List<api.LocalizedString> o) {
+checkUnnamed1432(core.List<api.LocalizedString> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLocalizedString(o[0]);
   checkLocalizedString(o[1]);
@@ -2163,7 +2306,7 @@
   if (buildCounterLocalizedProperty < 3) {
     o.default_ = "foo";
     o.defaultLanguage = buildLanguageTag();
-    o.localized = buildUnnamed640();
+    o.localized = buildUnnamed1432();
   }
   buildCounterLocalizedProperty--;
   return o;
@@ -2174,7 +2317,7 @@
   if (buildCounterLocalizedProperty < 3) {
     unittest.expect(o.default_, unittest.equals('foo'));
     checkLanguageTag(o.defaultLanguage);
-    checkUnnamed640(o.localized);
+    checkUnnamed1432(o.localized);
   }
   buildCounterLocalizedProperty--;
 }
@@ -2244,14 +2387,14 @@
   buildCounterPageInfo--;
 }
 
-buildUnnamed641() {
+buildUnnamed1433() {
   var o = new core.Map<core.String, api.PlaylistLocalization>();
   o["x"] = buildPlaylistLocalization();
   o["y"] = buildPlaylistLocalization();
   return o;
 }
 
-checkUnnamed641(core.Map<core.String, api.PlaylistLocalization> o) {
+checkUnnamed1433(core.Map<core.String, api.PlaylistLocalization> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlaylistLocalization(o["x"]);
   checkPlaylistLocalization(o["y"]);
@@ -2266,7 +2409,7 @@
     o.etag = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.localizations = buildUnnamed641();
+    o.localizations = buildUnnamed1433();
     o.player = buildPlaylistPlayer();
     o.snippet = buildPlaylistSnippet();
     o.status = buildPlaylistStatus();
@@ -2282,7 +2425,7 @@
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed641(o.localizations);
+    checkUnnamed1433(o.localizations);
     checkPlaylistPlayer(o.player);
     checkPlaylistSnippet(o.snippet);
     checkPlaylistStatus(o.status);
@@ -2363,14 +2506,14 @@
   buildCounterPlaylistItemContentDetails--;
 }
 
-buildUnnamed642() {
+buildUnnamed1434() {
   var o = new core.List<api.PlaylistItem>();
   o.add(buildPlaylistItem());
   o.add(buildPlaylistItem());
   return o;
 }
 
-checkUnnamed642(core.List<api.PlaylistItem> o) {
+checkUnnamed1434(core.List<api.PlaylistItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlaylistItem(o[0]);
   checkPlaylistItem(o[1]);
@@ -2383,7 +2526,7 @@
   if (buildCounterPlaylistItemListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed642();
+    o.items = buildUnnamed1434();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -2400,7 +2543,7 @@
   if (buildCounterPlaylistItemListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed642(o.items);
+    checkUnnamed1434(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -2465,14 +2608,14 @@
   buildCounterPlaylistItemStatus--;
 }
 
-buildUnnamed643() {
+buildUnnamed1435() {
   var o = new core.List<api.Playlist>();
   o.add(buildPlaylist());
   o.add(buildPlaylist());
   return o;
 }
 
-checkUnnamed643(core.List<api.Playlist> o) {
+checkUnnamed1435(core.List<api.Playlist> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlaylist(o[0]);
   checkPlaylist(o[1]);
@@ -2485,7 +2628,7 @@
   if (buildCounterPlaylistListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed643();
+    o.items = buildUnnamed1435();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -2502,7 +2645,7 @@
   if (buildCounterPlaylistListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed643(o.items);
+    checkUnnamed1435(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -2553,14 +2696,14 @@
   buildCounterPlaylistPlayer--;
 }
 
-buildUnnamed644() {
+buildUnnamed1436() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed644(core.List<core.String> o) {
+checkUnnamed1436(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2577,7 +2720,7 @@
     o.description = "foo";
     o.localized = buildPlaylistLocalization();
     o.publishedAt = core.DateTime.parse("2002-02-27T14:01:02");
-    o.tags = buildUnnamed644();
+    o.tags = buildUnnamed1436();
     o.thumbnails = buildThumbnailDetails();
     o.title = "foo";
   }
@@ -2594,7 +2737,7 @@
     unittest.expect(o.description, unittest.equals('foo'));
     checkPlaylistLocalization(o.localized);
     unittest.expect(o.publishedAt, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
-    checkUnnamed644(o.tags);
+    checkUnnamed1436(o.tags);
     checkThumbnailDetails(o.thumbnails);
     unittest.expect(o.title, unittest.equals('foo'));
   }
@@ -2716,14 +2859,14 @@
   buildCounterResourceId--;
 }
 
-buildUnnamed645() {
+buildUnnamed1437() {
   var o = new core.List<api.SearchResult>();
   o.add(buildSearchResult());
   o.add(buildSearchResult());
   return o;
 }
 
-checkUnnamed645(core.List<api.SearchResult> o) {
+checkUnnamed1437(core.List<api.SearchResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSearchResult(o[0]);
   checkSearchResult(o[1]);
@@ -2736,7 +2879,7 @@
   if (buildCounterSearchListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed645();
+    o.items = buildUnnamed1437();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -2753,7 +2896,7 @@
   if (buildCounterSearchListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed645(o.items);
+    checkUnnamed1437(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -2872,14 +3015,14 @@
   buildCounterSubscriptionContentDetails--;
 }
 
-buildUnnamed646() {
+buildUnnamed1438() {
   var o = new core.List<api.Subscription>();
   o.add(buildSubscription());
   o.add(buildSubscription());
   return o;
 }
 
-checkUnnamed646(core.List<api.Subscription> o) {
+checkUnnamed1438(core.List<api.Subscription> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSubscription(o[0]);
   checkSubscription(o[1]);
@@ -2892,7 +3035,7 @@
   if (buildCounterSubscriptionListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed646();
+    o.items = buildUnnamed1438();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -2909,7 +3052,7 @@
   if (buildCounterSubscriptionListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed646(o.items);
+    checkUnnamed1438(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -3026,14 +3169,14 @@
   buildCounterThumbnailDetails--;
 }
 
-buildUnnamed647() {
+buildUnnamed1439() {
   var o = new core.List<api.ThumbnailDetails>();
   o.add(buildThumbnailDetails());
   o.add(buildThumbnailDetails());
   return o;
 }
 
-checkUnnamed647(core.List<api.ThumbnailDetails> o) {
+checkUnnamed1439(core.List<api.ThumbnailDetails> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkThumbnailDetails(o[0]);
   checkThumbnailDetails(o[1]);
@@ -3046,7 +3189,7 @@
   if (buildCounterThumbnailSetResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed647();
+    o.items = buildUnnamed1439();
     o.kind = "foo";
     o.visitorId = "foo";
   }
@@ -3059,7 +3202,7 @@
   if (buildCounterThumbnailSetResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed647(o.items);
+    checkUnnamed1439(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.visitorId, unittest.equals('foo'));
   }
@@ -3083,14 +3226,14 @@
   buildCounterTokenPagination--;
 }
 
-buildUnnamed648() {
+buildUnnamed1440() {
   var o = new core.Map<core.String, api.VideoLocalization>();
   o["x"] = buildVideoLocalization();
   o["y"] = buildVideoLocalization();
   return o;
 }
 
-checkUnnamed648(core.Map<core.String, api.VideoLocalization> o) {
+checkUnnamed1440(core.Map<core.String, api.VideoLocalization> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVideoLocalization(o["x"]);
   checkVideoLocalization(o["y"]);
@@ -3109,7 +3252,7 @@
     o.id = "foo";
     o.kind = "foo";
     o.liveStreamingDetails = buildVideoLiveStreamingDetails();
-    o.localizations = buildUnnamed648();
+    o.localizations = buildUnnamed1440();
     o.monetizationDetails = buildVideoMonetizationDetails();
     o.player = buildVideoPlayer();
     o.processingDetails = buildVideoProcessingDetails();
@@ -3136,7 +3279,7 @@
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     checkVideoLiveStreamingDetails(o.liveStreamingDetails);
-    checkUnnamed648(o.localizations);
+    checkUnnamed1440(o.localizations);
     checkVideoMonetizationDetails(o.monetizationDetails);
     checkVideoPlayer(o.player);
     checkVideoProcessingDetails(o.processingDetails);
@@ -3199,14 +3342,14 @@
   buildCounterVideoCategory--;
 }
 
-buildUnnamed649() {
+buildUnnamed1441() {
   var o = new core.List<api.VideoCategory>();
   o.add(buildVideoCategory());
   o.add(buildVideoCategory());
   return o;
 }
 
-checkUnnamed649(core.List<api.VideoCategory> o) {
+checkUnnamed1441(core.List<api.VideoCategory> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVideoCategory(o[0]);
   checkVideoCategory(o[1]);
@@ -3219,7 +3362,7 @@
   if (buildCounterVideoCategoryListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed649();
+    o.items = buildUnnamed1441();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -3236,7 +3379,7 @@
   if (buildCounterVideoCategoryListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed649(o.items);
+    checkUnnamed1441(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -3303,27 +3446,27 @@
   buildCounterVideoContentDetails--;
 }
 
-buildUnnamed650() {
+buildUnnamed1442() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed650(core.List<core.String> o) {
+checkUnnamed1442(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed651() {
+buildUnnamed1443() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed651(core.List<core.String> o) {
+checkUnnamed1443(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3334,8 +3477,8 @@
   var o = new api.VideoContentDetailsRegionRestriction();
   buildCounterVideoContentDetailsRegionRestriction++;
   if (buildCounterVideoContentDetailsRegionRestriction < 3) {
-    o.allowed = buildUnnamed650();
-    o.blocked = buildUnnamed651();
+    o.allowed = buildUnnamed1442();
+    o.blocked = buildUnnamed1443();
   }
   buildCounterVideoContentDetailsRegionRestriction--;
   return o;
@@ -3344,8 +3487,8 @@
 checkVideoContentDetailsRegionRestriction(api.VideoContentDetailsRegionRestriction o) {
   buildCounterVideoContentDetailsRegionRestriction++;
   if (buildCounterVideoContentDetailsRegionRestriction < 3) {
-    checkUnnamed650(o.allowed);
-    checkUnnamed651(o.blocked);
+    checkUnnamed1442(o.allowed);
+    checkUnnamed1443(o.blocked);
   }
   buildCounterVideoContentDetailsRegionRestriction--;
 }
@@ -3371,14 +3514,14 @@
   buildCounterVideoConversionPing--;
 }
 
-buildUnnamed652() {
+buildUnnamed1444() {
   var o = new core.List<api.VideoConversionPing>();
   o.add(buildVideoConversionPing());
   o.add(buildVideoConversionPing());
   return o;
 }
 
-checkUnnamed652(core.List<api.VideoConversionPing> o) {
+checkUnnamed1444(core.List<api.VideoConversionPing> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVideoConversionPing(o[0]);
   checkVideoConversionPing(o[1]);
@@ -3389,7 +3532,7 @@
   var o = new api.VideoConversionPings();
   buildCounterVideoConversionPings++;
   if (buildCounterVideoConversionPings < 3) {
-    o.pings = buildUnnamed652();
+    o.pings = buildUnnamed1444();
   }
   buildCounterVideoConversionPings--;
   return o;
@@ -3398,32 +3541,32 @@
 checkVideoConversionPings(api.VideoConversionPings o) {
   buildCounterVideoConversionPings++;
   if (buildCounterVideoConversionPings < 3) {
-    checkUnnamed652(o.pings);
+    checkUnnamed1444(o.pings);
   }
   buildCounterVideoConversionPings--;
 }
 
-buildUnnamed653() {
+buildUnnamed1445() {
   var o = new core.List<api.VideoFileDetailsAudioStream>();
   o.add(buildVideoFileDetailsAudioStream());
   o.add(buildVideoFileDetailsAudioStream());
   return o;
 }
 
-checkUnnamed653(core.List<api.VideoFileDetailsAudioStream> o) {
+checkUnnamed1445(core.List<api.VideoFileDetailsAudioStream> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVideoFileDetailsAudioStream(o[0]);
   checkVideoFileDetailsAudioStream(o[1]);
 }
 
-buildUnnamed654() {
+buildUnnamed1446() {
   var o = new core.List<api.VideoFileDetailsVideoStream>();
   o.add(buildVideoFileDetailsVideoStream());
   o.add(buildVideoFileDetailsVideoStream());
   return o;
 }
 
-checkUnnamed654(core.List<api.VideoFileDetailsVideoStream> o) {
+checkUnnamed1446(core.List<api.VideoFileDetailsVideoStream> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVideoFileDetailsVideoStream(o[0]);
   checkVideoFileDetailsVideoStream(o[1]);
@@ -3434,7 +3577,7 @@
   var o = new api.VideoFileDetails();
   buildCounterVideoFileDetails++;
   if (buildCounterVideoFileDetails < 3) {
-    o.audioStreams = buildUnnamed653();
+    o.audioStreams = buildUnnamed1445();
     o.bitrateBps = "foo";
     o.container = "foo";
     o.creationTime = "foo";
@@ -3443,7 +3586,7 @@
     o.fileSize = "foo";
     o.fileType = "foo";
     o.recordingLocation = buildGeoPoint();
-    o.videoStreams = buildUnnamed654();
+    o.videoStreams = buildUnnamed1446();
   }
   buildCounterVideoFileDetails--;
   return o;
@@ -3452,7 +3595,7 @@
 checkVideoFileDetails(api.VideoFileDetails o) {
   buildCounterVideoFileDetails++;
   if (buildCounterVideoFileDetails < 3) {
-    checkUnnamed653(o.audioStreams);
+    checkUnnamed1445(o.audioStreams);
     unittest.expect(o.bitrateBps, unittest.equals('foo'));
     unittest.expect(o.container, unittest.equals('foo'));
     unittest.expect(o.creationTime, unittest.equals('foo'));
@@ -3461,7 +3604,7 @@
     unittest.expect(o.fileSize, unittest.equals('foo'));
     unittest.expect(o.fileType, unittest.equals('foo'));
     checkGeoPoint(o.recordingLocation);
-    checkUnnamed654(o.videoStreams);
+    checkUnnamed1446(o.videoStreams);
   }
   buildCounterVideoFileDetails--;
 }
@@ -3524,14 +3667,14 @@
   buildCounterVideoFileDetailsVideoStream--;
 }
 
-buildUnnamed655() {
+buildUnnamed1447() {
   var o = new core.List<api.VideoRating>();
   o.add(buildVideoRating());
   o.add(buildVideoRating());
   return o;
 }
 
-checkUnnamed655(core.List<api.VideoRating> o) {
+checkUnnamed1447(core.List<api.VideoRating> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVideoRating(o[0]);
   checkVideoRating(o[1]);
@@ -3544,7 +3687,7 @@
   if (buildCounterVideoGetRatingResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed655();
+    o.items = buildUnnamed1447();
     o.kind = "foo";
     o.visitorId = "foo";
   }
@@ -3557,21 +3700,21 @@
   if (buildCounterVideoGetRatingResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed655(o.items);
+    checkUnnamed1447(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.visitorId, unittest.equals('foo'));
   }
   buildCounterVideoGetRatingResponse--;
 }
 
-buildUnnamed656() {
+buildUnnamed1448() {
   var o = new core.List<api.Video>();
   o.add(buildVideo());
   o.add(buildVideo());
   return o;
 }
 
-checkUnnamed656(core.List<api.Video> o) {
+checkUnnamed1448(core.List<api.Video> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVideo(o[0]);
   checkVideo(o[1]);
@@ -3584,7 +3727,7 @@
   if (buildCounterVideoListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed656();
+    o.items = buildUnnamed1448();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -3601,7 +3744,7 @@
   if (buildCounterVideoListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed656(o.items);
+    checkUnnamed1448(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -3754,14 +3897,14 @@
   buildCounterVideoProcessingDetailsProcessingProgress--;
 }
 
-buildUnnamed657() {
+buildUnnamed1449() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed657(core.List<core.String> o) {
+checkUnnamed1449(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3772,7 +3915,7 @@
   var o = new api.VideoProjectDetails();
   buildCounterVideoProjectDetails++;
   if (buildCounterVideoProjectDetails < 3) {
-    o.tags = buildUnnamed657();
+    o.tags = buildUnnamed1449();
   }
   buildCounterVideoProjectDetails--;
   return o;
@@ -3781,7 +3924,7 @@
 checkVideoProjectDetails(api.VideoProjectDetails o) {
   buildCounterVideoProjectDetails++;
   if (buildCounterVideoProjectDetails < 3) {
-    checkUnnamed657(o.tags);
+    checkUnnamed1449(o.tags);
   }
   buildCounterVideoProjectDetails--;
 }
@@ -3830,14 +3973,14 @@
   buildCounterVideoRecordingDetails--;
 }
 
-buildUnnamed658() {
+buildUnnamed1450() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed658(core.List<core.String> o) {
+checkUnnamed1450(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3856,7 +3999,7 @@
     o.liveBroadcastContent = "foo";
     o.localized = buildVideoLocalization();
     o.publishedAt = core.DateTime.parse("2002-02-27T14:01:02");
-    o.tags = buildUnnamed658();
+    o.tags = buildUnnamed1450();
     o.thumbnails = buildThumbnailDetails();
     o.title = "foo";
   }
@@ -3875,7 +4018,7 @@
     unittest.expect(o.liveBroadcastContent, unittest.equals('foo'));
     checkVideoLocalization(o.localized);
     unittest.expect(o.publishedAt, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
-    checkUnnamed658(o.tags);
+    checkUnnamed1450(o.tags);
     checkThumbnailDetails(o.thumbnails);
     unittest.expect(o.title, unittest.equals('foo'));
   }
@@ -3942,66 +4085,66 @@
   buildCounterVideoStatus--;
 }
 
-buildUnnamed659() {
+buildUnnamed1451() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed659(core.List<core.String> o) {
+checkUnnamed1451(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed660() {
+buildUnnamed1452() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed660(core.List<core.String> o) {
+checkUnnamed1452(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed661() {
+buildUnnamed1453() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed661(core.List<core.String> o) {
+checkUnnamed1453(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed662() {
+buildUnnamed1454() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed662(core.List<core.String> o) {
+checkUnnamed1454(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed663() {
+buildUnnamed1455() {
   var o = new core.List<api.VideoSuggestionsTagSuggestion>();
   o.add(buildVideoSuggestionsTagSuggestion());
   o.add(buildVideoSuggestionsTagSuggestion());
   return o;
 }
 
-checkUnnamed663(core.List<api.VideoSuggestionsTagSuggestion> o) {
+checkUnnamed1455(core.List<api.VideoSuggestionsTagSuggestion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVideoSuggestionsTagSuggestion(o[0]);
   checkVideoSuggestionsTagSuggestion(o[1]);
@@ -4012,11 +4155,11 @@
   var o = new api.VideoSuggestions();
   buildCounterVideoSuggestions++;
   if (buildCounterVideoSuggestions < 3) {
-    o.editorSuggestions = buildUnnamed659();
-    o.processingErrors = buildUnnamed660();
-    o.processingHints = buildUnnamed661();
-    o.processingWarnings = buildUnnamed662();
-    o.tagSuggestions = buildUnnamed663();
+    o.editorSuggestions = buildUnnamed1451();
+    o.processingErrors = buildUnnamed1452();
+    o.processingHints = buildUnnamed1453();
+    o.processingWarnings = buildUnnamed1454();
+    o.tagSuggestions = buildUnnamed1455();
   }
   buildCounterVideoSuggestions--;
   return o;
@@ -4025,23 +4168,23 @@
 checkVideoSuggestions(api.VideoSuggestions o) {
   buildCounterVideoSuggestions++;
   if (buildCounterVideoSuggestions < 3) {
-    checkUnnamed659(o.editorSuggestions);
-    checkUnnamed660(o.processingErrors);
-    checkUnnamed661(o.processingHints);
-    checkUnnamed662(o.processingWarnings);
-    checkUnnamed663(o.tagSuggestions);
+    checkUnnamed1451(o.editorSuggestions);
+    checkUnnamed1452(o.processingErrors);
+    checkUnnamed1453(o.processingHints);
+    checkUnnamed1454(o.processingWarnings);
+    checkUnnamed1455(o.tagSuggestions);
   }
   buildCounterVideoSuggestions--;
 }
 
-buildUnnamed664() {
+buildUnnamed1456() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed664(core.List<core.String> o) {
+checkUnnamed1456(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -4052,7 +4195,7 @@
   var o = new api.VideoSuggestionsTagSuggestion();
   buildCounterVideoSuggestionsTagSuggestion++;
   if (buildCounterVideoSuggestionsTagSuggestion < 3) {
-    o.categoryRestricts = buildUnnamed664();
+    o.categoryRestricts = buildUnnamed1456();
     o.tag = "foo";
   }
   buildCounterVideoSuggestionsTagSuggestion--;
@@ -4062,33 +4205,33 @@
 checkVideoSuggestionsTagSuggestion(api.VideoSuggestionsTagSuggestion o) {
   buildCounterVideoSuggestionsTagSuggestion++;
   if (buildCounterVideoSuggestionsTagSuggestion < 3) {
-    checkUnnamed664(o.categoryRestricts);
+    checkUnnamed1456(o.categoryRestricts);
     unittest.expect(o.tag, unittest.equals('foo'));
   }
   buildCounterVideoSuggestionsTagSuggestion--;
 }
 
-buildUnnamed665() {
+buildUnnamed1457() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed665(core.List<core.String> o) {
+checkUnnamed1457(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed666() {
+buildUnnamed1458() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed666(core.List<core.String> o) {
+checkUnnamed1458(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -4099,8 +4242,8 @@
   var o = new api.VideoTopicDetails();
   buildCounterVideoTopicDetails++;
   if (buildCounterVideoTopicDetails < 3) {
-    o.relevantTopicIds = buildUnnamed665();
-    o.topicIds = buildUnnamed666();
+    o.relevantTopicIds = buildUnnamed1457();
+    o.topicIds = buildUnnamed1458();
   }
   buildCounterVideoTopicDetails--;
   return o;
@@ -4109,8 +4252,8 @@
 checkVideoTopicDetails(api.VideoTopicDetails o) {
   buildCounterVideoTopicDetails++;
   if (buildCounterVideoTopicDetails < 3) {
-    checkUnnamed665(o.relevantTopicIds);
-    checkUnnamed666(o.topicIds);
+    checkUnnamed1457(o.relevantTopicIds);
+    checkUnnamed1458(o.topicIds);
   }
   buildCounterVideoTopicDetails--;
 }
@@ -4284,6 +4427,33 @@
   });
 
 
+  unittest.group("obj-schema-Caption", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildCaption();
+      var od = new api.Caption.fromJson(o.toJson());
+      checkCaption(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-CaptionListResponse", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildCaptionListResponse();
+      var od = new api.CaptionListResponse.fromJson(o.toJson());
+      checkCaptionListResponse(od);
+    });
+  });
+
+
+  unittest.group("obj-schema-CaptionSnippet", () {
+    unittest.test("to-json--from-json", () {
+      var o = buildCaptionSnippet();
+      var od = new api.CaptionSnippet.fromJson(o.toJson());
+      checkCaptionSnippet(od);
+    });
+  });
+
+
   unittest.group("obj-schema-CdnSettings", () {
     unittest.test("to-json--from-json", () {
       var o = buildCdnSettings();
@@ -5295,7 +5465,7 @@
   unittest.group("resource-ActivitiesResourceApi", () {
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ActivitiesResourceApi res = new api.YoutubeApi(mock).activities;
       var arg_request = buildActivity();
       var arg_part = "foo";
@@ -5337,7 +5507,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildActivity());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_part).then(unittest.expectAsync(((api.Activity response) {
         checkActivity(response);
@@ -5346,7 +5516,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ActivitiesResourceApi res = new api.YoutubeApi(mock).activities;
       var arg_part = "foo";
       var arg_channelId = "foo";
@@ -5400,7 +5570,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildActivityListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_part, channelId: arg_channelId, home: arg_home, maxResults: arg_maxResults, mine: arg_mine, pageToken: arg_pageToken, publishedAfter: arg_publishedAfter, publishedBefore: arg_publishedBefore, regionCode: arg_regionCode).then(unittest.expectAsync(((api.ActivityListResponse response) {
         checkActivityListResponse(response);
@@ -5410,12 +5580,295 @@
   });
 
 
+  unittest.group("resource-CaptionsResourceApi", () {
+    unittest.test("method--delete", () {
+
+      var mock = new HttpServerMock();
+      api.CaptionsResourceApi res = new api.YoutubeApi(mock).captions;
+      var arg_id = "foo";
+      var arg_debugProjectIdOverride = "foo";
+      var arg_onBehalfOf = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 11), unittest.equals("youtube/v3/"));
+        pathOffset += 11;
+        unittest.expect(path.substring(pathOffset, pathOffset + 8), unittest.equals("captions"));
+        pathOffset += 8;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+        unittest.expect(queryMap["id"].first, unittest.equals(arg_id));
+        unittest.expect(queryMap["debugProjectIdOverride"].first, unittest.equals(arg_debugProjectIdOverride));
+        unittest.expect(queryMap["onBehalfOf"].first, unittest.equals(arg_onBehalfOf));
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = "";
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.delete(arg_id, debugProjectIdOverride: arg_debugProjectIdOverride, onBehalfOf: arg_onBehalfOf).then(unittest.expectAsync((_) {}));
+    });
+
+    unittest.test("method--download", () {
+      // TODO: Implement tests for media upload;
+      // TODO: Implement tests for media download;
+
+      var mock = new HttpServerMock();
+      api.CaptionsResourceApi res = new api.YoutubeApi(mock).captions;
+      var arg_id = "foo";
+      var arg_debugProjectIdOverride = "foo";
+      var arg_onBehalfOf = "foo";
+      var arg_tfmt = "foo";
+      var arg_tlang = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 11), unittest.equals("youtube/v3/"));
+        pathOffset += 11;
+        unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("captions/"));
+        pathOffset += 9;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_id"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+        unittest.expect(queryMap["debugProjectIdOverride"].first, unittest.equals(arg_debugProjectIdOverride));
+        unittest.expect(queryMap["onBehalfOf"].first, unittest.equals(arg_onBehalfOf));
+        unittest.expect(queryMap["tfmt"].first, unittest.equals(arg_tfmt));
+        unittest.expect(queryMap["tlang"].first, unittest.equals(arg_tlang));
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = "";
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.download(arg_id, debugProjectIdOverride: arg_debugProjectIdOverride, onBehalfOf: arg_onBehalfOf, tfmt: arg_tfmt, tlang: arg_tlang).then(unittest.expectAsync((_) {}));
+    });
+
+    unittest.test("method--insert", () {
+      // TODO: Implement tests for media upload;
+      // TODO: Implement tests for media download;
+
+      var mock = new HttpServerMock();
+      api.CaptionsResourceApi res = new api.YoutubeApi(mock).captions;
+      var arg_request = buildCaption();
+      var arg_part = "foo";
+      var arg_debugProjectIdOverride = "foo";
+      var arg_onBehalfOf = "foo";
+      var arg_sync = true;
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var obj = new api.Caption.fromJson(json);
+        checkCaption(obj);
+
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 11), unittest.equals("youtube/v3/"));
+        pathOffset += 11;
+        unittest.expect(path.substring(pathOffset, pathOffset + 8), unittest.equals("captions"));
+        pathOffset += 8;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+        unittest.expect(queryMap["part"].first, unittest.equals(arg_part));
+        unittest.expect(queryMap["debugProjectIdOverride"].first, unittest.equals(arg_debugProjectIdOverride));
+        unittest.expect(queryMap["onBehalfOf"].first, unittest.equals(arg_onBehalfOf));
+        unittest.expect(queryMap["sync"].first, unittest.equals("$arg_sync"));
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildCaption());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.insert(arg_request, arg_part, debugProjectIdOverride: arg_debugProjectIdOverride, onBehalfOf: arg_onBehalfOf, sync: arg_sync).then(unittest.expectAsync(((api.Caption response) {
+        checkCaption(response);
+      })));
+    });
+
+    unittest.test("method--list", () {
+
+      var mock = new HttpServerMock();
+      api.CaptionsResourceApi res = new api.YoutubeApi(mock).captions;
+      var arg_part = "foo";
+      var arg_videoId = "foo";
+      var arg_debugProjectIdOverride = "foo";
+      var arg_id = "foo";
+      var arg_onBehalfOf = "foo";
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 11), unittest.equals("youtube/v3/"));
+        pathOffset += 11;
+        unittest.expect(path.substring(pathOffset, pathOffset + 8), unittest.equals("captions"));
+        pathOffset += 8;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+        unittest.expect(queryMap["part"].first, unittest.equals(arg_part));
+        unittest.expect(queryMap["videoId"].first, unittest.equals(arg_videoId));
+        unittest.expect(queryMap["debugProjectIdOverride"].first, unittest.equals(arg_debugProjectIdOverride));
+        unittest.expect(queryMap["id"].first, unittest.equals(arg_id));
+        unittest.expect(queryMap["onBehalfOf"].first, unittest.equals(arg_onBehalfOf));
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildCaptionListResponse());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.list(arg_part, arg_videoId, debugProjectIdOverride: arg_debugProjectIdOverride, id: arg_id, onBehalfOf: arg_onBehalfOf).then(unittest.expectAsync(((api.CaptionListResponse response) {
+        checkCaptionListResponse(response);
+      })));
+    });
+
+    unittest.test("method--update", () {
+      // TODO: Implement tests for media upload;
+      // TODO: Implement tests for media download;
+
+      var mock = new HttpServerMock();
+      api.CaptionsResourceApi res = new api.YoutubeApi(mock).captions;
+      var arg_request = buildCaption();
+      var arg_part = "foo";
+      var arg_debugProjectIdOverride = "foo";
+      var arg_onBehalfOf = "foo";
+      var arg_sync = true;
+      mock.register(unittest.expectAsync((http.BaseRequest req, json) {
+        var obj = new api.Caption.fromJson(json);
+        checkCaption(obj);
+
+        var path = (req.url).path;
+        var pathOffset = 0;
+        var index;
+        var subPart;
+        unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
+        pathOffset += 1;
+        unittest.expect(path.substring(pathOffset, pathOffset + 11), unittest.equals("youtube/v3/"));
+        pathOffset += 11;
+        unittest.expect(path.substring(pathOffset, pathOffset + 8), unittest.equals("captions"));
+        pathOffset += 8;
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+        unittest.expect(queryMap["part"].first, unittest.equals(arg_part));
+        unittest.expect(queryMap["debugProjectIdOverride"].first, unittest.equals(arg_debugProjectIdOverride));
+        unittest.expect(queryMap["onBehalfOf"].first, unittest.equals(arg_onBehalfOf));
+        unittest.expect(queryMap["sync"].first, unittest.equals("$arg_sync"));
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildCaption());
+        return new async.Future.value(stringResponse(200, h, resp));
+      }), true);
+      res.update(arg_request, arg_part, debugProjectIdOverride: arg_debugProjectIdOverride, onBehalfOf: arg_onBehalfOf, sync: arg_sync).then(unittest.expectAsync(((api.Caption response) {
+        checkCaption(response);
+      })));
+    });
+
+  });
+
+
   unittest.group("resource-ChannelBannersResourceApi", () {
     unittest.test("method--insert", () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ChannelBannersResourceApi res = new api.YoutubeApi(mock).channelBanners;
       var arg_request = buildChannelBannerResource();
       var arg_onBehalfOfContentOwner = "foo";
@@ -5457,7 +5910,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChannelBannerResource());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, onBehalfOfContentOwner: arg_onBehalfOfContentOwner).then(unittest.expectAsync(((api.ChannelBannerResource response) {
         checkChannelBannerResource(response);
@@ -5470,7 +5923,7 @@
   unittest.group("resource-ChannelSectionsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ChannelSectionsResourceApi res = new api.YoutubeApi(mock).channelSections;
       var arg_id = "foo";
       var arg_onBehalfOfContentOwner = "foo";
@@ -5510,14 +5963,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_id, onBehalfOfContentOwner: arg_onBehalfOfContentOwner).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ChannelSectionsResourceApi res = new api.YoutubeApi(mock).channelSections;
       var arg_request = buildChannelSection();
       var arg_part = "foo";
@@ -5563,7 +6016,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChannelSection());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_part, onBehalfOfContentOwner: arg_onBehalfOfContentOwner, onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel).then(unittest.expectAsync(((api.ChannelSection response) {
         checkChannelSection(response);
@@ -5572,10 +6025,11 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ChannelSectionsResourceApi res = new api.YoutubeApi(mock).channelSections;
       var arg_part = "foo";
       var arg_channelId = "foo";
+      var arg_hl = "foo";
       var arg_id = "foo";
       var arg_mine = true;
       var arg_onBehalfOfContentOwner = "foo";
@@ -5609,6 +6063,7 @@
         }
         unittest.expect(queryMap["part"].first, unittest.equals(arg_part));
         unittest.expect(queryMap["channelId"].first, unittest.equals(arg_channelId));
+        unittest.expect(queryMap["hl"].first, unittest.equals(arg_hl));
         unittest.expect(queryMap["id"].first, unittest.equals(arg_id));
         unittest.expect(queryMap["mine"].first, unittest.equals("$arg_mine"));
         unittest.expect(queryMap["onBehalfOfContentOwner"].first, unittest.equals(arg_onBehalfOfContentOwner));
@@ -5618,16 +6073,16 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChannelSectionListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_part, channelId: arg_channelId, id: arg_id, mine: arg_mine, onBehalfOfContentOwner: arg_onBehalfOfContentOwner).then(unittest.expectAsync(((api.ChannelSectionListResponse response) {
+      res.list(arg_part, channelId: arg_channelId, hl: arg_hl, id: arg_id, mine: arg_mine, onBehalfOfContentOwner: arg_onBehalfOfContentOwner).then(unittest.expectAsync(((api.ChannelSectionListResponse response) {
         checkChannelSectionListResponse(response);
       })));
     });
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ChannelSectionsResourceApi res = new api.YoutubeApi(mock).channelSections;
       var arg_request = buildChannelSection();
       var arg_part = "foo";
@@ -5671,7 +6126,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChannelSection());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_part, onBehalfOfContentOwner: arg_onBehalfOfContentOwner).then(unittest.expectAsync(((api.ChannelSection response) {
         checkChannelSection(response);
@@ -5684,11 +6139,12 @@
   unittest.group("resource-ChannelsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ChannelsResourceApi res = new api.YoutubeApi(mock).channels;
       var arg_part = "foo";
       var arg_categoryId = "foo";
       var arg_forUsername = "foo";
+      var arg_hl = "foo";
       var arg_id = "foo";
       var arg_managedByMe = true;
       var arg_maxResults = 42;
@@ -5727,6 +6183,7 @@
         unittest.expect(queryMap["part"].first, unittest.equals(arg_part));
         unittest.expect(queryMap["categoryId"].first, unittest.equals(arg_categoryId));
         unittest.expect(queryMap["forUsername"].first, unittest.equals(arg_forUsername));
+        unittest.expect(queryMap["hl"].first, unittest.equals(arg_hl));
         unittest.expect(queryMap["id"].first, unittest.equals(arg_id));
         unittest.expect(queryMap["managedByMe"].first, unittest.equals("$arg_managedByMe"));
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
@@ -5740,16 +6197,16 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChannelListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_part, categoryId: arg_categoryId, forUsername: arg_forUsername, id: arg_id, managedByMe: arg_managedByMe, maxResults: arg_maxResults, mine: arg_mine, mySubscribers: arg_mySubscribers, onBehalfOfContentOwner: arg_onBehalfOfContentOwner, pageToken: arg_pageToken).then(unittest.expectAsync(((api.ChannelListResponse response) {
+      res.list(arg_part, categoryId: arg_categoryId, forUsername: arg_forUsername, hl: arg_hl, id: arg_id, managedByMe: arg_managedByMe, maxResults: arg_maxResults, mine: arg_mine, mySubscribers: arg_mySubscribers, onBehalfOfContentOwner: arg_onBehalfOfContentOwner, pageToken: arg_pageToken).then(unittest.expectAsync(((api.ChannelListResponse response) {
         checkChannelListResponse(response);
       })));
     });
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ChannelsResourceApi res = new api.YoutubeApi(mock).channels;
       var arg_request = buildChannel();
       var arg_part = "foo";
@@ -5793,7 +6250,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildChannel());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_part, onBehalfOfContentOwner: arg_onBehalfOfContentOwner).then(unittest.expectAsync(((api.Channel response) {
         checkChannel(response);
@@ -5806,7 +6263,7 @@
   unittest.group("resource-GuideCategoriesResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GuideCategoriesResourceApi res = new api.YoutubeApi(mock).guideCategories;
       var arg_part = "foo";
       var arg_hl = "foo";
@@ -5850,7 +6307,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGuideCategoryListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_part, hl: arg_hl, id: arg_id, regionCode: arg_regionCode).then(unittest.expectAsync(((api.GuideCategoryListResponse response) {
         checkGuideCategoryListResponse(response);
@@ -5863,7 +6320,7 @@
   unittest.group("resource-I18nLanguagesResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.I18nLanguagesResourceApi res = new api.YoutubeApi(mock).i18nLanguages;
       var arg_part = "foo";
       var arg_hl = "foo";
@@ -5903,7 +6360,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildI18nLanguageListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_part, hl: arg_hl).then(unittest.expectAsync(((api.I18nLanguageListResponse response) {
         checkI18nLanguageListResponse(response);
@@ -5916,7 +6373,7 @@
   unittest.group("resource-I18nRegionsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.I18nRegionsResourceApi res = new api.YoutubeApi(mock).i18nRegions;
       var arg_part = "foo";
       var arg_hl = "foo";
@@ -5956,7 +6413,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildI18nRegionListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_part, hl: arg_hl).then(unittest.expectAsync(((api.I18nRegionListResponse response) {
         checkI18nRegionListResponse(response);
@@ -5969,7 +6426,7 @@
   unittest.group("resource-LiveBroadcastsResourceApi", () {
     unittest.test("method--bind", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LiveBroadcastsResourceApi res = new api.YoutubeApi(mock).liveBroadcasts;
       var arg_id = "foo";
       var arg_part = "foo";
@@ -6015,7 +6472,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLiveBroadcast());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.bind(arg_id, arg_part, onBehalfOfContentOwner: arg_onBehalfOfContentOwner, onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel, streamId: arg_streamId).then(unittest.expectAsync(((api.LiveBroadcast response) {
         checkLiveBroadcast(response);
@@ -6024,7 +6481,7 @@
 
     unittest.test("method--control", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LiveBroadcastsResourceApi res = new api.YoutubeApi(mock).liveBroadcasts;
       var arg_id = "foo";
       var arg_part = "foo";
@@ -6074,7 +6531,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLiveBroadcast());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.control(arg_id, arg_part, displaySlate: arg_displaySlate, offsetTimeMs: arg_offsetTimeMs, onBehalfOfContentOwner: arg_onBehalfOfContentOwner, onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel, walltime: arg_walltime).then(unittest.expectAsync(((api.LiveBroadcast response) {
         checkLiveBroadcast(response);
@@ -6083,7 +6540,7 @@
 
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LiveBroadcastsResourceApi res = new api.YoutubeApi(mock).liveBroadcasts;
       var arg_id = "foo";
       var arg_onBehalfOfContentOwner = "foo";
@@ -6125,14 +6582,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_id, onBehalfOfContentOwner: arg_onBehalfOfContentOwner, onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LiveBroadcastsResourceApi res = new api.YoutubeApi(mock).liveBroadcasts;
       var arg_request = buildLiveBroadcast();
       var arg_part = "foo";
@@ -6178,7 +6635,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLiveBroadcast());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_part, onBehalfOfContentOwner: arg_onBehalfOfContentOwner, onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel).then(unittest.expectAsync(((api.LiveBroadcast response) {
         checkLiveBroadcast(response);
@@ -6187,7 +6644,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LiveBroadcastsResourceApi res = new api.YoutubeApi(mock).liveBroadcasts;
       var arg_part = "foo";
       var arg_broadcastStatus = "foo";
@@ -6239,7 +6696,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLiveBroadcastListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_part, broadcastStatus: arg_broadcastStatus, id: arg_id, maxResults: arg_maxResults, mine: arg_mine, onBehalfOfContentOwner: arg_onBehalfOfContentOwner, onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel, pageToken: arg_pageToken).then(unittest.expectAsync(((api.LiveBroadcastListResponse response) {
         checkLiveBroadcastListResponse(response);
@@ -6248,7 +6705,7 @@
 
     unittest.test("method--transition", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LiveBroadcastsResourceApi res = new api.YoutubeApi(mock).liveBroadcasts;
       var arg_broadcastStatus = "foo";
       var arg_id = "foo";
@@ -6294,7 +6751,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLiveBroadcast());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.transition(arg_broadcastStatus, arg_id, arg_part, onBehalfOfContentOwner: arg_onBehalfOfContentOwner, onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel).then(unittest.expectAsync(((api.LiveBroadcast response) {
         checkLiveBroadcast(response);
@@ -6303,7 +6760,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LiveBroadcastsResourceApi res = new api.YoutubeApi(mock).liveBroadcasts;
       var arg_request = buildLiveBroadcast();
       var arg_part = "foo";
@@ -6349,7 +6806,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLiveBroadcast());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_part, onBehalfOfContentOwner: arg_onBehalfOfContentOwner, onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel).then(unittest.expectAsync(((api.LiveBroadcast response) {
         checkLiveBroadcast(response);
@@ -6362,7 +6819,7 @@
   unittest.group("resource-LiveStreamsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LiveStreamsResourceApi res = new api.YoutubeApi(mock).liveStreams;
       var arg_id = "foo";
       var arg_onBehalfOfContentOwner = "foo";
@@ -6404,14 +6861,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_id, onBehalfOfContentOwner: arg_onBehalfOfContentOwner, onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LiveStreamsResourceApi res = new api.YoutubeApi(mock).liveStreams;
       var arg_request = buildLiveStream();
       var arg_part = "foo";
@@ -6457,7 +6914,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLiveStream());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_part, onBehalfOfContentOwner: arg_onBehalfOfContentOwner, onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel).then(unittest.expectAsync(((api.LiveStream response) {
         checkLiveStream(response);
@@ -6466,7 +6923,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LiveStreamsResourceApi res = new api.YoutubeApi(mock).liveStreams;
       var arg_part = "foo";
       var arg_id = "foo";
@@ -6516,7 +6973,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLiveStreamListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_part, id: arg_id, maxResults: arg_maxResults, mine: arg_mine, onBehalfOfContentOwner: arg_onBehalfOfContentOwner, onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel, pageToken: arg_pageToken).then(unittest.expectAsync(((api.LiveStreamListResponse response) {
         checkLiveStreamListResponse(response);
@@ -6525,7 +6982,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.LiveStreamsResourceApi res = new api.YoutubeApi(mock).liveStreams;
       var arg_request = buildLiveStream();
       var arg_part = "foo";
@@ -6571,7 +7028,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildLiveStream());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_part, onBehalfOfContentOwner: arg_onBehalfOfContentOwner, onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel).then(unittest.expectAsync(((api.LiveStream response) {
         checkLiveStream(response);
@@ -6584,7 +7041,7 @@
   unittest.group("resource-PlaylistItemsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlaylistItemsResourceApi res = new api.YoutubeApi(mock).playlistItems;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -6622,14 +7079,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlaylistItemsResourceApi res = new api.YoutubeApi(mock).playlistItems;
       var arg_request = buildPlaylistItem();
       var arg_part = "foo";
@@ -6673,7 +7130,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlaylistItem());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_part, onBehalfOfContentOwner: arg_onBehalfOfContentOwner).then(unittest.expectAsync(((api.PlaylistItem response) {
         checkPlaylistItem(response);
@@ -6682,7 +7139,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlaylistItemsResourceApi res = new api.YoutubeApi(mock).playlistItems;
       var arg_part = "foo";
       var arg_id = "foo";
@@ -6732,7 +7189,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlaylistItemListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_part, id: arg_id, maxResults: arg_maxResults, onBehalfOfContentOwner: arg_onBehalfOfContentOwner, pageToken: arg_pageToken, playlistId: arg_playlistId, videoId: arg_videoId).then(unittest.expectAsync(((api.PlaylistItemListResponse response) {
         checkPlaylistItemListResponse(response);
@@ -6741,7 +7198,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlaylistItemsResourceApi res = new api.YoutubeApi(mock).playlistItems;
       var arg_request = buildPlaylistItem();
       var arg_part = "foo";
@@ -6783,7 +7240,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlaylistItem());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_part).then(unittest.expectAsync(((api.PlaylistItem response) {
         checkPlaylistItem(response);
@@ -6796,7 +7253,7 @@
   unittest.group("resource-PlaylistsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlaylistsResourceApi res = new api.YoutubeApi(mock).playlists;
       var arg_id = "foo";
       var arg_onBehalfOfContentOwner = "foo";
@@ -6836,14 +7293,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_id, onBehalfOfContentOwner: arg_onBehalfOfContentOwner).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlaylistsResourceApi res = new api.YoutubeApi(mock).playlists;
       var arg_request = buildPlaylist();
       var arg_part = "foo";
@@ -6889,7 +7346,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlaylist());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_part, onBehalfOfContentOwner: arg_onBehalfOfContentOwner, onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel).then(unittest.expectAsync(((api.Playlist response) {
         checkPlaylist(response);
@@ -6898,10 +7355,11 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlaylistsResourceApi res = new api.YoutubeApi(mock).playlists;
       var arg_part = "foo";
       var arg_channelId = "foo";
+      var arg_hl = "foo";
       var arg_id = "foo";
       var arg_maxResults = 42;
       var arg_mine = true;
@@ -6938,6 +7396,7 @@
         }
         unittest.expect(queryMap["part"].first, unittest.equals(arg_part));
         unittest.expect(queryMap["channelId"].first, unittest.equals(arg_channelId));
+        unittest.expect(queryMap["hl"].first, unittest.equals(arg_hl));
         unittest.expect(queryMap["id"].first, unittest.equals(arg_id));
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["mine"].first, unittest.equals("$arg_mine"));
@@ -6950,16 +7409,16 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlaylistListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_part, channelId: arg_channelId, id: arg_id, maxResults: arg_maxResults, mine: arg_mine, onBehalfOfContentOwner: arg_onBehalfOfContentOwner, onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel, pageToken: arg_pageToken).then(unittest.expectAsync(((api.PlaylistListResponse response) {
+      res.list(arg_part, channelId: arg_channelId, hl: arg_hl, id: arg_id, maxResults: arg_maxResults, mine: arg_mine, onBehalfOfContentOwner: arg_onBehalfOfContentOwner, onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel, pageToken: arg_pageToken).then(unittest.expectAsync(((api.PlaylistListResponse response) {
         checkPlaylistListResponse(response);
       })));
     });
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PlaylistsResourceApi res = new api.YoutubeApi(mock).playlists;
       var arg_request = buildPlaylist();
       var arg_part = "foo";
@@ -7003,7 +7462,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPlaylist());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_part, onBehalfOfContentOwner: arg_onBehalfOfContentOwner).then(unittest.expectAsync(((api.Playlist response) {
         checkPlaylist(response);
@@ -7016,13 +7475,14 @@
   unittest.group("resource-SearchResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SearchResourceApi res = new api.YoutubeApi(mock).search;
       var arg_part = "foo";
       var arg_channelId = "foo";
       var arg_channelType = "foo";
       var arg_eventType = "foo";
       var arg_forContentOwner = true;
+      var arg_forDeveloper = true;
       var arg_forMine = true;
       var arg_location = "foo";
       var arg_locationRadius = "foo";
@@ -7081,6 +7541,7 @@
         unittest.expect(queryMap["channelType"].first, unittest.equals(arg_channelType));
         unittest.expect(queryMap["eventType"].first, unittest.equals(arg_eventType));
         unittest.expect(queryMap["forContentOwner"].first, unittest.equals("$arg_forContentOwner"));
+        unittest.expect(queryMap["forDeveloper"].first, unittest.equals("$arg_forDeveloper"));
         unittest.expect(queryMap["forMine"].first, unittest.equals("$arg_forMine"));
         unittest.expect(queryMap["location"].first, unittest.equals(arg_location));
         unittest.expect(queryMap["locationRadius"].first, unittest.equals(arg_locationRadius));
@@ -7112,9 +7573,9 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSearchListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_part, channelId: arg_channelId, channelType: arg_channelType, eventType: arg_eventType, forContentOwner: arg_forContentOwner, forMine: arg_forMine, location: arg_location, locationRadius: arg_locationRadius, maxResults: arg_maxResults, onBehalfOfContentOwner: arg_onBehalfOfContentOwner, order: arg_order, pageToken: arg_pageToken, publishedAfter: arg_publishedAfter, publishedBefore: arg_publishedBefore, q: arg_q, regionCode: arg_regionCode, relatedToVideoId: arg_relatedToVideoId, relevanceLanguage: arg_relevanceLanguage, safeSearch: arg_safeSearch, topicId: arg_topicId, type: arg_type, videoCaption: arg_videoCaption, videoCategoryId: arg_videoCategoryId, videoDefinition: arg_videoDefinition, videoDimension: arg_videoDimension, videoDuration: arg_videoDuration, videoEmbeddable: arg_videoEmbeddable, videoLicense: arg_videoLicense, videoSyndicated: arg_videoSyndicated, videoType: arg_videoType).then(unittest.expectAsync(((api.SearchListResponse response) {
+      res.list(arg_part, channelId: arg_channelId, channelType: arg_channelType, eventType: arg_eventType, forContentOwner: arg_forContentOwner, forDeveloper: arg_forDeveloper, forMine: arg_forMine, location: arg_location, locationRadius: arg_locationRadius, maxResults: arg_maxResults, onBehalfOfContentOwner: arg_onBehalfOfContentOwner, order: arg_order, pageToken: arg_pageToken, publishedAfter: arg_publishedAfter, publishedBefore: arg_publishedBefore, q: arg_q, regionCode: arg_regionCode, relatedToVideoId: arg_relatedToVideoId, relevanceLanguage: arg_relevanceLanguage, safeSearch: arg_safeSearch, topicId: arg_topicId, type: arg_type, videoCaption: arg_videoCaption, videoCategoryId: arg_videoCategoryId, videoDefinition: arg_videoDefinition, videoDimension: arg_videoDimension, videoDuration: arg_videoDuration, videoEmbeddable: arg_videoEmbeddable, videoLicense: arg_videoLicense, videoSyndicated: arg_videoSyndicated, videoType: arg_videoType).then(unittest.expectAsync(((api.SearchListResponse response) {
         checkSearchListResponse(response);
       })));
     });
@@ -7125,7 +7586,7 @@
   unittest.group("resource-SubscriptionsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SubscriptionsResourceApi res = new api.YoutubeApi(mock).subscriptions;
       var arg_id = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -7163,14 +7624,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_id).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SubscriptionsResourceApi res = new api.YoutubeApi(mock).subscriptions;
       var arg_request = buildSubscription();
       var arg_part = "foo";
@@ -7212,7 +7673,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSubscription());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_part).then(unittest.expectAsync(((api.Subscription response) {
         checkSubscription(response);
@@ -7221,7 +7682,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.SubscriptionsResourceApi res = new api.YoutubeApi(mock).subscriptions;
       var arg_part = "foo";
       var arg_channelId = "foo";
@@ -7279,7 +7740,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildSubscriptionListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_part, channelId: arg_channelId, forChannelId: arg_forChannelId, id: arg_id, maxResults: arg_maxResults, mine: arg_mine, mySubscribers: arg_mySubscribers, onBehalfOfContentOwner: arg_onBehalfOfContentOwner, onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel, order: arg_order, pageToken: arg_pageToken).then(unittest.expectAsync(((api.SubscriptionListResponse response) {
         checkSubscriptionListResponse(response);
@@ -7294,7 +7755,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ThumbnailsResourceApi res = new api.YoutubeApi(mock).thumbnails;
       var arg_videoId = "foo";
       var arg_onBehalfOfContentOwner = "foo";
@@ -7334,7 +7795,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildThumbnailSetResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.set(arg_videoId, onBehalfOfContentOwner: arg_onBehalfOfContentOwner).then(unittest.expectAsync(((api.ThumbnailSetResponse response) {
         checkThumbnailSetResponse(response);
@@ -7347,7 +7808,7 @@
   unittest.group("resource-VideoCategoriesResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.VideoCategoriesResourceApi res = new api.YoutubeApi(mock).videoCategories;
       var arg_part = "foo";
       var arg_hl = "foo";
@@ -7391,7 +7852,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildVideoCategoryListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_part, hl: arg_hl, id: arg_id, regionCode: arg_regionCode).then(unittest.expectAsync(((api.VideoCategoryListResponse response) {
         checkVideoCategoryListResponse(response);
@@ -7404,7 +7865,7 @@
   unittest.group("resource-VideosResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.VideosResourceApi res = new api.YoutubeApi(mock).videos;
       var arg_id = "foo";
       var arg_onBehalfOfContentOwner = "foo";
@@ -7444,14 +7905,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_id, onBehalfOfContentOwner: arg_onBehalfOfContentOwner).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--getRating", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.VideosResourceApi res = new api.YoutubeApi(mock).videos;
       var arg_id = "foo";
       var arg_onBehalfOfContentOwner = "foo";
@@ -7491,7 +7952,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildVideoGetRatingResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.getRating(arg_id, onBehalfOfContentOwner: arg_onBehalfOfContentOwner).then(unittest.expectAsync(((api.VideoGetRatingResponse response) {
         checkVideoGetRatingResponse(response);
@@ -7502,7 +7963,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.VideosResourceApi res = new api.YoutubeApi(mock).videos;
       var arg_request = buildVideo();
       var arg_part = "foo";
@@ -7554,7 +8015,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildVideo());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_part, autoLevels: arg_autoLevels, notifySubscribers: arg_notifySubscribers, onBehalfOfContentOwner: arg_onBehalfOfContentOwner, onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel, stabilize: arg_stabilize).then(unittest.expectAsync(((api.Video response) {
         checkVideo(response);
@@ -7563,7 +8024,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.VideosResourceApi res = new api.YoutubeApi(mock).videos;
       var arg_part = "foo";
       var arg_chart = "foo";
@@ -7621,7 +8082,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildVideoListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_part, chart: arg_chart, hl: arg_hl, id: arg_id, locale: arg_locale, maxResults: arg_maxResults, myRating: arg_myRating, onBehalfOfContentOwner: arg_onBehalfOfContentOwner, pageToken: arg_pageToken, regionCode: arg_regionCode, videoCategoryId: arg_videoCategoryId).then(unittest.expectAsync(((api.VideoListResponse response) {
         checkVideoListResponse(response);
@@ -7630,7 +8091,7 @@
 
     unittest.test("method--rate", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.VideosResourceApi res = new api.YoutubeApi(mock).videos;
       var arg_id = "foo";
       var arg_rating = "foo";
@@ -7672,14 +8133,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.rate(arg_id, arg_rating, onBehalfOfContentOwner: arg_onBehalfOfContentOwner).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.VideosResourceApi res = new api.YoutubeApi(mock).videos;
       var arg_request = buildVideo();
       var arg_part = "foo";
@@ -7723,7 +8184,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildVideo());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_part, onBehalfOfContentOwner: arg_onBehalfOfContentOwner).then(unittest.expectAsync(((api.Video response) {
         checkVideo(response);
@@ -7738,7 +8199,7 @@
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.WatermarksResourceApi res = new api.YoutubeApi(mock).watermarks;
       var arg_request = buildInvideoBranding();
       var arg_channelId = "foo";
@@ -7782,14 +8243,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.set(arg_request, arg_channelId, onBehalfOfContentOwner: arg_onBehalfOfContentOwner).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--unset", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.WatermarksResourceApi res = new api.YoutubeApi(mock).watermarks;
       var arg_channelId = "foo";
       var arg_onBehalfOfContentOwner = "foo";
@@ -7829,7 +8290,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.unset(arg_channelId, onBehalfOfContentOwner: arg_onBehalfOfContentOwner).then(unittest.expectAsync((_) {}));
     });
diff --git a/generated/googleapis/test/youtubeanalytics/v1_test.dart b/generated/googleapis/test/youtubeanalytics/v1_test.dart
index e177777..9aa2384 100644
--- a/generated/googleapis/test/youtubeanalytics/v1_test.dart
+++ b/generated/googleapis/test/youtubeanalytics/v1_test.dart
@@ -8,13 +8,48 @@
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/youtubeanalytics/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
+
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
 
 core.int buildCounterBatchReportOutputs = 0;
 buildBatchReportOutputs() {
@@ -39,14 +74,14 @@
   buildCounterBatchReportOutputs--;
 }
 
-buildUnnamed188() {
+buildUnnamed1459() {
   var o = new core.List<api.BatchReportOutputs>();
   o.add(buildBatchReportOutputs());
   o.add(buildBatchReportOutputs());
   return o;
 }
 
-checkUnnamed188(core.List<api.BatchReportOutputs> o) {
+checkUnnamed1459(core.List<api.BatchReportOutputs> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBatchReportOutputs(o[0]);
   checkBatchReportOutputs(o[1]);
@@ -80,7 +115,7 @@
   if (buildCounterBatchReport < 3) {
     o.id = "foo";
     o.kind = "foo";
-    o.outputs = buildUnnamed188();
+    o.outputs = buildUnnamed1459();
     o.reportId = "foo";
     o.timeSpan = buildBatchReportTimeSpan();
     o.timeUpdated = core.DateTime.parse("2002-02-27T14:01:02");
@@ -94,7 +129,7 @@
   if (buildCounterBatchReport < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed188(o.outputs);
+    checkUnnamed1459(o.outputs);
     unittest.expect(o.reportId, unittest.equals('foo'));
     checkBatchReportTimeSpan(o.timeSpan);
     unittest.expect(o.timeUpdated, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
@@ -129,14 +164,14 @@
   buildCounterBatchReportDefinition--;
 }
 
-buildUnnamed189() {
+buildUnnamed1460() {
   var o = new core.List<api.BatchReportDefinition>();
   o.add(buildBatchReportDefinition());
   o.add(buildBatchReportDefinition());
   return o;
 }
 
-checkUnnamed189(core.List<api.BatchReportDefinition> o) {
+checkUnnamed1460(core.List<api.BatchReportDefinition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBatchReportDefinition(o[0]);
   checkBatchReportDefinition(o[1]);
@@ -147,7 +182,7 @@
   var o = new api.BatchReportDefinitionList();
   buildCounterBatchReportDefinitionList++;
   if (buildCounterBatchReportDefinitionList < 3) {
-    o.items = buildUnnamed189();
+    o.items = buildUnnamed1460();
     o.kind = "foo";
   }
   buildCounterBatchReportDefinitionList--;
@@ -157,20 +192,20 @@
 checkBatchReportDefinitionList(api.BatchReportDefinitionList o) {
   buildCounterBatchReportDefinitionList++;
   if (buildCounterBatchReportDefinitionList < 3) {
-    checkUnnamed189(o.items);
+    checkUnnamed1460(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterBatchReportDefinitionList--;
 }
 
-buildUnnamed190() {
+buildUnnamed1461() {
   var o = new core.List<api.BatchReport>();
   o.add(buildBatchReport());
   o.add(buildBatchReport());
   return o;
 }
 
-checkUnnamed190(core.List<api.BatchReport> o) {
+checkUnnamed1461(core.List<api.BatchReport> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBatchReport(o[0]);
   checkBatchReport(o[1]);
@@ -181,7 +216,7 @@
   var o = new api.BatchReportList();
   buildCounterBatchReportList++;
   if (buildCounterBatchReportList < 3) {
-    o.items = buildUnnamed190();
+    o.items = buildUnnamed1461();
     o.kind = "foo";
   }
   buildCounterBatchReportList--;
@@ -191,7 +226,7 @@
 checkBatchReportList(api.BatchReportList o) {
   buildCounterBatchReportList++;
   if (buildCounterBatchReportList < 3) {
-    checkUnnamed190(o.items);
+    checkUnnamed1461(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterBatchReportList--;
@@ -314,14 +349,14 @@
   buildCounterGroupItem--;
 }
 
-buildUnnamed191() {
+buildUnnamed1462() {
   var o = new core.List<api.GroupItem>();
   o.add(buildGroupItem());
   o.add(buildGroupItem());
   return o;
 }
 
-checkUnnamed191(core.List<api.GroupItem> o) {
+checkUnnamed1462(core.List<api.GroupItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGroupItem(o[0]);
   checkGroupItem(o[1]);
@@ -333,7 +368,7 @@
   buildCounterGroupItemListResponse++;
   if (buildCounterGroupItemListResponse < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed191();
+    o.items = buildUnnamed1462();
     o.kind = "foo";
   }
   buildCounterGroupItemListResponse--;
@@ -344,20 +379,20 @@
   buildCounterGroupItemListResponse++;
   if (buildCounterGroupItemListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed191(o.items);
+    checkUnnamed1462(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterGroupItemListResponse--;
 }
 
-buildUnnamed192() {
+buildUnnamed1463() {
   var o = new core.List<api.Group>();
   o.add(buildGroup());
   o.add(buildGroup());
   return o;
 }
 
-checkUnnamed192(core.List<api.Group> o) {
+checkUnnamed1463(core.List<api.Group> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGroup(o[0]);
   checkGroup(o[1]);
@@ -369,7 +404,7 @@
   buildCounterGroupListResponse++;
   if (buildCounterGroupListResponse < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed192();
+    o.items = buildUnnamed1463();
     o.kind = "foo";
   }
   buildCounterGroupListResponse--;
@@ -380,7 +415,7 @@
   buildCounterGroupListResponse++;
   if (buildCounterGroupListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed192(o.items);
+    checkUnnamed1463(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterGroupListResponse--;
@@ -409,43 +444,43 @@
   buildCounterResultTableColumnHeaders--;
 }
 
-buildUnnamed193() {
+buildUnnamed1464() {
   var o = new core.List<api.ResultTableColumnHeaders>();
   o.add(buildResultTableColumnHeaders());
   o.add(buildResultTableColumnHeaders());
   return o;
 }
 
-checkUnnamed193(core.List<api.ResultTableColumnHeaders> o) {
+checkUnnamed1464(core.List<api.ResultTableColumnHeaders> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResultTableColumnHeaders(o[0]);
   checkResultTableColumnHeaders(o[1]);
 }
 
-buildUnnamed194() {
+buildUnnamed1465() {
   var o = new core.List<core.Object>();
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   o.add({'list' : [1, 2, 3], 'bool' : true, 'string' : 'foo'});
   return o;
 }
 
-checkUnnamed194(core.List<core.Object> o) {
+checkUnnamed1465(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o[0]) as core.Map; unittest.expect(casted1, unittest.hasLength(3)); unittest.expect(casted1["list"], unittest.equals([1, 2, 3])); unittest.expect(casted1["bool"], unittest.equals(true)); unittest.expect(casted1["string"], unittest.equals('foo')); 
   var casted2 = (o[1]) as core.Map; unittest.expect(casted2, unittest.hasLength(3)); unittest.expect(casted2["list"], unittest.equals([1, 2, 3])); unittest.expect(casted2["bool"], unittest.equals(true)); unittest.expect(casted2["string"], unittest.equals('foo')); 
 }
 
-buildUnnamed195() {
+buildUnnamed1466() {
   var o = new core.List<core.List<core.Object>>();
-  o.add(buildUnnamed194());
-  o.add(buildUnnamed194());
+  o.add(buildUnnamed1465());
+  o.add(buildUnnamed1465());
   return o;
 }
 
-checkUnnamed195(core.List<core.List<core.Object>> o) {
+checkUnnamed1466(core.List<core.List<core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed194(o[0]);
-  checkUnnamed194(o[1]);
+  checkUnnamed1465(o[0]);
+  checkUnnamed1465(o[1]);
 }
 
 core.int buildCounterResultTable = 0;
@@ -453,9 +488,9 @@
   var o = new api.ResultTable();
   buildCounterResultTable++;
   if (buildCounterResultTable < 3) {
-    o.columnHeaders = buildUnnamed193();
+    o.columnHeaders = buildUnnamed1464();
     o.kind = "foo";
-    o.rows = buildUnnamed195();
+    o.rows = buildUnnamed1466();
   }
   buildCounterResultTable--;
   return o;
@@ -464,9 +499,9 @@
 checkResultTable(api.ResultTable o) {
   buildCounterResultTable++;
   if (buildCounterResultTable < 3) {
-    checkUnnamed193(o.columnHeaders);
+    checkUnnamed1464(o.columnHeaders);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed195(o.rows);
+    checkUnnamed1466(o.rows);
   }
   buildCounterResultTable--;
 }
@@ -611,7 +646,7 @@
   unittest.group("resource-BatchReportDefinitionsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BatchReportDefinitionsResourceApi res = new api.YoutubeAnalyticsApi(mock).batchReportDefinitions;
       var arg_onBehalfOfContentOwner = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
@@ -649,7 +684,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBatchReportDefinitionList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_onBehalfOfContentOwner).then(unittest.expectAsync(((api.BatchReportDefinitionList response) {
         checkBatchReportDefinitionList(response);
@@ -662,7 +697,7 @@
   unittest.group("resource-BatchReportsResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.BatchReportsResourceApi res = new api.YoutubeAnalyticsApi(mock).batchReports;
       var arg_batchReportDefinitionId = "foo";
       var arg_onBehalfOfContentOwner = "foo";
@@ -702,7 +737,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildBatchReportList());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_batchReportDefinitionId, arg_onBehalfOfContentOwner).then(unittest.expectAsync(((api.BatchReportList response) {
         checkBatchReportList(response);
@@ -715,7 +750,7 @@
   unittest.group("resource-GroupItemsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GroupItemsResourceApi res = new api.YoutubeAnalyticsApi(mock).groupItems;
       var arg_id = "foo";
       var arg_onBehalfOfContentOwner = "foo";
@@ -755,14 +790,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_id, onBehalfOfContentOwner: arg_onBehalfOfContentOwner).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GroupItemsResourceApi res = new api.YoutubeAnalyticsApi(mock).groupItems;
       var arg_request = buildGroupItem();
       var arg_onBehalfOfContentOwner = "foo";
@@ -804,7 +839,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGroupItem());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, onBehalfOfContentOwner: arg_onBehalfOfContentOwner).then(unittest.expectAsync(((api.GroupItem response) {
         checkGroupItem(response);
@@ -813,7 +848,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GroupItemsResourceApi res = new api.YoutubeAnalyticsApi(mock).groupItems;
       var arg_groupId = "foo";
       var arg_onBehalfOfContentOwner = "foo";
@@ -853,7 +888,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGroupItemListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_groupId, onBehalfOfContentOwner: arg_onBehalfOfContentOwner).then(unittest.expectAsync(((api.GroupItemListResponse response) {
         checkGroupItemListResponse(response);
@@ -866,7 +901,7 @@
   unittest.group("resource-GroupsResourceApi", () {
     unittest.test("method--delete", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GroupsResourceApi res = new api.YoutubeAnalyticsApi(mock).groups;
       var arg_id = "foo";
       var arg_onBehalfOfContentOwner = "foo";
@@ -906,14 +941,14 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.delete(arg_id, onBehalfOfContentOwner: arg_onBehalfOfContentOwner).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GroupsResourceApi res = new api.YoutubeAnalyticsApi(mock).groups;
       var arg_request = buildGroup();
       var arg_onBehalfOfContentOwner = "foo";
@@ -955,7 +990,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGroup());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, onBehalfOfContentOwner: arg_onBehalfOfContentOwner).then(unittest.expectAsync(((api.Group response) {
         checkGroup(response);
@@ -964,7 +999,7 @@
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GroupsResourceApi res = new api.YoutubeAnalyticsApi(mock).groups;
       var arg_id = "foo";
       var arg_mine = true;
@@ -1006,7 +1041,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGroupListResponse());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(id: arg_id, mine: arg_mine, onBehalfOfContentOwner: arg_onBehalfOfContentOwner).then(unittest.expectAsync(((api.GroupListResponse response) {
         checkGroupListResponse(response);
@@ -1015,7 +1050,7 @@
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.GroupsResourceApi res = new api.YoutubeAnalyticsApi(mock).groups;
       var arg_request = buildGroup();
       var arg_onBehalfOfContentOwner = "foo";
@@ -1057,7 +1092,7 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildGroup());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, onBehalfOfContentOwner: arg_onBehalfOfContentOwner).then(unittest.expectAsync(((api.Group response) {
         checkGroup(response);
@@ -1070,12 +1105,13 @@
   unittest.group("resource-ReportsResourceApi", () {
     unittest.test("method--query", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ReportsResourceApi res = new api.YoutubeAnalyticsApi(mock).reports;
       var arg_ids = "foo";
       var arg_start_date = "foo";
       var arg_end_date = "foo";
       var arg_metrics = "foo";
+      var arg_currency = "foo";
       var arg_dimensions = "foo";
       var arg_filters = "foo";
       var arg_max_results = 42;
@@ -1113,6 +1149,7 @@
         unittest.expect(queryMap["start-date"].first, unittest.equals(arg_start_date));
         unittest.expect(queryMap["end-date"].first, unittest.equals(arg_end_date));
         unittest.expect(queryMap["metrics"].first, unittest.equals(arg_metrics));
+        unittest.expect(queryMap["currency"].first, unittest.equals(arg_currency));
         unittest.expect(queryMap["dimensions"].first, unittest.equals(arg_dimensions));
         unittest.expect(queryMap["filters"].first, unittest.equals(arg_filters));
         unittest.expect(core.int.parse(queryMap["max-results"].first), unittest.equals(arg_max_results));
@@ -1124,9 +1161,9 @@
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildResultTable());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.query(arg_ids, arg_start_date, arg_end_date, arg_metrics, dimensions: arg_dimensions, filters: arg_filters, max_results: arg_max_results, sort: arg_sort, start_index: arg_start_index).then(unittest.expectAsync(((api.ResultTable response) {
+      res.query(arg_ids, arg_start_date, arg_end_date, arg_metrics, currency: arg_currency, dimensions: arg_dimensions, filters: arg_filters, max_results: arg_max_results, sort: arg_sort, start_index: arg_start_index).then(unittest.expectAsync(((api.ResultTable response) {
         checkResultTable(response);
       })));
     });