python codegen with new openapi-generator tool

1 files changed, 4409 insertions, 3446 deletions

diff --git a/python_openapi_client/fatcat_openapi_client/api/default_api.py b/python_openapi_client/fatcat_openapi_client/api/default_api.py
index cfa485ec..bb6ffbac 100644
--- a/python_openapi_client/fatcat_openapi_client/api/default_api.py
+++ b/python_openapi_client/fatcat_openapi_client/api/default_api.py
@@ -5,9 +5,9 @@
 
     Fatcat is a scalable, versioned, API-oriented catalog of bibliographic entities and file metadata.   # noqa: E501
 
-    OpenAPI spec version: 0.3.1
+    The version of the OpenAPI document: 0.3.1
     Contact: webservices@archive.org
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    Generated by: https://openapi-generator.tech
 """
 
 
@@ -19,13 +19,17 @@ import re  # noqa: F401
 import six
 
 from fatcat_openapi_client.api_client import ApiClient
+from fatcat_openapi_client.exceptions import (
+    ApiTypeError,
+    ApiValueError
+)
 
 
 class DefaultApi(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
+    """NOTE: This class is auto generated by OpenAPI Generator
+    Ref: https://openapi-generator.tech
 
     Do not edit the class manually.
-    Ref: https://github.com/swagger-api/swagger-codegen
     """
 
     def __init__(self, api_client=None):
@@ -38,72 +42,85 @@ class DefaultApi(object):
 
         Accept (\"merge\") the given editgroup into the catalog. The editgroup must be open (not already accepted), and the editor making this request must have the `admin` role.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.accept_editgroup(editgroup_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.accept_editgroup(editgroup_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: base32-encoded unique identifier (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: Success
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.accept_editgroup_with_http_info(editgroup_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.accept_editgroup_with_http_info(editgroup_id, **kwargs)  # noqa: E501
-            return data
+        return self.accept_editgroup_with_http_info(editgroup_id, **kwargs)  # noqa: E501
 
     def accept_editgroup_with_http_info(self, editgroup_id, **kwargs):  # noqa: E501
         """accept_editgroup  # noqa: E501
 
         Accept (\"merge\") the given editgroup into the catalog. The editgroup must be open (not already accepted), and the editor making this request must have the `admin` role.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.accept_editgroup_with_http_info(editgroup_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.accept_editgroup_with_http_info(editgroup_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: base32-encoded unique identifier (required)
-        :return: Success
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(Success, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method accept_editgroup" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `accept_editgroup`")  # noqa: E501
-
-        if ('editgroup_id' in params and
-                len(params['editgroup_id']) > 26):
-            raise ValueError("Invalid value for parameter `editgroup_id` when calling `accept_editgroup`, length must be less than or equal to `26`")  # noqa: E501
-        if ('editgroup_id' in params and
-                len(params['editgroup_id']) < 26):
-            raise ValueError("Invalid value for parameter `editgroup_id` when calling `accept_editgroup`, length must be greater than or equal to `26`")  # noqa: E501
-        if 'editgroup_id' in params and not re.search('[a-zA-Z2-7]{26}', params['editgroup_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `editgroup_id` when calling `accept_editgroup`, must conform to the pattern `/[a-zA-Z2-7]{26}/`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `accept_editgroup`")  # noqa: E501
+
+        if ('editgroup_id' in local_var_params and
+                len(local_var_params['editgroup_id']) > 26):
+            raise ApiValueError("Invalid value for parameter `editgroup_id` when calling `accept_editgroup`, length must be less than or equal to `26`")  # noqa: E501
+        if ('editgroup_id' in local_var_params and
+                len(local_var_params['editgroup_id']) < 26):
+            raise ApiValueError("Invalid value for parameter `editgroup_id` when calling `accept_editgroup`, length must be greater than or equal to `26`")  # noqa: E501
+        if 'editgroup_id' in local_var_params and not re.search(r'[a-zA-Z2-7]{26}', local_var_params['editgroup_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `editgroup_id` when calling `accept_editgroup`, must conform to the pattern `/[a-zA-Z2-7]{26}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
 
         query_params = []
 
@@ -117,10 +134,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['Bearer']  # noqa: E501
 
@@ -134,10 +147,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='Success',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def auth_check(self, **kwargs):  # noqa: E501
@@ -145,62 +158,75 @@ class DefaultApi(object):
 
         Verify that authentication (API token) is working as expected. The optional `role` parameter can be used to verify that the current account (editor) has permissions for the given role.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.auth_check(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.auth_check(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str role:
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: Success
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.auth_check_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.auth_check_with_http_info(**kwargs)  # noqa: E501
-            return data
+        return self.auth_check_with_http_info(**kwargs)  # noqa: E501
 
     def auth_check_with_http_info(self, **kwargs):  # noqa: E501
         """auth_check  # noqa: E501
 
         Verify that authentication (API token) is working as expected. The optional `role` parameter can be used to verify that the current account (editor) has permissions for the given role.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.auth_check_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.auth_check_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str role:
-        :return: Success
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(Success, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['role']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method auth_check" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
 
         collection_formats = {}
 
         path_params = {}
 
         query_params = []
-        if 'role' in params:
-            query_params.append(('role', params['role']))  # noqa: E501
+        if 'role' in local_var_params:
+            query_params.append(('role', local_var_params['role']))  # noqa: E501
 
         header_params = {}
 
@@ -212,10 +238,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['Bearer']  # noqa: E501
 
@@ -229,10 +251,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='Success',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def auth_oidc(self, oidc_params, **kwargs):  # noqa: E501
@@ -240,58 +262,71 @@ class DefaultApi(object):
 
         Login or create editor account using OIDC metadata (internal method).  This method is used by privileged front-end tools (like the web interface service) to process editor logins using OpenID Connect (OIDC) and/or OAuth. Most accounts (including tool and bot accounts) do not have sufficient privileges to call this method, which requires the `admin` role.  The method returns an API token; the HTTP status code indicates whether an existing account was logged in, or a new account was created.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.auth_oidc(oidc_params, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.auth_oidc(oidc_params, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param AuthOidc oidc_params: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: AuthOidcResult
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.auth_oidc_with_http_info(oidc_params, **kwargs)  # noqa: E501
-        else:
-            (data) = self.auth_oidc_with_http_info(oidc_params, **kwargs)  # noqa: E501
-            return data
+        return self.auth_oidc_with_http_info(oidc_params, **kwargs)  # noqa: E501
 
     def auth_oidc_with_http_info(self, oidc_params, **kwargs):  # noqa: E501
         """auth_oidc  # noqa: E501
 
         Login or create editor account using OIDC metadata (internal method).  This method is used by privileged front-end tools (like the web interface service) to process editor logins using OpenID Connect (OIDC) and/or OAuth. Most accounts (including tool and bot accounts) do not have sufficient privileges to call this method, which requires the `admin` role.  The method returns an API token; the HTTP status code indicates whether an existing account was logged in, or a new account was created.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.auth_oidc_with_http_info(oidc_params, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.auth_oidc_with_http_info(oidc_params, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param AuthOidc oidc_params: (required)
-        :return: AuthOidcResult
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(AuthOidcResult, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['oidc_params']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method auth_oidc" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'oidc_params' is set
-        if ('oidc_params' not in params or
-                params['oidc_params'] is None):
-            raise ValueError("Missing the required parameter `oidc_params` when calling `auth_oidc`")  # noqa: E501
+        if ('oidc_params' not in local_var_params or
+                local_var_params['oidc_params'] is None):
+            raise ApiValueError("Missing the required parameter `oidc_params` when calling `auth_oidc`")  # noqa: E501
 
         collection_formats = {}
 
@@ -305,8 +340,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'oidc_params' in params:
-            body_params = params['oidc_params']
+        if 'oidc_params' in local_var_params:
+            body_params = local_var_params['oidc_params']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -328,10 +363,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='AuthOidcResult',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def create_auth_token(self, editor_id, **kwargs):  # noqa: E501
@@ -339,70 +374,83 @@ class DefaultApi(object):
 
         Generate a new auth token for a given editor (internal method).  This method is used by the web interface to generate API tokens for users. It can not be called by editors (human or bot) to generate new tokens for themselves, at least at this time.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_auth_token(editor_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_auth_token(editor_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editor_id: (required)
         :param int duration_seconds: How long API token should be valid for (in seconds)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: AuthTokenResult
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.create_auth_token_with_http_info(editor_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.create_auth_token_with_http_info(editor_id, **kwargs)  # noqa: E501
-            return data
+        return self.create_auth_token_with_http_info(editor_id, **kwargs)  # noqa: E501
 
     def create_auth_token_with_http_info(self, editor_id, **kwargs):  # noqa: E501
         """create_auth_token  # noqa: E501
 
         Generate a new auth token for a given editor (internal method).  This method is used by the web interface to generate API tokens for users. It can not be called by editors (human or bot) to generate new tokens for themselves, at least at this time.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_auth_token_with_http_info(editor_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_auth_token_with_http_info(editor_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editor_id: (required)
         :param int duration_seconds: How long API token should be valid for (in seconds)
-        :return: AuthTokenResult
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(AuthTokenResult, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editor_id', 'duration_seconds']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method create_auth_token" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editor_id' is set
-        if ('editor_id' not in params or
-                params['editor_id'] is None):
-            raise ValueError("Missing the required parameter `editor_id` when calling `create_auth_token`")  # noqa: E501
+        if ('editor_id' not in local_var_params or
+                local_var_params['editor_id'] is None):
+            raise ApiValueError("Missing the required parameter `editor_id` when calling `create_auth_token`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'editor_id' in params:
-            path_params['editor_id'] = params['editor_id']  # noqa: E501
+        if 'editor_id' in local_var_params:
+            path_params['editor_id'] = local_var_params['editor_id']  # noqa: E501
 
         query_params = []
-        if 'duration_seconds' in params:
-            query_params.append(('duration_seconds', params['duration_seconds']))  # noqa: E501
+        if 'duration_seconds' in local_var_params:
+            query_params.append(('duration_seconds', local_var_params['duration_seconds']))  # noqa: E501
 
         header_params = {}
 
@@ -414,10 +462,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['Bearer']  # noqa: E501
 
@@ -431,10 +475,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='AuthTokenResult',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def create_container(self, editgroup_id, entity, **kwargs):  # noqa: E501
@@ -442,70 +486,83 @@ class DefaultApi(object):
 
         Create a single Container entity as part of an existing editgroup.  Editgroup must be mutable (aka, not accepted) and editor must have permission (aka, have created the editgrou p or have `admin` role).   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_container(editgroup_id, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_container(editgroup_id, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param ContainerEntity entity: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.create_container_with_http_info(editgroup_id, entity, **kwargs)  # noqa: E501
-        else:
-            (data) = self.create_container_with_http_info(editgroup_id, entity, **kwargs)  # noqa: E501
-            return data
+        return self.create_container_with_http_info(editgroup_id, entity, **kwargs)  # noqa: E501
 
     def create_container_with_http_info(self, editgroup_id, entity, **kwargs):  # noqa: E501
         """create_container  # noqa: E501
 
         Create a single Container entity as part of an existing editgroup.  Editgroup must be mutable (aka, not accepted) and editor must have permission (aka, have created the editgrou p or have `admin` role).   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_container_with_http_info(editgroup_id, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_container_with_http_info(editgroup_id, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param ContainerEntity entity: (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'entity']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method create_container" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `create_container`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `create_container`")  # noqa: E501
         # verify the required parameter 'entity' is set
-        if ('entity' not in params or
-                params['entity'] is None):
-            raise ValueError("Missing the required parameter `entity` when calling `create_container`")  # noqa: E501
+        if ('entity' not in local_var_params or
+                local_var_params['entity'] is None):
+            raise ApiValueError("Missing the required parameter `entity` when calling `create_container`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
 
         query_params = []
 
@@ -515,8 +572,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'entity' in params:
-            body_params = params['entity']
+        if 'entity' in local_var_params:
+            body_params = local_var_params['entity']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -538,10 +595,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def create_container_auto_batch(self, auto_batch, **kwargs):  # noqa: E501
@@ -549,58 +606,71 @@ class DefaultApi(object):
 
         Create a set of Container entities as part of a new editgroup, and accept that editgroup in the same atomic request.  This method is mostly useful for bulk import of new entities by carefully written bots. This method is more efficient than creating an editgroup, several entities, then accepting the editgroup, both in terms of API requests required and database load. Requires `admin` role.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_container_auto_batch(auto_batch, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_container_auto_batch(auto_batch, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param ContainerAutoBatch auto_batch: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: Editgroup
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.create_container_auto_batch_with_http_info(auto_batch, **kwargs)  # noqa: E501
-        else:
-            (data) = self.create_container_auto_batch_with_http_info(auto_batch, **kwargs)  # noqa: E501
-            return data
+        return self.create_container_auto_batch_with_http_info(auto_batch, **kwargs)  # noqa: E501
 
     def create_container_auto_batch_with_http_info(self, auto_batch, **kwargs):  # noqa: E501
         """create_container_auto_batch  # noqa: E501
 
         Create a set of Container entities as part of a new editgroup, and accept that editgroup in the same atomic request.  This method is mostly useful for bulk import of new entities by carefully written bots. This method is more efficient than creating an editgroup, several entities, then accepting the editgroup, both in terms of API requests required and database load. Requires `admin` role.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_container_auto_batch_with_http_info(auto_batch, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_container_auto_batch_with_http_info(auto_batch, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param ContainerAutoBatch auto_batch: (required)
-        :return: Editgroup
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(Editgroup, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['auto_batch']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method create_container_auto_batch" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'auto_batch' is set
-        if ('auto_batch' not in params or
-                params['auto_batch'] is None):
-            raise ValueError("Missing the required parameter `auto_batch` when calling `create_container_auto_batch`")  # noqa: E501
+        if ('auto_batch' not in local_var_params or
+                local_var_params['auto_batch'] is None):
+            raise ApiValueError("Missing the required parameter `auto_batch` when calling `create_container_auto_batch`")  # noqa: E501
 
         collection_formats = {}
 
@@ -614,8 +684,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'auto_batch' in params:
-            body_params = params['auto_batch']
+        if 'auto_batch' in local_var_params:
+            body_params = local_var_params['auto_batch']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -637,79 +707,92 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='Editgroup',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def create_creator(self, editgroup_id, entity, **kwargs):  # noqa: E501
         """create_creator  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_creator(editgroup_id, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_creator(editgroup_id, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param CreatorEntity entity: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.create_creator_with_http_info(editgroup_id, entity, **kwargs)  # noqa: E501
-        else:
-            (data) = self.create_creator_with_http_info(editgroup_id, entity, **kwargs)  # noqa: E501
-            return data
+        return self.create_creator_with_http_info(editgroup_id, entity, **kwargs)  # noqa: E501
 
     def create_creator_with_http_info(self, editgroup_id, entity, **kwargs):  # noqa: E501
         """create_creator  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_creator_with_http_info(editgroup_id, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_creator_with_http_info(editgroup_id, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param CreatorEntity entity: (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'entity']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method create_creator" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `create_creator`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `create_creator`")  # noqa: E501
         # verify the required parameter 'entity' is set
-        if ('entity' not in params or
-                params['entity'] is None):
-            raise ValueError("Missing the required parameter `entity` when calling `create_creator`")  # noqa: E501
+        if ('entity' not in local_var_params or
+                local_var_params['entity'] is None):
+            raise ApiValueError("Missing the required parameter `entity` when calling `create_creator`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
 
         query_params = []
 
@@ -719,8 +802,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'entity' in params:
-            body_params = params['entity']
+        if 'entity' in local_var_params:
+            body_params = local_var_params['entity']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -742,67 +825,80 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def create_creator_auto_batch(self, auto_batch, **kwargs):  # noqa: E501
         """create_creator_auto_batch  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_creator_auto_batch(auto_batch, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_creator_auto_batch(auto_batch, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param CreatorAutoBatch auto_batch: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: Editgroup
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.create_creator_auto_batch_with_http_info(auto_batch, **kwargs)  # noqa: E501
-        else:
-            (data) = self.create_creator_auto_batch_with_http_info(auto_batch, **kwargs)  # noqa: E501
-            return data
+        return self.create_creator_auto_batch_with_http_info(auto_batch, **kwargs)  # noqa: E501
 
     def create_creator_auto_batch_with_http_info(self, auto_batch, **kwargs):  # noqa: E501
         """create_creator_auto_batch  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_creator_auto_batch_with_http_info(auto_batch, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_creator_auto_batch_with_http_info(auto_batch, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param CreatorAutoBatch auto_batch: (required)
-        :return: Editgroup
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(Editgroup, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['auto_batch']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method create_creator_auto_batch" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'auto_batch' is set
-        if ('auto_batch' not in params or
-                params['auto_batch'] is None):
-            raise ValueError("Missing the required parameter `auto_batch` when calling `create_creator_auto_batch`")  # noqa: E501
+        if ('auto_batch' not in local_var_params or
+                local_var_params['auto_batch'] is None):
+            raise ApiValueError("Missing the required parameter `auto_batch` when calling `create_creator_auto_batch`")  # noqa: E501
 
         collection_formats = {}
 
@@ -816,8 +912,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'auto_batch' in params:
-            body_params = params['auto_batch']
+        if 'auto_batch' in local_var_params:
+            body_params = local_var_params['auto_batch']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -839,10 +935,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='Editgroup',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def create_editgroup(self, editgroup, **kwargs):  # noqa: E501
@@ -850,58 +946,71 @@ class DefaultApi(object):
 
         Creates a new editgroup. By default the editor making this request will be the author of the editgroup.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_editgroup(editgroup, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_editgroup(editgroup, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param Editgroup editgroup: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: Editgroup
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.create_editgroup_with_http_info(editgroup, **kwargs)  # noqa: E501
-        else:
-            (data) = self.create_editgroup_with_http_info(editgroup, **kwargs)  # noqa: E501
-            return data
+        return self.create_editgroup_with_http_info(editgroup, **kwargs)  # noqa: E501
 
     def create_editgroup_with_http_info(self, editgroup, **kwargs):  # noqa: E501
         """create_editgroup  # noqa: E501
 
         Creates a new editgroup. By default the editor making this request will be the author of the editgroup.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_editgroup_with_http_info(editgroup, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_editgroup_with_http_info(editgroup, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param Editgroup editgroup: (required)
-        :return: Editgroup
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(Editgroup, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method create_editgroup" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup' is set
-        if ('editgroup' not in params or
-                params['editgroup'] is None):
-            raise ValueError("Missing the required parameter `editgroup` when calling `create_editgroup`")  # noqa: E501
+        if ('editgroup' not in local_var_params or
+                local_var_params['editgroup'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup` when calling `create_editgroup`")  # noqa: E501
 
         collection_formats = {}
 
@@ -915,8 +1024,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'editgroup' in params:
-            body_params = params['editgroup']
+        if 'editgroup' in local_var_params:
+            body_params = local_var_params['editgroup']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -938,10 +1047,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='Editgroup',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def create_editgroup_annotation(self, editgroup_id, annotation, **kwargs):  # noqa: E501
@@ -949,78 +1058,91 @@ class DefaultApi(object):
 
         Submits a new annotation to the specified editgroup.  The editgroup must be open (not already accepted). The annotation will automatically have authorship of the editor making this request.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_editgroup_annotation(editgroup_id, annotation, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_editgroup_annotation(editgroup_id, annotation, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: base32-encoded unique identifier (required)
         :param EditgroupAnnotation annotation: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EditgroupAnnotation
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.create_editgroup_annotation_with_http_info(editgroup_id, annotation, **kwargs)  # noqa: E501
-        else:
-            (data) = self.create_editgroup_annotation_with_http_info(editgroup_id, annotation, **kwargs)  # noqa: E501
-            return data
+        return self.create_editgroup_annotation_with_http_info(editgroup_id, annotation, **kwargs)  # noqa: E501
 
     def create_editgroup_annotation_with_http_info(self, editgroup_id, annotation, **kwargs):  # noqa: E501
         """create_editgroup_annotation  # noqa: E501
 
         Submits a new annotation to the specified editgroup.  The editgroup must be open (not already accepted). The annotation will automatically have authorship of the editor making this request.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_editgroup_annotation_with_http_info(editgroup_id, annotation, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_editgroup_annotation_with_http_info(editgroup_id, annotation, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: base32-encoded unique identifier (required)
         :param EditgroupAnnotation annotation: (required)
-        :return: EditgroupAnnotation
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EditgroupAnnotation, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'annotation']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method create_editgroup_annotation" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `create_editgroup_annotation`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `create_editgroup_annotation`")  # noqa: E501
         # verify the required parameter 'annotation' is set
-        if ('annotation' not in params or
-                params['annotation'] is None):
-            raise ValueError("Missing the required parameter `annotation` when calling `create_editgroup_annotation`")  # noqa: E501
-
-        if ('editgroup_id' in params and
-                len(params['editgroup_id']) > 26):
-            raise ValueError("Invalid value for parameter `editgroup_id` when calling `create_editgroup_annotation`, length must be less than or equal to `26`")  # noqa: E501
-        if ('editgroup_id' in params and
-                len(params['editgroup_id']) < 26):
-            raise ValueError("Invalid value for parameter `editgroup_id` when calling `create_editgroup_annotation`, length must be greater than or equal to `26`")  # noqa: E501
-        if 'editgroup_id' in params and not re.search('[a-zA-Z2-7]{26}', params['editgroup_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `editgroup_id` when calling `create_editgroup_annotation`, must conform to the pattern `/[a-zA-Z2-7]{26}/`")  # noqa: E501
+        if ('annotation' not in local_var_params or
+                local_var_params['annotation'] is None):
+            raise ApiValueError("Missing the required parameter `annotation` when calling `create_editgroup_annotation`")  # noqa: E501
+
+        if ('editgroup_id' in local_var_params and
+                len(local_var_params['editgroup_id']) > 26):
+            raise ApiValueError("Invalid value for parameter `editgroup_id` when calling `create_editgroup_annotation`, length must be less than or equal to `26`")  # noqa: E501
+        if ('editgroup_id' in local_var_params and
+                len(local_var_params['editgroup_id']) < 26):
+            raise ApiValueError("Invalid value for parameter `editgroup_id` when calling `create_editgroup_annotation`, length must be greater than or equal to `26`")  # noqa: E501
+        if 'editgroup_id' in local_var_params and not re.search(r'[a-zA-Z2-7]{26}', local_var_params['editgroup_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `editgroup_id` when calling `create_editgroup_annotation`, must conform to the pattern `/[a-zA-Z2-7]{26}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
 
         query_params = []
 
@@ -1030,8 +1152,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'annotation' in params:
-            body_params = params['annotation']
+        if 'annotation' in local_var_params:
+            body_params = local_var_params['annotation']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -1053,79 +1175,92 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EditgroupAnnotation',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def create_file(self, editgroup_id, entity, **kwargs):  # noqa: E501
         """create_file  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_file(editgroup_id, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_file(editgroup_id, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param FileEntity entity: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.create_file_with_http_info(editgroup_id, entity, **kwargs)  # noqa: E501
-        else:
-            (data) = self.create_file_with_http_info(editgroup_id, entity, **kwargs)  # noqa: E501
-            return data
+        return self.create_file_with_http_info(editgroup_id, entity, **kwargs)  # noqa: E501
 
     def create_file_with_http_info(self, editgroup_id, entity, **kwargs):  # noqa: E501
         """create_file  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_file_with_http_info(editgroup_id, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_file_with_http_info(editgroup_id, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param FileEntity entity: (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'entity']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method create_file" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `create_file`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `create_file`")  # noqa: E501
         # verify the required parameter 'entity' is set
-        if ('entity' not in params or
-                params['entity'] is None):
-            raise ValueError("Missing the required parameter `entity` when calling `create_file`")  # noqa: E501
+        if ('entity' not in local_var_params or
+                local_var_params['entity'] is None):
+            raise ApiValueError("Missing the required parameter `entity` when calling `create_file`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
 
         query_params = []
 
@@ -1135,8 +1270,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'entity' in params:
-            body_params = params['entity']
+        if 'entity' in local_var_params:
+            body_params = local_var_params['entity']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -1158,67 +1293,80 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def create_file_auto_batch(self, auto_batch, **kwargs):  # noqa: E501
         """create_file_auto_batch  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_file_auto_batch(auto_batch, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_file_auto_batch(auto_batch, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param FileAutoBatch auto_batch: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: Editgroup
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.create_file_auto_batch_with_http_info(auto_batch, **kwargs)  # noqa: E501
-        else:
-            (data) = self.create_file_auto_batch_with_http_info(auto_batch, **kwargs)  # noqa: E501
-            return data
+        return self.create_file_auto_batch_with_http_info(auto_batch, **kwargs)  # noqa: E501
 
     def create_file_auto_batch_with_http_info(self, auto_batch, **kwargs):  # noqa: E501
         """create_file_auto_batch  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_file_auto_batch_with_http_info(auto_batch, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_file_auto_batch_with_http_info(auto_batch, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param FileAutoBatch auto_batch: (required)
-        :return: Editgroup
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(Editgroup, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['auto_batch']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method create_file_auto_batch" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'auto_batch' is set
-        if ('auto_batch' not in params or
-                params['auto_batch'] is None):
-            raise ValueError("Missing the required parameter `auto_batch` when calling `create_file_auto_batch`")  # noqa: E501
+        if ('auto_batch' not in local_var_params or
+                local_var_params['auto_batch'] is None):
+            raise ApiValueError("Missing the required parameter `auto_batch` when calling `create_file_auto_batch`")  # noqa: E501
 
         collection_formats = {}
 
@@ -1232,8 +1380,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'auto_batch' in params:
-            body_params = params['auto_batch']
+        if 'auto_batch' in local_var_params:
+            body_params = local_var_params['auto_batch']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -1255,79 +1403,92 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='Editgroup',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def create_fileset(self, editgroup_id, entity, **kwargs):  # noqa: E501
         """create_fileset  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_fileset(editgroup_id, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_fileset(editgroup_id, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param FilesetEntity entity: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.create_fileset_with_http_info(editgroup_id, entity, **kwargs)  # noqa: E501
-        else:
-            (data) = self.create_fileset_with_http_info(editgroup_id, entity, **kwargs)  # noqa: E501
-            return data
+        return self.create_fileset_with_http_info(editgroup_id, entity, **kwargs)  # noqa: E501
 
     def create_fileset_with_http_info(self, editgroup_id, entity, **kwargs):  # noqa: E501
         """create_fileset  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_fileset_with_http_info(editgroup_id, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_fileset_with_http_info(editgroup_id, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param FilesetEntity entity: (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'entity']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method create_fileset" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `create_fileset`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `create_fileset`")  # noqa: E501
         # verify the required parameter 'entity' is set
-        if ('entity' not in params or
-                params['entity'] is None):
-            raise ValueError("Missing the required parameter `entity` when calling `create_fileset`")  # noqa: E501
+        if ('entity' not in local_var_params or
+                local_var_params['entity'] is None):
+            raise ApiValueError("Missing the required parameter `entity` when calling `create_fileset`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
 
         query_params = []
 
@@ -1337,8 +1498,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'entity' in params:
-            body_params = params['entity']
+        if 'entity' in local_var_params:
+            body_params = local_var_params['entity']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -1360,67 +1521,80 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def create_fileset_auto_batch(self, auto_batch, **kwargs):  # noqa: E501
         """create_fileset_auto_batch  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_fileset_auto_batch(auto_batch, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_fileset_auto_batch(auto_batch, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param FilesetAutoBatch auto_batch: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: Editgroup
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.create_fileset_auto_batch_with_http_info(auto_batch, **kwargs)  # noqa: E501
-        else:
-            (data) = self.create_fileset_auto_batch_with_http_info(auto_batch, **kwargs)  # noqa: E501
-            return data
+        return self.create_fileset_auto_batch_with_http_info(auto_batch, **kwargs)  # noqa: E501
 
     def create_fileset_auto_batch_with_http_info(self, auto_batch, **kwargs):  # noqa: E501
         """create_fileset_auto_batch  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_fileset_auto_batch_with_http_info(auto_batch, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_fileset_auto_batch_with_http_info(auto_batch, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param FilesetAutoBatch auto_batch: (required)
-        :return: Editgroup
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(Editgroup, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['auto_batch']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method create_fileset_auto_batch" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'auto_batch' is set
-        if ('auto_batch' not in params or
-                params['auto_batch'] is None):
-            raise ValueError("Missing the required parameter `auto_batch` when calling `create_fileset_auto_batch`")  # noqa: E501
+        if ('auto_batch' not in local_var_params or
+                local_var_params['auto_batch'] is None):
+            raise ApiValueError("Missing the required parameter `auto_batch` when calling `create_fileset_auto_batch`")  # noqa: E501
 
         collection_formats = {}
 
@@ -1434,8 +1608,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'auto_batch' in params:
-            body_params = params['auto_batch']
+        if 'auto_batch' in local_var_params:
+            body_params = local_var_params['auto_batch']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -1457,10 +1631,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='Editgroup',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def create_release(self, editgroup_id, entity, **kwargs):  # noqa: E501
@@ -1468,70 +1642,83 @@ class DefaultApi(object):
 
         Create a single Release entity as part of an existing editgroup. If the `work_id` field is not set, a work entity will be created automatically and this field set pointing to the new work.  Editgroup must be mutable (aka, not accepted) and editor must have permission (aka, have created the editgrou p or have `admin` role).   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_release(editgroup_id, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_release(editgroup_id, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param ReleaseEntity entity: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.create_release_with_http_info(editgroup_id, entity, **kwargs)  # noqa: E501
-        else:
-            (data) = self.create_release_with_http_info(editgroup_id, entity, **kwargs)  # noqa: E501
-            return data
+        return self.create_release_with_http_info(editgroup_id, entity, **kwargs)  # noqa: E501
 
     def create_release_with_http_info(self, editgroup_id, entity, **kwargs):  # noqa: E501
         """create_release  # noqa: E501
 
         Create a single Release entity as part of an existing editgroup. If the `work_id` field is not set, a work entity will be created automatically and this field set pointing to the new work.  Editgroup must be mutable (aka, not accepted) and editor must have permission (aka, have created the editgrou p or have `admin` role).   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_release_with_http_info(editgroup_id, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_release_with_http_info(editgroup_id, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param ReleaseEntity entity: (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'entity']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method create_release" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `create_release`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `create_release`")  # noqa: E501
         # verify the required parameter 'entity' is set
-        if ('entity' not in params or
-                params['entity'] is None):
-            raise ValueError("Missing the required parameter `entity` when calling `create_release`")  # noqa: E501
+        if ('entity' not in local_var_params or
+                local_var_params['entity'] is None):
+            raise ApiValueError("Missing the required parameter `entity` when calling `create_release`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
 
         query_params = []
 
@@ -1541,8 +1728,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'entity' in params:
-            body_params = params['entity']
+        if 'entity' in local_var_params:
+            body_params = local_var_params['entity']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -1564,10 +1751,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def create_release_auto_batch(self, auto_batch, **kwargs):  # noqa: E501
@@ -1575,58 +1762,71 @@ class DefaultApi(object):
 
         Create a set of Release entities as part of a new editgroup, and accept that editgroup in the same atomic request.  This method is mostly useful for bulk import of new entities by carefully written bots. This method is more efficient than creating an editgroup, several entities, then accepting the editgroup, both in terms of API requests required and database load. Requires `admin` role.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_release_auto_batch(auto_batch, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_release_auto_batch(auto_batch, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param ReleaseAutoBatch auto_batch: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: Editgroup
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.create_release_auto_batch_with_http_info(auto_batch, **kwargs)  # noqa: E501
-        else:
-            (data) = self.create_release_auto_batch_with_http_info(auto_batch, **kwargs)  # noqa: E501
-            return data
+        return self.create_release_auto_batch_with_http_info(auto_batch, **kwargs)  # noqa: E501
 
     def create_release_auto_batch_with_http_info(self, auto_batch, **kwargs):  # noqa: E501
         """create_release_auto_batch  # noqa: E501
 
         Create a set of Release entities as part of a new editgroup, and accept that editgroup in the same atomic request.  This method is mostly useful for bulk import of new entities by carefully written bots. This method is more efficient than creating an editgroup, several entities, then accepting the editgroup, both in terms of API requests required and database load. Requires `admin` role.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_release_auto_batch_with_http_info(auto_batch, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_release_auto_batch_with_http_info(auto_batch, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param ReleaseAutoBatch auto_batch: (required)
-        :return: Editgroup
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(Editgroup, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['auto_batch']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method create_release_auto_batch" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'auto_batch' is set
-        if ('auto_batch' not in params or
-                params['auto_batch'] is None):
-            raise ValueError("Missing the required parameter `auto_batch` when calling `create_release_auto_batch`")  # noqa: E501
+        if ('auto_batch' not in local_var_params or
+                local_var_params['auto_batch'] is None):
+            raise ApiValueError("Missing the required parameter `auto_batch` when calling `create_release_auto_batch`")  # noqa: E501
 
         collection_formats = {}
 
@@ -1640,8 +1840,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'auto_batch' in params:
-            body_params = params['auto_batch']
+        if 'auto_batch' in local_var_params:
+            body_params = local_var_params['auto_batch']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -1663,79 +1863,92 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='Editgroup',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def create_webcapture(self, editgroup_id, entity, **kwargs):  # noqa: E501
         """create_webcapture  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_webcapture(editgroup_id, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_webcapture(editgroup_id, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param WebcaptureEntity entity: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.create_webcapture_with_http_info(editgroup_id, entity, **kwargs)  # noqa: E501
-        else:
-            (data) = self.create_webcapture_with_http_info(editgroup_id, entity, **kwargs)  # noqa: E501
-            return data
+        return self.create_webcapture_with_http_info(editgroup_id, entity, **kwargs)  # noqa: E501
 
     def create_webcapture_with_http_info(self, editgroup_id, entity, **kwargs):  # noqa: E501
         """create_webcapture  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_webcapture_with_http_info(editgroup_id, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_webcapture_with_http_info(editgroup_id, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param WebcaptureEntity entity: (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'entity']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method create_webcapture" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `create_webcapture`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `create_webcapture`")  # noqa: E501
         # verify the required parameter 'entity' is set
-        if ('entity' not in params or
-                params['entity'] is None):
-            raise ValueError("Missing the required parameter `entity` when calling `create_webcapture`")  # noqa: E501
+        if ('entity' not in local_var_params or
+                local_var_params['entity'] is None):
+            raise ApiValueError("Missing the required parameter `entity` when calling `create_webcapture`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
 
         query_params = []
 
@@ -1745,8 +1958,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'entity' in params:
-            body_params = params['entity']
+        if 'entity' in local_var_params:
+            body_params = local_var_params['entity']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -1768,67 +1981,80 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def create_webcapture_auto_batch(self, auto_batch, **kwargs):  # noqa: E501
         """create_webcapture_auto_batch  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_webcapture_auto_batch(auto_batch, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_webcapture_auto_batch(auto_batch, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param WebcaptureAutoBatch auto_batch: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: Editgroup
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.create_webcapture_auto_batch_with_http_info(auto_batch, **kwargs)  # noqa: E501
-        else:
-            (data) = self.create_webcapture_auto_batch_with_http_info(auto_batch, **kwargs)  # noqa: E501
-            return data
+        return self.create_webcapture_auto_batch_with_http_info(auto_batch, **kwargs)  # noqa: E501
 
     def create_webcapture_auto_batch_with_http_info(self, auto_batch, **kwargs):  # noqa: E501
         """create_webcapture_auto_batch  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_webcapture_auto_batch_with_http_info(auto_batch, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_webcapture_auto_batch_with_http_info(auto_batch, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param WebcaptureAutoBatch auto_batch: (required)
-        :return: Editgroup
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(Editgroup, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['auto_batch']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method create_webcapture_auto_batch" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'auto_batch' is set
-        if ('auto_batch' not in params or
-                params['auto_batch'] is None):
-            raise ValueError("Missing the required parameter `auto_batch` when calling `create_webcapture_auto_batch`")  # noqa: E501
+        if ('auto_batch' not in local_var_params or
+                local_var_params['auto_batch'] is None):
+            raise ApiValueError("Missing the required parameter `auto_batch` when calling `create_webcapture_auto_batch`")  # noqa: E501
 
         collection_formats = {}
 
@@ -1842,8 +2068,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'auto_batch' in params:
-            body_params = params['auto_batch']
+        if 'auto_batch' in local_var_params:
+            body_params = local_var_params['auto_batch']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -1865,79 +2091,92 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='Editgroup',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def create_work(self, editgroup_id, entity, **kwargs):  # noqa: E501
         """create_work  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_work(editgroup_id, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_work(editgroup_id, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param WorkEntity entity: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.create_work_with_http_info(editgroup_id, entity, **kwargs)  # noqa: E501
-        else:
-            (data) = self.create_work_with_http_info(editgroup_id, entity, **kwargs)  # noqa: E501
-            return data
+        return self.create_work_with_http_info(editgroup_id, entity, **kwargs)  # noqa: E501
 
     def create_work_with_http_info(self, editgroup_id, entity, **kwargs):  # noqa: E501
         """create_work  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_work_with_http_info(editgroup_id, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_work_with_http_info(editgroup_id, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param WorkEntity entity: (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'entity']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method create_work" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `create_work`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `create_work`")  # noqa: E501
         # verify the required parameter 'entity' is set
-        if ('entity' not in params or
-                params['entity'] is None):
-            raise ValueError("Missing the required parameter `entity` when calling `create_work`")  # noqa: E501
+        if ('entity' not in local_var_params or
+                local_var_params['entity'] is None):
+            raise ApiValueError("Missing the required parameter `entity` when calling `create_work`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
 
         query_params = []
 
@@ -1947,8 +2186,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'entity' in params:
-            body_params = params['entity']
+        if 'entity' in local_var_params:
+            body_params = local_var_params['entity']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -1970,67 +2209,80 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def create_work_auto_batch(self, auto_batch, **kwargs):  # noqa: E501
         """create_work_auto_batch  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_work_auto_batch(auto_batch, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_work_auto_batch(auto_batch, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param WorkAutoBatch auto_batch: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: Editgroup
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.create_work_auto_batch_with_http_info(auto_batch, **kwargs)  # noqa: E501
-        else:
-            (data) = self.create_work_auto_batch_with_http_info(auto_batch, **kwargs)  # noqa: E501
-            return data
+        return self.create_work_auto_batch_with_http_info(auto_batch, **kwargs)  # noqa: E501
 
     def create_work_auto_batch_with_http_info(self, auto_batch, **kwargs):  # noqa: E501
         """create_work_auto_batch  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_work_auto_batch_with_http_info(auto_batch, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_work_auto_batch_with_http_info(auto_batch, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param WorkAutoBatch auto_batch: (required)
-        :return: Editgroup
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(Editgroup, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['auto_batch']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method create_work_auto_batch" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'auto_batch' is set
-        if ('auto_batch' not in params or
-                params['auto_batch'] is None):
-            raise ValueError("Missing the required parameter `auto_batch` when calling `create_work_auto_batch`")  # noqa: E501
+        if ('auto_batch' not in local_var_params or
+                local_var_params['auto_batch'] is None):
+            raise ApiValueError("Missing the required parameter `auto_batch` when calling `create_work_auto_batch`")  # noqa: E501
 
         collection_formats = {}
 
@@ -2044,8 +2296,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'auto_batch' in params:
-            body_params = params['auto_batch']
+        if 'auto_batch' in local_var_params:
+            body_params = local_var_params['auto_batch']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -2067,10 +2319,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='Editgroup',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def delete_container(self, editgroup_id, ident, **kwargs):  # noqa: E501
@@ -2078,72 +2330,85 @@ class DefaultApi(object):
 
         Creates a new \"deletion\" edit for a specific entity as part of an existing editgroup.  This is not the method to use to remove an edit from an editgroup; for that use `delete_container_edit`.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_container(editgroup_id, ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_container(editgroup_id, ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.delete_container_with_http_info(editgroup_id, ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.delete_container_with_http_info(editgroup_id, ident, **kwargs)  # noqa: E501
-            return data
+        return self.delete_container_with_http_info(editgroup_id, ident, **kwargs)  # noqa: E501
 
     def delete_container_with_http_info(self, editgroup_id, ident, **kwargs):  # noqa: E501
         """delete_container  # noqa: E501
 
         Creates a new \"deletion\" edit for a specific entity as part of an existing editgroup.  This is not the method to use to remove an edit from an editgroup; for that use `delete_container_edit`.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_container_with_http_info(editgroup_id, ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_container_with_http_info(editgroup_id, ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'ident']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method delete_container" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `delete_container`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `delete_container`")  # noqa: E501
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `delete_container`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `delete_container`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
 
@@ -2157,10 +2422,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['Bearer']  # noqa: E501
 
@@ -2174,10 +2435,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def delete_container_edit(self, editgroup_id, edit_id, **kwargs):  # noqa: E501
@@ -2185,80 +2446,93 @@ class DefaultApi(object):
 
         Removes a single edit from the specified editgroup. The editgroup must be mutable (aka, not accepted/merged), and the editor making this request must have permission (aka, have created the editgroup or hold the `admin` role).  Not to be confused with the `delete_container` method, which *creates* a new edit in the given editgroup.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_container_edit(editgroup_id, edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_container_edit(editgroup_id, edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: Success
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.delete_container_edit_with_http_info(editgroup_id, edit_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.delete_container_edit_with_http_info(editgroup_id, edit_id, **kwargs)  # noqa: E501
-            return data
+        return self.delete_container_edit_with_http_info(editgroup_id, edit_id, **kwargs)  # noqa: E501
 
     def delete_container_edit_with_http_info(self, editgroup_id, edit_id, **kwargs):  # noqa: E501
         """delete_container_edit  # noqa: E501
 
         Removes a single edit from the specified editgroup. The editgroup must be mutable (aka, not accepted/merged), and the editor making this request must have permission (aka, have created the editgroup or hold the `admin` role).  Not to be confused with the `delete_container` method, which *creates* a new edit in the given editgroup.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_container_edit_with_http_info(editgroup_id, edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_container_edit_with_http_info(editgroup_id, edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
-        :return: Success
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(Success, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'edit_id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method delete_container_edit" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `delete_container_edit`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `delete_container_edit`")  # noqa: E501
         # verify the required parameter 'edit_id' is set
-        if ('edit_id' not in params or
-                params['edit_id'] is None):
-            raise ValueError("Missing the required parameter `edit_id` when calling `delete_container_edit`")  # noqa: E501
-
-        if ('edit_id' in params and
-                len(params['edit_id']) > 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `delete_container_edit`, length must be less than or equal to `36`")  # noqa: E501
-        if ('edit_id' in params and
-                len(params['edit_id']) < 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `delete_container_edit`, length must be greater than or equal to `36`")  # noqa: E501
-        if 'edit_id' in params and not re.search('[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', params['edit_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `edit_id` when calling `delete_container_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
+        if ('edit_id' not in local_var_params or
+                local_var_params['edit_id'] is None):
+            raise ApiValueError("Missing the required parameter `edit_id` when calling `delete_container_edit`")  # noqa: E501
+
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) > 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `delete_container_edit`, length must be less than or equal to `36`")  # noqa: E501
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) < 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `delete_container_edit`, length must be greater than or equal to `36`")  # noqa: E501
+        if 'edit_id' in local_var_params and not re.search(r'[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', local_var_params['edit_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `delete_container_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
-        if 'edit_id' in params:
-            path_params['edit_id'] = params['edit_id']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
+        if 'edit_id' in local_var_params:
+            path_params['edit_id'] = local_var_params['edit_id']  # noqa: E501
 
         query_params = []
 
@@ -2272,10 +2546,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['Bearer']  # noqa: E501
 
@@ -2289,81 +2559,94 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='Success',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def delete_creator(self, editgroup_id, ident, **kwargs):  # noqa: E501
         """delete_creator  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_creator(editgroup_id, ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_creator(editgroup_id, ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.delete_creator_with_http_info(editgroup_id, ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.delete_creator_with_http_info(editgroup_id, ident, **kwargs)  # noqa: E501
-            return data
+        return self.delete_creator_with_http_info(editgroup_id, ident, **kwargs)  # noqa: E501
 
     def delete_creator_with_http_info(self, editgroup_id, ident, **kwargs):  # noqa: E501
         """delete_creator  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_creator_with_http_info(editgroup_id, ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_creator_with_http_info(editgroup_id, ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'ident']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method delete_creator" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `delete_creator`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `delete_creator`")  # noqa: E501
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `delete_creator`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `delete_creator`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
 
@@ -2377,10 +2660,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['Bearer']  # noqa: E501
 
@@ -2394,89 +2673,102 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def delete_creator_edit(self, editgroup_id, edit_id, **kwargs):  # noqa: E501
         """delete_creator_edit  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_creator_edit(editgroup_id, edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_creator_edit(editgroup_id, edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: Success
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.delete_creator_edit_with_http_info(editgroup_id, edit_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.delete_creator_edit_with_http_info(editgroup_id, edit_id, **kwargs)  # noqa: E501
-            return data
+        return self.delete_creator_edit_with_http_info(editgroup_id, edit_id, **kwargs)  # noqa: E501
 
     def delete_creator_edit_with_http_info(self, editgroup_id, edit_id, **kwargs):  # noqa: E501
         """delete_creator_edit  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_creator_edit_with_http_info(editgroup_id, edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_creator_edit_with_http_info(editgroup_id, edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
-        :return: Success
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(Success, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'edit_id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method delete_creator_edit" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `delete_creator_edit`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `delete_creator_edit`")  # noqa: E501
         # verify the required parameter 'edit_id' is set
-        if ('edit_id' not in params or
-                params['edit_id'] is None):
-            raise ValueError("Missing the required parameter `edit_id` when calling `delete_creator_edit`")  # noqa: E501
-
-        if ('edit_id' in params and
-                len(params['edit_id']) > 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `delete_creator_edit`, length must be less than or equal to `36`")  # noqa: E501
-        if ('edit_id' in params and
-                len(params['edit_id']) < 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `delete_creator_edit`, length must be greater than or equal to `36`")  # noqa: E501
-        if 'edit_id' in params and not re.search('[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', params['edit_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `edit_id` when calling `delete_creator_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
+        if ('edit_id' not in local_var_params or
+                local_var_params['edit_id'] is None):
+            raise ApiValueError("Missing the required parameter `edit_id` when calling `delete_creator_edit`")  # noqa: E501
+
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) > 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `delete_creator_edit`, length must be less than or equal to `36`")  # noqa: E501
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) < 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `delete_creator_edit`, length must be greater than or equal to `36`")  # noqa: E501
+        if 'edit_id' in local_var_params and not re.search(r'[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', local_var_params['edit_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `delete_creator_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
-        if 'edit_id' in params:
-            path_params['edit_id'] = params['edit_id']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
+        if 'edit_id' in local_var_params:
+            path_params['edit_id'] = local_var_params['edit_id']  # noqa: E501
 
         query_params = []
 
@@ -2490,10 +2782,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['Bearer']  # noqa: E501
 
@@ -2507,81 +2795,94 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='Success',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def delete_file(self, editgroup_id, ident, **kwargs):  # noqa: E501
         """delete_file  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_file(editgroup_id, ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_file(editgroup_id, ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.delete_file_with_http_info(editgroup_id, ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.delete_file_with_http_info(editgroup_id, ident, **kwargs)  # noqa: E501
-            return data
+        return self.delete_file_with_http_info(editgroup_id, ident, **kwargs)  # noqa: E501
 
     def delete_file_with_http_info(self, editgroup_id, ident, **kwargs):  # noqa: E501
         """delete_file  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_file_with_http_info(editgroup_id, ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_file_with_http_info(editgroup_id, ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'ident']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method delete_file" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `delete_file`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `delete_file`")  # noqa: E501
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `delete_file`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `delete_file`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
 
@@ -2595,10 +2896,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['Bearer']  # noqa: E501
 
@@ -2612,89 +2909,102 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def delete_file_edit(self, editgroup_id, edit_id, **kwargs):  # noqa: E501
         """delete_file_edit  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_file_edit(editgroup_id, edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_file_edit(editgroup_id, edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: Success
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.delete_file_edit_with_http_info(editgroup_id, edit_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.delete_file_edit_with_http_info(editgroup_id, edit_id, **kwargs)  # noqa: E501
-            return data
+        return self.delete_file_edit_with_http_info(editgroup_id, edit_id, **kwargs)  # noqa: E501
 
     def delete_file_edit_with_http_info(self, editgroup_id, edit_id, **kwargs):  # noqa: E501
         """delete_file_edit  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_file_edit_with_http_info(editgroup_id, edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_file_edit_with_http_info(editgroup_id, edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
-        :return: Success
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(Success, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'edit_id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method delete_file_edit" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `delete_file_edit`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `delete_file_edit`")  # noqa: E501
         # verify the required parameter 'edit_id' is set
-        if ('edit_id' not in params or
-                params['edit_id'] is None):
-            raise ValueError("Missing the required parameter `edit_id` when calling `delete_file_edit`")  # noqa: E501
-
-        if ('edit_id' in params and
-                len(params['edit_id']) > 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `delete_file_edit`, length must be less than or equal to `36`")  # noqa: E501
-        if ('edit_id' in params and
-                len(params['edit_id']) < 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `delete_file_edit`, length must be greater than or equal to `36`")  # noqa: E501
-        if 'edit_id' in params and not re.search('[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', params['edit_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `edit_id` when calling `delete_file_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
+        if ('edit_id' not in local_var_params or
+                local_var_params['edit_id'] is None):
+            raise ApiValueError("Missing the required parameter `edit_id` when calling `delete_file_edit`")  # noqa: E501
+
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) > 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `delete_file_edit`, length must be less than or equal to `36`")  # noqa: E501
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) < 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `delete_file_edit`, length must be greater than or equal to `36`")  # noqa: E501
+        if 'edit_id' in local_var_params and not re.search(r'[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', local_var_params['edit_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `delete_file_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
-        if 'edit_id' in params:
-            path_params['edit_id'] = params['edit_id']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
+        if 'edit_id' in local_var_params:
+            path_params['edit_id'] = local_var_params['edit_id']  # noqa: E501
 
         query_params = []
 
@@ -2708,10 +3018,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['Bearer']  # noqa: E501
 
@@ -2725,81 +3031,94 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='Success',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def delete_fileset(self, editgroup_id, ident, **kwargs):  # noqa: E501
         """delete_fileset  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_fileset(editgroup_id, ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_fileset(editgroup_id, ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.delete_fileset_with_http_info(editgroup_id, ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.delete_fileset_with_http_info(editgroup_id, ident, **kwargs)  # noqa: E501
-            return data
+        return self.delete_fileset_with_http_info(editgroup_id, ident, **kwargs)  # noqa: E501
 
     def delete_fileset_with_http_info(self, editgroup_id, ident, **kwargs):  # noqa: E501
         """delete_fileset  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_fileset_with_http_info(editgroup_id, ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_fileset_with_http_info(editgroup_id, ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'ident']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method delete_fileset" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `delete_fileset`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `delete_fileset`")  # noqa: E501
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `delete_fileset`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `delete_fileset`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
 
@@ -2813,10 +3132,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['Bearer']  # noqa: E501
 
@@ -2830,89 +3145,102 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def delete_fileset_edit(self, editgroup_id, edit_id, **kwargs):  # noqa: E501
         """delete_fileset_edit  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_fileset_edit(editgroup_id, edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_fileset_edit(editgroup_id, edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: Success
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.delete_fileset_edit_with_http_info(editgroup_id, edit_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.delete_fileset_edit_with_http_info(editgroup_id, edit_id, **kwargs)  # noqa: E501
-            return data
+        return self.delete_fileset_edit_with_http_info(editgroup_id, edit_id, **kwargs)  # noqa: E501
 
     def delete_fileset_edit_with_http_info(self, editgroup_id, edit_id, **kwargs):  # noqa: E501
         """delete_fileset_edit  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_fileset_edit_with_http_info(editgroup_id, edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_fileset_edit_with_http_info(editgroup_id, edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
-        :return: Success
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(Success, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'edit_id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method delete_fileset_edit" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `delete_fileset_edit`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `delete_fileset_edit`")  # noqa: E501
         # verify the required parameter 'edit_id' is set
-        if ('edit_id' not in params or
-                params['edit_id'] is None):
-            raise ValueError("Missing the required parameter `edit_id` when calling `delete_fileset_edit`")  # noqa: E501
-
-        if ('edit_id' in params and
-                len(params['edit_id']) > 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `delete_fileset_edit`, length must be less than or equal to `36`")  # noqa: E501
-        if ('edit_id' in params and
-                len(params['edit_id']) < 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `delete_fileset_edit`, length must be greater than or equal to `36`")  # noqa: E501
-        if 'edit_id' in params and not re.search('[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', params['edit_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `edit_id` when calling `delete_fileset_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
+        if ('edit_id' not in local_var_params or
+                local_var_params['edit_id'] is None):
+            raise ApiValueError("Missing the required parameter `edit_id` when calling `delete_fileset_edit`")  # noqa: E501
+
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) > 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `delete_fileset_edit`, length must be less than or equal to `36`")  # noqa: E501
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) < 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `delete_fileset_edit`, length must be greater than or equal to `36`")  # noqa: E501
+        if 'edit_id' in local_var_params and not re.search(r'[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', local_var_params['edit_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `delete_fileset_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
-        if 'edit_id' in params:
-            path_params['edit_id'] = params['edit_id']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
+        if 'edit_id' in local_var_params:
+            path_params['edit_id'] = local_var_params['edit_id']  # noqa: E501
 
         query_params = []
 
@@ -2926,10 +3254,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['Bearer']  # noqa: E501
 
@@ -2943,10 +3267,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='Success',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def delete_release(self, editgroup_id, ident, **kwargs):  # noqa: E501
@@ -2954,72 +3278,85 @@ class DefaultApi(object):
 
         Creates a new \"deletion\" edit for a specific entity as part of an existing editgroup.  This is not the method to use to remove an edit from an editgroup; for that use `delete_release_edit`.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_release(editgroup_id, ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_release(editgroup_id, ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.delete_release_with_http_info(editgroup_id, ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.delete_release_with_http_info(editgroup_id, ident, **kwargs)  # noqa: E501
-            return data
+        return self.delete_release_with_http_info(editgroup_id, ident, **kwargs)  # noqa: E501
 
     def delete_release_with_http_info(self, editgroup_id, ident, **kwargs):  # noqa: E501
         """delete_release  # noqa: E501
 
         Creates a new \"deletion\" edit for a specific entity as part of an existing editgroup.  This is not the method to use to remove an edit from an editgroup; for that use `delete_release_edit`.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_release_with_http_info(editgroup_id, ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_release_with_http_info(editgroup_id, ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'ident']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method delete_release" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `delete_release`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `delete_release`")  # noqa: E501
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `delete_release`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `delete_release`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
 
@@ -3033,10 +3370,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['Bearer']  # noqa: E501
 
@@ -3050,10 +3383,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def delete_release_edit(self, editgroup_id, edit_id, **kwargs):  # noqa: E501
@@ -3061,80 +3394,93 @@ class DefaultApi(object):
 
         Removes a single edit from the specified editgroup. The editgroup must be mutable (aka, not accepted/merged), and the editor making this request must have permission (aka, have created the editgroup or hold the `admin` role).  Not to be confused with the `delete_container` method, which *creates* a new edit in the given editgroup.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_release_edit(editgroup_id, edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_release_edit(editgroup_id, edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: Success
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.delete_release_edit_with_http_info(editgroup_id, edit_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.delete_release_edit_with_http_info(editgroup_id, edit_id, **kwargs)  # noqa: E501
-            return data
+        return self.delete_release_edit_with_http_info(editgroup_id, edit_id, **kwargs)  # noqa: E501
 
     def delete_release_edit_with_http_info(self, editgroup_id, edit_id, **kwargs):  # noqa: E501
         """delete_release_edit  # noqa: E501
 
         Removes a single edit from the specified editgroup. The editgroup must be mutable (aka, not accepted/merged), and the editor making this request must have permission (aka, have created the editgroup or hold the `admin` role).  Not to be confused with the `delete_container` method, which *creates* a new edit in the given editgroup.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_release_edit_with_http_info(editgroup_id, edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_release_edit_with_http_info(editgroup_id, edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
-        :return: Success
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(Success, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'edit_id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method delete_release_edit" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `delete_release_edit`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `delete_release_edit`")  # noqa: E501
         # verify the required parameter 'edit_id' is set
-        if ('edit_id' not in params or
-                params['edit_id'] is None):
-            raise ValueError("Missing the required parameter `edit_id` when calling `delete_release_edit`")  # noqa: E501
-
-        if ('edit_id' in params and
-                len(params['edit_id']) > 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `delete_release_edit`, length must be less than or equal to `36`")  # noqa: E501
-        if ('edit_id' in params and
-                len(params['edit_id']) < 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `delete_release_edit`, length must be greater than or equal to `36`")  # noqa: E501
-        if 'edit_id' in params and not re.search('[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', params['edit_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `edit_id` when calling `delete_release_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
+        if ('edit_id' not in local_var_params or
+                local_var_params['edit_id'] is None):
+            raise ApiValueError("Missing the required parameter `edit_id` when calling `delete_release_edit`")  # noqa: E501
+
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) > 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `delete_release_edit`, length must be less than or equal to `36`")  # noqa: E501
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) < 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `delete_release_edit`, length must be greater than or equal to `36`")  # noqa: E501
+        if 'edit_id' in local_var_params and not re.search(r'[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', local_var_params['edit_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `delete_release_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
-        if 'edit_id' in params:
-            path_params['edit_id'] = params['edit_id']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
+        if 'edit_id' in local_var_params:
+            path_params['edit_id'] = local_var_params['edit_id']  # noqa: E501
 
         query_params = []
 
@@ -3148,10 +3494,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['Bearer']  # noqa: E501
 
@@ -3165,81 +3507,94 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='Success',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def delete_webcapture(self, editgroup_id, ident, **kwargs):  # noqa: E501
         """delete_webcapture  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_webcapture(editgroup_id, ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_webcapture(editgroup_id, ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.delete_webcapture_with_http_info(editgroup_id, ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.delete_webcapture_with_http_info(editgroup_id, ident, **kwargs)  # noqa: E501
-            return data
+        return self.delete_webcapture_with_http_info(editgroup_id, ident, **kwargs)  # noqa: E501
 
     def delete_webcapture_with_http_info(self, editgroup_id, ident, **kwargs):  # noqa: E501
         """delete_webcapture  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_webcapture_with_http_info(editgroup_id, ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_webcapture_with_http_info(editgroup_id, ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'ident']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method delete_webcapture" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `delete_webcapture`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `delete_webcapture`")  # noqa: E501
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `delete_webcapture`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `delete_webcapture`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
 
@@ -3253,10 +3608,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['Bearer']  # noqa: E501
 
@@ -3270,89 +3621,102 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def delete_webcapture_edit(self, editgroup_id, edit_id, **kwargs):  # noqa: E501
         """delete_webcapture_edit  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_webcapture_edit(editgroup_id, edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_webcapture_edit(editgroup_id, edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: Success
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.delete_webcapture_edit_with_http_info(editgroup_id, edit_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.delete_webcapture_edit_with_http_info(editgroup_id, edit_id, **kwargs)  # noqa: E501
-            return data
+        return self.delete_webcapture_edit_with_http_info(editgroup_id, edit_id, **kwargs)  # noqa: E501
 
     def delete_webcapture_edit_with_http_info(self, editgroup_id, edit_id, **kwargs):  # noqa: E501
         """delete_webcapture_edit  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_webcapture_edit_with_http_info(editgroup_id, edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_webcapture_edit_with_http_info(editgroup_id, edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
-        :return: Success
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(Success, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'edit_id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method delete_webcapture_edit" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `delete_webcapture_edit`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `delete_webcapture_edit`")  # noqa: E501
         # verify the required parameter 'edit_id' is set
-        if ('edit_id' not in params or
-                params['edit_id'] is None):
-            raise ValueError("Missing the required parameter `edit_id` when calling `delete_webcapture_edit`")  # noqa: E501
-
-        if ('edit_id' in params and
-                len(params['edit_id']) > 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `delete_webcapture_edit`, length must be less than or equal to `36`")  # noqa: E501
-        if ('edit_id' in params and
-                len(params['edit_id']) < 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `delete_webcapture_edit`, length must be greater than or equal to `36`")  # noqa: E501
-        if 'edit_id' in params and not re.search('[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', params['edit_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `edit_id` when calling `delete_webcapture_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
+        if ('edit_id' not in local_var_params or
+                local_var_params['edit_id'] is None):
+            raise ApiValueError("Missing the required parameter `edit_id` when calling `delete_webcapture_edit`")  # noqa: E501
+
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) > 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `delete_webcapture_edit`, length must be less than or equal to `36`")  # noqa: E501
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) < 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `delete_webcapture_edit`, length must be greater than or equal to `36`")  # noqa: E501
+        if 'edit_id' in local_var_params and not re.search(r'[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', local_var_params['edit_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `delete_webcapture_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
-        if 'edit_id' in params:
-            path_params['edit_id'] = params['edit_id']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
+        if 'edit_id' in local_var_params:
+            path_params['edit_id'] = local_var_params['edit_id']  # noqa: E501
 
         query_params = []
 
@@ -3366,10 +3730,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['Bearer']  # noqa: E501
 
@@ -3383,81 +3743,94 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='Success',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def delete_work(self, editgroup_id, ident, **kwargs):  # noqa: E501
         """delete_work  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_work(editgroup_id, ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_work(editgroup_id, ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.delete_work_with_http_info(editgroup_id, ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.delete_work_with_http_info(editgroup_id, ident, **kwargs)  # noqa: E501
-            return data
+        return self.delete_work_with_http_info(editgroup_id, ident, **kwargs)  # noqa: E501
 
     def delete_work_with_http_info(self, editgroup_id, ident, **kwargs):  # noqa: E501
         """delete_work  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_work_with_http_info(editgroup_id, ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_work_with_http_info(editgroup_id, ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'ident']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method delete_work" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `delete_work`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `delete_work`")  # noqa: E501
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `delete_work`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `delete_work`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
 
@@ -3471,10 +3844,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['Bearer']  # noqa: E501
 
@@ -3488,89 +3857,102 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def delete_work_edit(self, editgroup_id, edit_id, **kwargs):  # noqa: E501
         """delete_work_edit  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_work_edit(editgroup_id, edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_work_edit(editgroup_id, edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: Success
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.delete_work_edit_with_http_info(editgroup_id, edit_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.delete_work_edit_with_http_info(editgroup_id, edit_id, **kwargs)  # noqa: E501
-            return data
+        return self.delete_work_edit_with_http_info(editgroup_id, edit_id, **kwargs)  # noqa: E501
 
     def delete_work_edit_with_http_info(self, editgroup_id, edit_id, **kwargs):  # noqa: E501
         """delete_work_edit  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_work_edit_with_http_info(editgroup_id, edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_work_edit_with_http_info(editgroup_id, edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
-        :return: Success
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(Success, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'edit_id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method delete_work_edit" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `delete_work_edit`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `delete_work_edit`")  # noqa: E501
         # verify the required parameter 'edit_id' is set
-        if ('edit_id' not in params or
-                params['edit_id'] is None):
-            raise ValueError("Missing the required parameter `edit_id` when calling `delete_work_edit`")  # noqa: E501
-
-        if ('edit_id' in params and
-                len(params['edit_id']) > 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `delete_work_edit`, length must be less than or equal to `36`")  # noqa: E501
-        if ('edit_id' in params and
-                len(params['edit_id']) < 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `delete_work_edit`, length must be greater than or equal to `36`")  # noqa: E501
-        if 'edit_id' in params and not re.search('[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', params['edit_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `edit_id` when calling `delete_work_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
+        if ('edit_id' not in local_var_params or
+                local_var_params['edit_id'] is None):
+            raise ApiValueError("Missing the required parameter `edit_id` when calling `delete_work_edit`")  # noqa: E501
+
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) > 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `delete_work_edit`, length must be less than or equal to `36`")  # noqa: E501
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) < 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `delete_work_edit`, length must be greater than or equal to `36`")  # noqa: E501
+        if 'edit_id' in local_var_params and not re.search(r'[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', local_var_params['edit_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `delete_work_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
-        if 'edit_id' in params:
-            path_params['edit_id'] = params['edit_id']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
+        if 'edit_id' in local_var_params:
+            path_params['edit_id'] = local_var_params['edit_id']  # noqa: E501
 
         query_params = []
 
@@ -3584,10 +3966,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['Bearer']  # noqa: E501
 
@@ -3601,10 +3979,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='Success',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_changelog(self, **kwargs):  # noqa: E501
@@ -3612,62 +3990,75 @@ class DefaultApi(object):
 
         Returns a list of the most recent changelog entries accepted (merged) into the catalog.  List is sorted by changelog index in descending order. Note that the accepted timestamp roughly corresponds to order, but not strictly; there exist out-of-order timestamps on the order of several seconds.  As a known database issue, it is technically possible for there to be a gap in changelog index numbers (aka, a missing changelog entry). There are no currently known gaps and this is considered a bug that will be addressed.  There are millions of entries; to paginate through all of them, use this method to discover the highest existing entry number, then request the entries using `get_changelog_entry` one at a time.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_changelog(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_changelog(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param int limit: Maximum count of changelog entries to return in response
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: list[ChangelogEntry]
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_changelog_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.get_changelog_with_http_info(**kwargs)  # noqa: E501
-            return data
+        return self.get_changelog_with_http_info(**kwargs)  # noqa: E501
 
     def get_changelog_with_http_info(self, **kwargs):  # noqa: E501
         """get_changelog  # noqa: E501
 
         Returns a list of the most recent changelog entries accepted (merged) into the catalog.  List is sorted by changelog index in descending order. Note that the accepted timestamp roughly corresponds to order, but not strictly; there exist out-of-order timestamps on the order of several seconds.  As a known database issue, it is technically possible for there to be a gap in changelog index numbers (aka, a missing changelog entry). There are no currently known gaps and this is considered a bug that will be addressed.  There are millions of entries; to paginate through all of them, use this method to discover the highest existing entry number, then request the entries using `get_changelog_entry` one at a time.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_changelog_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_changelog_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param int limit: Maximum count of changelog entries to return in response
-        :return: list[ChangelogEntry]
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(list[ChangelogEntry], status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['limit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_changelog" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
 
         collection_formats = {}
 
         path_params = {}
 
         query_params = []
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
+        if 'limit' in local_var_params:
+            query_params.append(('limit', local_var_params['limit']))  # noqa: E501
 
         header_params = {}
 
@@ -3679,10 +4070,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -3696,10 +4083,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='list[ChangelogEntry]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_changelog_entry(self, index, **kwargs):  # noqa: E501
@@ -3707,64 +4094,77 @@ class DefaultApi(object):
 
         Returns a single changelog entry.  As a known database issue, it is technically possible for there to be a gap in changelog index numbers (aka, a missing changelog entry). There are no currently known gaps and this is considered a bug that will be addressed.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_changelog_entry(index, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_changelog_entry(index, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param int index: Changelog index of entry to return (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: ChangelogEntry
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_changelog_entry_with_http_info(index, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_changelog_entry_with_http_info(index, **kwargs)  # noqa: E501
-            return data
+        return self.get_changelog_entry_with_http_info(index, **kwargs)  # noqa: E501
 
     def get_changelog_entry_with_http_info(self, index, **kwargs):  # noqa: E501
         """get_changelog_entry  # noqa: E501
 
         Returns a single changelog entry.  As a known database issue, it is technically possible for there to be a gap in changelog index numbers (aka, a missing changelog entry). There are no currently known gaps and this is considered a bug that will be addressed.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_changelog_entry_with_http_info(index, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_changelog_entry_with_http_info(index, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param int index: Changelog index of entry to return (required)
-        :return: ChangelogEntry
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(ChangelogEntry, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['index']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_changelog_entry" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'index' is set
-        if ('index' not in params or
-                params['index'] is None):
-            raise ValueError("Missing the required parameter `index` when calling `get_changelog_entry`")  # noqa: E501
+        if ('index' not in local_var_params or
+                local_var_params['index'] is None):
+            raise ApiValueError("Missing the required parameter `index` when calling `get_changelog_entry`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'index' in params:
-            path_params['index'] = params['index']  # noqa: E501
+        if 'index' in local_var_params:
+            path_params['index'] = local_var_params['index']  # noqa: E501
 
         query_params = []
 
@@ -3778,10 +4178,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -3795,10 +4191,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='ChangelogEntry',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_container(self, ident, **kwargs):  # noqa: E501
@@ -3806,74 +4202,87 @@ class DefaultApi(object):
 
         Fetches a single container entity from the catalog.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_container(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_container(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param str expand: List of sub-entities to expand in response. For containers, none accepted (yet).
         :param str hide: List of entity fields to elide in response. For containers, none accepted (yet).
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: ContainerEntity
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_container_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_container_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_container_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_container_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_container  # noqa: E501
 
         Fetches a single container entity from the catalog.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_container_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_container_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param str expand: List of sub-entities to expand in response. For containers, none accepted (yet).
         :param str hide: List of entity fields to elide in response. For containers, none accepted (yet).
-        :return: ContainerEntity
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(ContainerEntity, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident', 'expand', 'hide']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_container" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_container`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_container`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
-        if 'expand' in params:
-            query_params.append(('expand', params['expand']))  # noqa: E501
-        if 'hide' in params:
-            query_params.append(('hide', params['hide']))  # noqa: E501
+        if 'expand' in local_var_params:
+            query_params.append(('expand', local_var_params['expand']))  # noqa: E501
+        if 'hide' in local_var_params:
+            query_params.append(('hide', local_var_params['hide']))  # noqa: E501
 
         header_params = {}
 
@@ -3885,10 +4294,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -3902,10 +4307,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='ContainerEntity',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_container_edit(self, edit_id, **kwargs):  # noqa: E501
@@ -3913,72 +4318,85 @@ class DefaultApi(object):
 
         Returns the entity edit object with the given identifier. This method is expected to be used rarely.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_container_edit(edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_container_edit(edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_container_edit_with_http_info(edit_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_container_edit_with_http_info(edit_id, **kwargs)  # noqa: E501
-            return data
+        return self.get_container_edit_with_http_info(edit_id, **kwargs)  # noqa: E501
 
     def get_container_edit_with_http_info(self, edit_id, **kwargs):  # noqa: E501
         """get_container_edit  # noqa: E501
 
         Returns the entity edit object with the given identifier. This method is expected to be used rarely.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_container_edit_with_http_info(edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_container_edit_with_http_info(edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['edit_id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_container_edit" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'edit_id' is set
-        if ('edit_id' not in params or
-                params['edit_id'] is None):
-            raise ValueError("Missing the required parameter `edit_id` when calling `get_container_edit`")  # noqa: E501
-
-        if ('edit_id' in params and
-                len(params['edit_id']) > 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `get_container_edit`, length must be less than or equal to `36`")  # noqa: E501
-        if ('edit_id' in params and
-                len(params['edit_id']) < 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `get_container_edit`, length must be greater than or equal to `36`")  # noqa: E501
-        if 'edit_id' in params and not re.search('[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', params['edit_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `edit_id` when calling `get_container_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
+        if ('edit_id' not in local_var_params or
+                local_var_params['edit_id'] is None):
+            raise ApiValueError("Missing the required parameter `edit_id` when calling `get_container_edit`")  # noqa: E501
+
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) > 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `get_container_edit`, length must be less than or equal to `36`")  # noqa: E501
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) < 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `get_container_edit`, length must be greater than or equal to `36`")  # noqa: E501
+        if 'edit_id' in local_var_params and not re.search(r'[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', local_var_params['edit_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `get_container_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'edit_id' in params:
-            path_params['edit_id'] = params['edit_id']  # noqa: E501
+        if 'edit_id' in local_var_params:
+            path_params['edit_id'] = local_var_params['edit_id']  # noqa: E501
 
         query_params = []
 
@@ -3992,10 +4410,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -4009,10 +4423,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_container_history(self, ident, **kwargs):  # noqa: E501
@@ -4020,70 +4434,83 @@ class DefaultApi(object):
 
         Fetches the history of accepted edits (changelog entries) for a specific entity fatcat identifier.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_container_history(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_container_history(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param int limit: Maximum number of changelog entries to return
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: list[EntityHistoryEntry]
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_container_history_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_container_history_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_container_history_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_container_history_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_container_history  # noqa: E501
 
         Fetches the history of accepted edits (changelog entries) for a specific entity fatcat identifier.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_container_history_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_container_history_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param int limit: Maximum number of changelog entries to return
-        :return: list[EntityHistoryEntry]
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(list[EntityHistoryEntry], status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident', 'limit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_container_history" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_container_history`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_container_history`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
+        if 'limit' in local_var_params:
+            query_params.append(('limit', local_var_params['limit']))  # noqa: E501
 
         header_params = {}
 
@@ -4095,10 +4522,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -4112,10 +4535,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='list[EntityHistoryEntry]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_container_redirects(self, ident, **kwargs):  # noqa: E501
@@ -4123,64 +4546,77 @@ class DefaultApi(object):
 
         Returns the set of entity identifiers which currently redirect to this identifier.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_container_redirects(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_container_redirects(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: list[str]
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_container_redirects_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_container_redirects_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_container_redirects_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_container_redirects_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_container_redirects  # noqa: E501
 
         Returns the set of entity identifiers which currently redirect to this identifier.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_container_redirects_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_container_redirects_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
-        :return: list[str]
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(list[str], status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_container_redirects" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_container_redirects`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_container_redirects`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
 
@@ -4194,10 +4630,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -4211,10 +4643,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='list[str]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_container_revision(self, rev_id, **kwargs):  # noqa: E501
@@ -4222,82 +4654,95 @@ class DefaultApi(object):
 
         Fetches a specific entity revision. Note that the returned revision will not be associated with any particular fatcat identifier (even if one or more identifiers do currently point to this revision). The revision may even be part of an un-merged editgroup.  Revisions are immutable and can not be deleted or updated.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_container_revision(rev_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_container_revision(rev_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str rev_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
         :param str expand: List of sub-entities to expand in response. See `get_container`.
         :param str hide: List of entity fields to elide in response. See `get_container`.
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: ContainerEntity
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_container_revision_with_http_info(rev_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_container_revision_with_http_info(rev_id, **kwargs)  # noqa: E501
-            return data
+        return self.get_container_revision_with_http_info(rev_id, **kwargs)  # noqa: E501
 
     def get_container_revision_with_http_info(self, rev_id, **kwargs):  # noqa: E501
         """get_container_revision  # noqa: E501
 
         Fetches a specific entity revision. Note that the returned revision will not be associated with any particular fatcat identifier (even if one or more identifiers do currently point to this revision). The revision may even be part of an un-merged editgroup.  Revisions are immutable and can not be deleted or updated.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_container_revision_with_http_info(rev_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_container_revision_with_http_info(rev_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str rev_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
         :param str expand: List of sub-entities to expand in response. See `get_container`.
         :param str hide: List of entity fields to elide in response. See `get_container`.
-        :return: ContainerEntity
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(ContainerEntity, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['rev_id', 'expand', 'hide']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_container_revision" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'rev_id' is set
-        if ('rev_id' not in params or
-                params['rev_id'] is None):
-            raise ValueError("Missing the required parameter `rev_id` when calling `get_container_revision`")  # noqa: E501
-
-        if ('rev_id' in params and
-                len(params['rev_id']) > 36):
-            raise ValueError("Invalid value for parameter `rev_id` when calling `get_container_revision`, length must be less than or equal to `36`")  # noqa: E501
-        if ('rev_id' in params and
-                len(params['rev_id']) < 36):
-            raise ValueError("Invalid value for parameter `rev_id` when calling `get_container_revision`, length must be greater than or equal to `36`")  # noqa: E501
-        if 'rev_id' in params and not re.search('[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', params['rev_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `rev_id` when calling `get_container_revision`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
+        if ('rev_id' not in local_var_params or
+                local_var_params['rev_id'] is None):
+            raise ApiValueError("Missing the required parameter `rev_id` when calling `get_container_revision`")  # noqa: E501
+
+        if ('rev_id' in local_var_params and
+                len(local_var_params['rev_id']) > 36):
+            raise ApiValueError("Invalid value for parameter `rev_id` when calling `get_container_revision`, length must be less than or equal to `36`")  # noqa: E501
+        if ('rev_id' in local_var_params and
+                len(local_var_params['rev_id']) < 36):
+            raise ApiValueError("Invalid value for parameter `rev_id` when calling `get_container_revision`, length must be greater than or equal to `36`")  # noqa: E501
+        if 'rev_id' in local_var_params and not re.search(r'[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', local_var_params['rev_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `rev_id` when calling `get_container_revision`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'rev_id' in params:
-            path_params['rev_id'] = params['rev_id']  # noqa: E501
+        if 'rev_id' in local_var_params:
+            path_params['rev_id'] = local_var_params['rev_id']  # noqa: E501
 
         query_params = []
-        if 'expand' in params:
-            query_params.append(('expand', params['expand']))  # noqa: E501
-        if 'hide' in params:
-            query_params.append(('hide', params['hide']))  # noqa: E501
+        if 'expand' in local_var_params:
+            query_params.append(('expand', local_var_params['expand']))  # noqa: E501
+        if 'hide' in local_var_params:
+            query_params.append(('hide', local_var_params['hide']))  # noqa: E501
 
         header_params = {}
 
@@ -4309,10 +4754,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -4326,83 +4767,96 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='ContainerEntity',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_creator(self, ident, **kwargs):  # noqa: E501
         """get_creator  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_creator(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_creator(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param str expand: List of sub-entities to expand in response. For creators, none accepted (yet).
         :param str hide: List of entity fields to elide in response. For creators, none accepted (yet).
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: CreatorEntity
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_creator_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_creator_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_creator_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_creator_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_creator  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_creator_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_creator_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param str expand: List of sub-entities to expand in response. For creators, none accepted (yet).
         :param str hide: List of entity fields to elide in response. For creators, none accepted (yet).
-        :return: CreatorEntity
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(CreatorEntity, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident', 'expand', 'hide']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_creator" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_creator`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_creator`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
-        if 'expand' in params:
-            query_params.append(('expand', params['expand']))  # noqa: E501
-        if 'hide' in params:
-            query_params.append(('hide', params['hide']))  # noqa: E501
+        if 'expand' in local_var_params:
+            query_params.append(('expand', local_var_params['expand']))  # noqa: E501
+        if 'hide' in local_var_params:
+            query_params.append(('hide', local_var_params['hide']))  # noqa: E501
 
         header_params = {}
 
@@ -4414,10 +4868,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -4431,81 +4881,94 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='CreatorEntity',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_creator_edit(self, edit_id, **kwargs):  # noqa: E501
         """get_creator_edit  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_creator_edit(edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_creator_edit(edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_creator_edit_with_http_info(edit_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_creator_edit_with_http_info(edit_id, **kwargs)  # noqa: E501
-            return data
+        return self.get_creator_edit_with_http_info(edit_id, **kwargs)  # noqa: E501
 
     def get_creator_edit_with_http_info(self, edit_id, **kwargs):  # noqa: E501
         """get_creator_edit  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_creator_edit_with_http_info(edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_creator_edit_with_http_info(edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['edit_id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_creator_edit" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'edit_id' is set
-        if ('edit_id' not in params or
-                params['edit_id'] is None):
-            raise ValueError("Missing the required parameter `edit_id` when calling `get_creator_edit`")  # noqa: E501
-
-        if ('edit_id' in params and
-                len(params['edit_id']) > 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `get_creator_edit`, length must be less than or equal to `36`")  # noqa: E501
-        if ('edit_id' in params and
-                len(params['edit_id']) < 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `get_creator_edit`, length must be greater than or equal to `36`")  # noqa: E501
-        if 'edit_id' in params and not re.search('[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', params['edit_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `edit_id` when calling `get_creator_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
+        if ('edit_id' not in local_var_params or
+                local_var_params['edit_id'] is None):
+            raise ApiValueError("Missing the required parameter `edit_id` when calling `get_creator_edit`")  # noqa: E501
+
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) > 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `get_creator_edit`, length must be less than or equal to `36`")  # noqa: E501
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) < 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `get_creator_edit`, length must be greater than or equal to `36`")  # noqa: E501
+        if 'edit_id' in local_var_params and not re.search(r'[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', local_var_params['edit_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `get_creator_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'edit_id' in params:
-            path_params['edit_id'] = params['edit_id']  # noqa: E501
+        if 'edit_id' in local_var_params:
+            path_params['edit_id'] = local_var_params['edit_id']  # noqa: E501
 
         query_params = []
 
@@ -4519,10 +4982,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -4536,79 +4995,92 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_creator_history(self, ident, **kwargs):  # noqa: E501
         """get_creator_history  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_creator_history(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_creator_history(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param int limit:
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: list[EntityHistoryEntry]
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_creator_history_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_creator_history_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_creator_history_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_creator_history_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_creator_history  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_creator_history_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_creator_history_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param int limit:
-        :return: list[EntityHistoryEntry]
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(list[EntityHistoryEntry], status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident', 'limit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_creator_history" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_creator_history`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_creator_history`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
+        if 'limit' in local_var_params:
+            query_params.append(('limit', local_var_params['limit']))  # noqa: E501
 
         header_params = {}
 
@@ -4620,10 +5092,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -4637,73 +5105,86 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='list[EntityHistoryEntry]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_creator_redirects(self, ident, **kwargs):  # noqa: E501
         """get_creator_redirects  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_creator_redirects(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_creator_redirects(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: list[str]
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_creator_redirects_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_creator_redirects_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_creator_redirects_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_creator_redirects_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_creator_redirects  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_creator_redirects_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_creator_redirects_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
-        :return: list[str]
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(list[str], status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_creator_redirects" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_creator_redirects`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_creator_redirects`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
 
@@ -4717,10 +5198,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -4734,10 +5211,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='list[str]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_creator_releases(self, ident, **kwargs):  # noqa: E501
@@ -4745,70 +5222,83 @@ class DefaultApi(object):
 
         Returns the set of Release entities having a `contrib` entry pointing to the creator entity.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_creator_releases(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_creator_releases(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param str hide: List of entity fields to elide in response. See `get_release`.
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: list[ReleaseEntity]
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_creator_releases_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_creator_releases_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_creator_releases_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_creator_releases_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_creator_releases  # noqa: E501
 
         Returns the set of Release entities having a `contrib` entry pointing to the creator entity.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_creator_releases_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_creator_releases_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param str hide: List of entity fields to elide in response. See `get_release`.
-        :return: list[ReleaseEntity]
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(list[ReleaseEntity], status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident', 'hide']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_creator_releases" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_creator_releases`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_creator_releases`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
-        if 'hide' in params:
-            query_params.append(('hide', params['hide']))  # noqa: E501
+        if 'hide' in local_var_params:
+            query_params.append(('hide', local_var_params['hide']))  # noqa: E501
 
         header_params = {}
 
@@ -4820,10 +5310,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -4837,91 +5323,104 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='list[ReleaseEntity]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_creator_revision(self, rev_id, **kwargs):  # noqa: E501
         """get_creator_revision  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_creator_revision(rev_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_creator_revision(rev_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str rev_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
         :param str expand: List of sub-entities to expand in response. See `get_creator`, though note that identifier-based expansions (like `releases`) will always be empty for revisions. 
         :param str hide: List of entity fields to elide in response. See `get_creator`.
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: CreatorEntity
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_creator_revision_with_http_info(rev_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_creator_revision_with_http_info(rev_id, **kwargs)  # noqa: E501
-            return data
+        return self.get_creator_revision_with_http_info(rev_id, **kwargs)  # noqa: E501
 
     def get_creator_revision_with_http_info(self, rev_id, **kwargs):  # noqa: E501
         """get_creator_revision  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_creator_revision_with_http_info(rev_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_creator_revision_with_http_info(rev_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str rev_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
         :param str expand: List of sub-entities to expand in response. See `get_creator`, though note that identifier-based expansions (like `releases`) will always be empty for revisions. 
         :param str hide: List of entity fields to elide in response. See `get_creator`.
-        :return: CreatorEntity
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(CreatorEntity, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['rev_id', 'expand', 'hide']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_creator_revision" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'rev_id' is set
-        if ('rev_id' not in params or
-                params['rev_id'] is None):
-            raise ValueError("Missing the required parameter `rev_id` when calling `get_creator_revision`")  # noqa: E501
-
-        if ('rev_id' in params and
-                len(params['rev_id']) > 36):
-            raise ValueError("Invalid value for parameter `rev_id` when calling `get_creator_revision`, length must be less than or equal to `36`")  # noqa: E501
-        if ('rev_id' in params and
-                len(params['rev_id']) < 36):
-            raise ValueError("Invalid value for parameter `rev_id` when calling `get_creator_revision`, length must be greater than or equal to `36`")  # noqa: E501
-        if 'rev_id' in params and not re.search('[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', params['rev_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `rev_id` when calling `get_creator_revision`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
+        if ('rev_id' not in local_var_params or
+                local_var_params['rev_id'] is None):
+            raise ApiValueError("Missing the required parameter `rev_id` when calling `get_creator_revision`")  # noqa: E501
+
+        if ('rev_id' in local_var_params and
+                len(local_var_params['rev_id']) > 36):
+            raise ApiValueError("Invalid value for parameter `rev_id` when calling `get_creator_revision`, length must be less than or equal to `36`")  # noqa: E501
+        if ('rev_id' in local_var_params and
+                len(local_var_params['rev_id']) < 36):
+            raise ApiValueError("Invalid value for parameter `rev_id` when calling `get_creator_revision`, length must be greater than or equal to `36`")  # noqa: E501
+        if 'rev_id' in local_var_params and not re.search(r'[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', local_var_params['rev_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `rev_id` when calling `get_creator_revision`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'rev_id' in params:
-            path_params['rev_id'] = params['rev_id']  # noqa: E501
+        if 'rev_id' in local_var_params:
+            path_params['rev_id'] = local_var_params['rev_id']  # noqa: E501
 
         query_params = []
-        if 'expand' in params:
-            query_params.append(('expand', params['expand']))  # noqa: E501
-        if 'hide' in params:
-            query_params.append(('hide', params['hide']))  # noqa: E501
+        if 'expand' in local_var_params:
+            query_params.append(('expand', local_var_params['expand']))  # noqa: E501
+        if 'hide' in local_var_params:
+            query_params.append(('hide', local_var_params['hide']))  # noqa: E501
 
         header_params = {}
 
@@ -4933,10 +5432,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -4950,10 +5445,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='CreatorEntity',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_editgroup(self, editgroup_id, **kwargs):  # noqa: E501
@@ -4961,72 +5456,85 @@ class DefaultApi(object):
 
         Returns a single editgroup object.  Unlike some similar methods, this method will return a full/expanded editgroup object, which includes edit lists of each entity type (though will not include the complete entity objects).   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_editgroup(editgroup_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_editgroup(editgroup_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: base32-encoded unique identifier (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: Editgroup
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_editgroup_with_http_info(editgroup_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_editgroup_with_http_info(editgroup_id, **kwargs)  # noqa: E501
-            return data
+        return self.get_editgroup_with_http_info(editgroup_id, **kwargs)  # noqa: E501
 
     def get_editgroup_with_http_info(self, editgroup_id, **kwargs):  # noqa: E501
         """get_editgroup  # noqa: E501
 
         Returns a single editgroup object.  Unlike some similar methods, this method will return a full/expanded editgroup object, which includes edit lists of each entity type (though will not include the complete entity objects).   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_editgroup_with_http_info(editgroup_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_editgroup_with_http_info(editgroup_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: base32-encoded unique identifier (required)
-        :return: Editgroup
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(Editgroup, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_editgroup" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `get_editgroup`")  # noqa: E501
-
-        if ('editgroup_id' in params and
-                len(params['editgroup_id']) > 26):
-            raise ValueError("Invalid value for parameter `editgroup_id` when calling `get_editgroup`, length must be less than or equal to `26`")  # noqa: E501
-        if ('editgroup_id' in params and
-                len(params['editgroup_id']) < 26):
-            raise ValueError("Invalid value for parameter `editgroup_id` when calling `get_editgroup`, length must be greater than or equal to `26`")  # noqa: E501
-        if 'editgroup_id' in params and not re.search('[a-zA-Z2-7]{26}', params['editgroup_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `editgroup_id` when calling `get_editgroup`, must conform to the pattern `/[a-zA-Z2-7]{26}/`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `get_editgroup`")  # noqa: E501
+
+        if ('editgroup_id' in local_var_params and
+                len(local_var_params['editgroup_id']) > 26):
+            raise ApiValueError("Invalid value for parameter `editgroup_id` when calling `get_editgroup`, length must be less than or equal to `26`")  # noqa: E501
+        if ('editgroup_id' in local_var_params and
+                len(local_var_params['editgroup_id']) < 26):
+            raise ApiValueError("Invalid value for parameter `editgroup_id` when calling `get_editgroup`, length must be greater than or equal to `26`")  # noqa: E501
+        if 'editgroup_id' in local_var_params and not re.search(r'[a-zA-Z2-7]{26}', local_var_params['editgroup_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `editgroup_id` when calling `get_editgroup`, must conform to the pattern `/[a-zA-Z2-7]{26}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
 
         query_params = []
 
@@ -5040,10 +5548,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -5057,10 +5561,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='Editgroup',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_editgroup_annotations(self, editgroup_id, **kwargs):  # noqa: E501
@@ -5068,78 +5572,91 @@ class DefaultApi(object):
 
         Returns a list of annotations made to a specific editgroup.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_editgroup_annotations(editgroup_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_editgroup_annotations(editgroup_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: base32-encoded unique identifier (required)
         :param str expand: List of sub-entities to expand in response. For editgroup annotations: 'editors'
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: list[EditgroupAnnotation]
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_editgroup_annotations_with_http_info(editgroup_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_editgroup_annotations_with_http_info(editgroup_id, **kwargs)  # noqa: E501
-            return data
+        return self.get_editgroup_annotations_with_http_info(editgroup_id, **kwargs)  # noqa: E501
 
     def get_editgroup_annotations_with_http_info(self, editgroup_id, **kwargs):  # noqa: E501
         """get_editgroup_annotations  # noqa: E501
 
         Returns a list of annotations made to a specific editgroup.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_editgroup_annotations_with_http_info(editgroup_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_editgroup_annotations_with_http_info(editgroup_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: base32-encoded unique identifier (required)
         :param str expand: List of sub-entities to expand in response. For editgroup annotations: 'editors'
-        :return: list[EditgroupAnnotation]
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(list[EditgroupAnnotation], status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'expand']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_editgroup_annotations" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `get_editgroup_annotations`")  # noqa: E501
-
-        if ('editgroup_id' in params and
-                len(params['editgroup_id']) > 26):
-            raise ValueError("Invalid value for parameter `editgroup_id` when calling `get_editgroup_annotations`, length must be less than or equal to `26`")  # noqa: E501
-        if ('editgroup_id' in params and
-                len(params['editgroup_id']) < 26):
-            raise ValueError("Invalid value for parameter `editgroup_id` when calling `get_editgroup_annotations`, length must be greater than or equal to `26`")  # noqa: E501
-        if 'editgroup_id' in params and not re.search('[a-zA-Z2-7]{26}', params['editgroup_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `editgroup_id` when calling `get_editgroup_annotations`, must conform to the pattern `/[a-zA-Z2-7]{26}/`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `get_editgroup_annotations`")  # noqa: E501
+
+        if ('editgroup_id' in local_var_params and
+                len(local_var_params['editgroup_id']) > 26):
+            raise ApiValueError("Invalid value for parameter `editgroup_id` when calling `get_editgroup_annotations`, length must be less than or equal to `26`")  # noqa: E501
+        if ('editgroup_id' in local_var_params and
+                len(local_var_params['editgroup_id']) < 26):
+            raise ApiValueError("Invalid value for parameter `editgroup_id` when calling `get_editgroup_annotations`, length must be greater than or equal to `26`")  # noqa: E501
+        if 'editgroup_id' in local_var_params and not re.search(r'[a-zA-Z2-7]{26}', local_var_params['editgroup_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `editgroup_id` when calling `get_editgroup_annotations`, must conform to the pattern `/[a-zA-Z2-7]{26}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
 
         query_params = []
-        if 'expand' in params:
-            query_params.append(('expand', params['expand']))  # noqa: E501
+        if 'expand' in local_var_params:
+            query_params.append(('expand', local_var_params['expand']))  # noqa: E501
 
         header_params = {}
 
@@ -5151,10 +5668,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -5168,10 +5681,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='list[EditgroupAnnotation]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_editgroups_reviewable(self, **kwargs):  # noqa: E501
@@ -5179,74 +5692,87 @@ class DefaultApi(object):
 
         Returns a set of editgroups which have been submitted but not yet accepted.  Query parameters can be used to sort and paginate the list returned.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_editgroups_reviewable(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_editgroups_reviewable(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str expand: List of sub-entities to expand in response. For editgroups: 'editors'
         :param int limit: Maximum number of reviewable editgroups to return in response
         :param datetime before: Return only reviewable editgroups submitted *before* the given timestamp (not inclusive). Editgroups will be sorted by submission time in descending order (most recent first). For use in pagination. 
         :param datetime since: Return only reviewable editgroups submitted *after* the given timestamp (not inclusive). Editgroups will be sorted by submission time in ascending order (most recent last). For use in pagination. 
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: list[Editgroup]
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_editgroups_reviewable_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.get_editgroups_reviewable_with_http_info(**kwargs)  # noqa: E501
-            return data
+        return self.get_editgroups_reviewable_with_http_info(**kwargs)  # noqa: E501
 
     def get_editgroups_reviewable_with_http_info(self, **kwargs):  # noqa: E501
         """get_editgroups_reviewable  # noqa: E501
 
         Returns a set of editgroups which have been submitted but not yet accepted.  Query parameters can be used to sort and paginate the list returned.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_editgroups_reviewable_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_editgroups_reviewable_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str expand: List of sub-entities to expand in response. For editgroups: 'editors'
         :param int limit: Maximum number of reviewable editgroups to return in response
         :param datetime before: Return only reviewable editgroups submitted *before* the given timestamp (not inclusive). Editgroups will be sorted by submission time in descending order (most recent first). For use in pagination. 
         :param datetime since: Return only reviewable editgroups submitted *after* the given timestamp (not inclusive). Editgroups will be sorted by submission time in ascending order (most recent last). For use in pagination. 
-        :return: list[Editgroup]
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(list[Editgroup], status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['expand', 'limit', 'before', 'since']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_editgroups_reviewable" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
 
         collection_formats = {}
 
         path_params = {}
 
         query_params = []
-        if 'expand' in params:
-            query_params.append(('expand', params['expand']))  # noqa: E501
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
-        if 'before' in params:
-            query_params.append(('before', params['before']))  # noqa: E501
-        if 'since' in params:
-            query_params.append(('since', params['since']))  # noqa: E501
+        if 'expand' in local_var_params:
+            query_params.append(('expand', local_var_params['expand']))  # noqa: E501
+        if 'limit' in local_var_params:
+            query_params.append(('limit', local_var_params['limit']))  # noqa: E501
+        if 'before' in local_var_params:
+            query_params.append(('before', local_var_params['before']))  # noqa: E501
+        if 'since' in local_var_params:
+            query_params.append(('since', local_var_params['since']))  # noqa: E501
 
         header_params = {}
 
@@ -5258,10 +5784,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -5275,10 +5797,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='list[Editgroup]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_editor(self, editor_id, **kwargs):  # noqa: E501
@@ -5286,64 +5808,77 @@ class DefaultApi(object):
 
         Returns an editor object, including metadata such as the username, type, and role of editor.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_editor(editor_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_editor(editor_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editor_id: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: Editor
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_editor_with_http_info(editor_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_editor_with_http_info(editor_id, **kwargs)  # noqa: E501
-            return data
+        return self.get_editor_with_http_info(editor_id, **kwargs)  # noqa: E501
 
     def get_editor_with_http_info(self, editor_id, **kwargs):  # noqa: E501
         """get_editor  # noqa: E501
 
         Returns an editor object, including metadata such as the username, type, and role of editor.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_editor_with_http_info(editor_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_editor_with_http_info(editor_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editor_id: (required)
-        :return: Editor
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(Editor, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editor_id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_editor" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editor_id' is set
-        if ('editor_id' not in params or
-                params['editor_id'] is None):
-            raise ValueError("Missing the required parameter `editor_id` when calling `get_editor`")  # noqa: E501
+        if ('editor_id' not in local_var_params or
+                local_var_params['editor_id'] is None):
+            raise ApiValueError("Missing the required parameter `editor_id` when calling `get_editor`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'editor_id' in params:
-            path_params['editor_id'] = params['editor_id']  # noqa: E501
+        if 'editor_id' in local_var_params:
+            path_params['editor_id'] = local_var_params['editor_id']  # noqa: E501
 
         query_params = []
 
@@ -5357,10 +5892,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -5374,10 +5905,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='Editor',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_editor_annotations(self, editor_id, **kwargs):  # noqa: E501
@@ -5385,86 +5916,99 @@ class DefaultApi(object):
 
         Fetches a list of annotations made by a particular editor.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_editor_annotations(editor_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_editor_annotations(editor_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editor_id: base32-encoded unique identifier (required)
         :param int limit: Maximum number (count) of annotations to return in response
         :param datetime before: Return only annotations made *before* the given timestamp (not inclusive). Annotations will be sorted by creation time in descending order (most recent first). For use in pagination. 
         :param datetime since: Return only annotations made *after* the given timestamp (not inclusive). Annotations will be sorted by creation time in ascending order (most recent last). For use in pagination. 
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: list[EditgroupAnnotation]
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_editor_annotations_with_http_info(editor_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_editor_annotations_with_http_info(editor_id, **kwargs)  # noqa: E501
-            return data
+        return self.get_editor_annotations_with_http_info(editor_id, **kwargs)  # noqa: E501
 
     def get_editor_annotations_with_http_info(self, editor_id, **kwargs):  # noqa: E501
         """get_editor_annotations  # noqa: E501
 
         Fetches a list of annotations made by a particular editor.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_editor_annotations_with_http_info(editor_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_editor_annotations_with_http_info(editor_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editor_id: base32-encoded unique identifier (required)
         :param int limit: Maximum number (count) of annotations to return in response
         :param datetime before: Return only annotations made *before* the given timestamp (not inclusive). Annotations will be sorted by creation time in descending order (most recent first). For use in pagination. 
         :param datetime since: Return only annotations made *after* the given timestamp (not inclusive). Annotations will be sorted by creation time in ascending order (most recent last). For use in pagination. 
-        :return: list[EditgroupAnnotation]
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(list[EditgroupAnnotation], status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editor_id', 'limit', 'before', 'since']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_editor_annotations" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editor_id' is set
-        if ('editor_id' not in params or
-                params['editor_id'] is None):
-            raise ValueError("Missing the required parameter `editor_id` when calling `get_editor_annotations`")  # noqa: E501
-
-        if ('editor_id' in params and
-                len(params['editor_id']) > 26):
-            raise ValueError("Invalid value for parameter `editor_id` when calling `get_editor_annotations`, length must be less than or equal to `26`")  # noqa: E501
-        if ('editor_id' in params and
-                len(params['editor_id']) < 26):
-            raise ValueError("Invalid value for parameter `editor_id` when calling `get_editor_annotations`, length must be greater than or equal to `26`")  # noqa: E501
-        if 'editor_id' in params and not re.search('[a-zA-Z2-7]{26}', params['editor_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `editor_id` when calling `get_editor_annotations`, must conform to the pattern `/[a-zA-Z2-7]{26}/`")  # noqa: E501
+        if ('editor_id' not in local_var_params or
+                local_var_params['editor_id'] is None):
+            raise ApiValueError("Missing the required parameter `editor_id` when calling `get_editor_annotations`")  # noqa: E501
+
+        if ('editor_id' in local_var_params and
+                len(local_var_params['editor_id']) > 26):
+            raise ApiValueError("Invalid value for parameter `editor_id` when calling `get_editor_annotations`, length must be less than or equal to `26`")  # noqa: E501
+        if ('editor_id' in local_var_params and
+                len(local_var_params['editor_id']) < 26):
+            raise ApiValueError("Invalid value for parameter `editor_id` when calling `get_editor_annotations`, length must be greater than or equal to `26`")  # noqa: E501
+        if 'editor_id' in local_var_params and not re.search(r'[a-zA-Z2-7]{26}', local_var_params['editor_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `editor_id` when calling `get_editor_annotations`, must conform to the pattern `/[a-zA-Z2-7]{26}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'editor_id' in params:
-            path_params['editor_id'] = params['editor_id']  # noqa: E501
+        if 'editor_id' in local_var_params:
+            path_params['editor_id'] = local_var_params['editor_id']  # noqa: E501
 
         query_params = []
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
-        if 'before' in params:
-            query_params.append(('before', params['before']))  # noqa: E501
-        if 'since' in params:
-            query_params.append(('since', params['since']))  # noqa: E501
+        if 'limit' in local_var_params:
+            query_params.append(('limit', local_var_params['limit']))  # noqa: E501
+        if 'before' in local_var_params:
+            query_params.append(('before', local_var_params['before']))  # noqa: E501
+        if 'since' in local_var_params:
+            query_params.append(('since', local_var_params['since']))  # noqa: E501
 
         header_params = {}
 
@@ -5476,10 +6020,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -5493,10 +6033,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='list[EditgroupAnnotation]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_editor_editgroups(self, editor_id, **kwargs):  # noqa: E501
@@ -5504,78 +6044,91 @@ class DefaultApi(object):
 
         Returns a set of editgroups created by the given editor, regardless of the status (accepted/submitted) of the editgroups.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_editor_editgroups(editor_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_editor_editgroups(editor_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editor_id: (required)
         :param int limit:
         :param datetime before: Return only editgroups created *before* the given timestamp (not inclusive). Editgroups will be sorted by creation time in descending order (most recent first). For use in pagination. 
         :param datetime since: Return only editgroups created *after* the given timestamp (not inclusive). Editgroups will be sorted by creation time in ascending order (most recent last). For use in pagination. 
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: list[Editgroup]
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_editor_editgroups_with_http_info(editor_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_editor_editgroups_with_http_info(editor_id, **kwargs)  # noqa: E501
-            return data
+        return self.get_editor_editgroups_with_http_info(editor_id, **kwargs)  # noqa: E501
 
     def get_editor_editgroups_with_http_info(self, editor_id, **kwargs):  # noqa: E501
         """get_editor_editgroups  # noqa: E501
 
         Returns a set of editgroups created by the given editor, regardless of the status (accepted/submitted) of the editgroups.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_editor_editgroups_with_http_info(editor_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_editor_editgroups_with_http_info(editor_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editor_id: (required)
         :param int limit:
         :param datetime before: Return only editgroups created *before* the given timestamp (not inclusive). Editgroups will be sorted by creation time in descending order (most recent first). For use in pagination. 
         :param datetime since: Return only editgroups created *after* the given timestamp (not inclusive). Editgroups will be sorted by creation time in ascending order (most recent last). For use in pagination. 
-        :return: list[Editgroup]
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(list[Editgroup], status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editor_id', 'limit', 'before', 'since']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_editor_editgroups" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editor_id' is set
-        if ('editor_id' not in params or
-                params['editor_id'] is None):
-            raise ValueError("Missing the required parameter `editor_id` when calling `get_editor_editgroups`")  # noqa: E501
+        if ('editor_id' not in local_var_params or
+                local_var_params['editor_id'] is None):
+            raise ApiValueError("Missing the required parameter `editor_id` when calling `get_editor_editgroups`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'editor_id' in params:
-            path_params['editor_id'] = params['editor_id']  # noqa: E501
+        if 'editor_id' in local_var_params:
+            path_params['editor_id'] = local_var_params['editor_id']  # noqa: E501
 
         query_params = []
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
-        if 'before' in params:
-            query_params.append(('before', params['before']))  # noqa: E501
-        if 'since' in params:
-            query_params.append(('since', params['since']))  # noqa: E501
+        if 'limit' in local_var_params:
+            query_params.append(('limit', local_var_params['limit']))  # noqa: E501
+        if 'before' in local_var_params:
+            query_params.append(('before', local_var_params['before']))  # noqa: E501
+        if 'since' in local_var_params:
+            query_params.append(('since', local_var_params['since']))  # noqa: E501
 
         header_params = {}
 
@@ -5587,10 +6140,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -5604,83 +6153,96 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='list[Editgroup]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_file(self, ident, **kwargs):  # noqa: E501
         """get_file  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_file(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_file(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param str expand: List of sub-entities to expand in response. For files, `releases` is accepted.
         :param str hide: List of entity fields to elide in response. For files, none accepted (yet).
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: FileEntity
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_file_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_file_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_file_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_file_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_file  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_file_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_file_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param str expand: List of sub-entities to expand in response. For files, `releases` is accepted.
         :param str hide: List of entity fields to elide in response. For files, none accepted (yet).
-        :return: FileEntity
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(FileEntity, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident', 'expand', 'hide']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_file" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_file`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_file`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
-        if 'expand' in params:
-            query_params.append(('expand', params['expand']))  # noqa: E501
-        if 'hide' in params:
-            query_params.append(('hide', params['hide']))  # noqa: E501
+        if 'expand' in local_var_params:
+            query_params.append(('expand', local_var_params['expand']))  # noqa: E501
+        if 'hide' in local_var_params:
+            query_params.append(('hide', local_var_params['hide']))  # noqa: E501
 
         header_params = {}
 
@@ -5692,10 +6254,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -5709,81 +6267,94 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='FileEntity',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_file_edit(self, edit_id, **kwargs):  # noqa: E501
         """get_file_edit  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_file_edit(edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_file_edit(edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_file_edit_with_http_info(edit_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_file_edit_with_http_info(edit_id, **kwargs)  # noqa: E501
-            return data
+        return self.get_file_edit_with_http_info(edit_id, **kwargs)  # noqa: E501
 
     def get_file_edit_with_http_info(self, edit_id, **kwargs):  # noqa: E501
         """get_file_edit  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_file_edit_with_http_info(edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_file_edit_with_http_info(edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['edit_id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_file_edit" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'edit_id' is set
-        if ('edit_id' not in params or
-                params['edit_id'] is None):
-            raise ValueError("Missing the required parameter `edit_id` when calling `get_file_edit`")  # noqa: E501
-
-        if ('edit_id' in params and
-                len(params['edit_id']) > 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `get_file_edit`, length must be less than or equal to `36`")  # noqa: E501
-        if ('edit_id' in params and
-                len(params['edit_id']) < 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `get_file_edit`, length must be greater than or equal to `36`")  # noqa: E501
-        if 'edit_id' in params and not re.search('[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', params['edit_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `edit_id` when calling `get_file_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
+        if ('edit_id' not in local_var_params or
+                local_var_params['edit_id'] is None):
+            raise ApiValueError("Missing the required parameter `edit_id` when calling `get_file_edit`")  # noqa: E501
+
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) > 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `get_file_edit`, length must be less than or equal to `36`")  # noqa: E501
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) < 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `get_file_edit`, length must be greater than or equal to `36`")  # noqa: E501
+        if 'edit_id' in local_var_params and not re.search(r'[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', local_var_params['edit_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `get_file_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'edit_id' in params:
-            path_params['edit_id'] = params['edit_id']  # noqa: E501
+        if 'edit_id' in local_var_params:
+            path_params['edit_id'] = local_var_params['edit_id']  # noqa: E501
 
         query_params = []
 
@@ -5797,10 +6368,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -5814,79 +6381,92 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_file_history(self, ident, **kwargs):  # noqa: E501
         """get_file_history  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_file_history(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_file_history(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param int limit:
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: list[EntityHistoryEntry]
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_file_history_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_file_history_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_file_history_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_file_history_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_file_history  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_file_history_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_file_history_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param int limit:
-        :return: list[EntityHistoryEntry]
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(list[EntityHistoryEntry], status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident', 'limit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_file_history" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_file_history`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_file_history`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
+        if 'limit' in local_var_params:
+            query_params.append(('limit', local_var_params['limit']))  # noqa: E501
 
         header_params = {}
 
@@ -5898,10 +6478,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -5915,73 +6491,86 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='list[EntityHistoryEntry]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_file_redirects(self, ident, **kwargs):  # noqa: E501
         """get_file_redirects  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_file_redirects(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_file_redirects(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: list[str]
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_file_redirects_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_file_redirects_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_file_redirects_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_file_redirects_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_file_redirects  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_file_redirects_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_file_redirects_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
-        :return: list[str]
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(list[str], status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_file_redirects" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_file_redirects`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_file_redirects`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
 
@@ -5995,10 +6584,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -6012,91 +6597,104 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='list[str]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_file_revision(self, rev_id, **kwargs):  # noqa: E501
         """get_file_revision  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_file_revision(rev_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_file_revision(rev_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str rev_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
         :param str expand: List of sub-entities to expand in response. See `get_file`.
         :param str hide: List of entity fields to elide in response. See `get_file`.
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: FileEntity
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_file_revision_with_http_info(rev_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_file_revision_with_http_info(rev_id, **kwargs)  # noqa: E501
-            return data
+        return self.get_file_revision_with_http_info(rev_id, **kwargs)  # noqa: E501
 
     def get_file_revision_with_http_info(self, rev_id, **kwargs):  # noqa: E501
         """get_file_revision  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_file_revision_with_http_info(rev_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_file_revision_with_http_info(rev_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str rev_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
         :param str expand: List of sub-entities to expand in response. See `get_file`.
         :param str hide: List of entity fields to elide in response. See `get_file`.
-        :return: FileEntity
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(FileEntity, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['rev_id', 'expand', 'hide']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_file_revision" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'rev_id' is set
-        if ('rev_id' not in params or
-                params['rev_id'] is None):
-            raise ValueError("Missing the required parameter `rev_id` when calling `get_file_revision`")  # noqa: E501
-
-        if ('rev_id' in params and
-                len(params['rev_id']) > 36):
-            raise ValueError("Invalid value for parameter `rev_id` when calling `get_file_revision`, length must be less than or equal to `36`")  # noqa: E501
-        if ('rev_id' in params and
-                len(params['rev_id']) < 36):
-            raise ValueError("Invalid value for parameter `rev_id` when calling `get_file_revision`, length must be greater than or equal to `36`")  # noqa: E501
-        if 'rev_id' in params and not re.search('[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', params['rev_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `rev_id` when calling `get_file_revision`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
+        if ('rev_id' not in local_var_params or
+                local_var_params['rev_id'] is None):
+            raise ApiValueError("Missing the required parameter `rev_id` when calling `get_file_revision`")  # noqa: E501
+
+        if ('rev_id' in local_var_params and
+                len(local_var_params['rev_id']) > 36):
+            raise ApiValueError("Invalid value for parameter `rev_id` when calling `get_file_revision`, length must be less than or equal to `36`")  # noqa: E501
+        if ('rev_id' in local_var_params and
+                len(local_var_params['rev_id']) < 36):
+            raise ApiValueError("Invalid value for parameter `rev_id` when calling `get_file_revision`, length must be greater than or equal to `36`")  # noqa: E501
+        if 'rev_id' in local_var_params and not re.search(r'[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', local_var_params['rev_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `rev_id` when calling `get_file_revision`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'rev_id' in params:
-            path_params['rev_id'] = params['rev_id']  # noqa: E501
+        if 'rev_id' in local_var_params:
+            path_params['rev_id'] = local_var_params['rev_id']  # noqa: E501
 
         query_params = []
-        if 'expand' in params:
-            query_params.append(('expand', params['expand']))  # noqa: E501
-        if 'hide' in params:
-            query_params.append(('hide', params['hide']))  # noqa: E501
+        if 'expand' in local_var_params:
+            query_params.append(('expand', local_var_params['expand']))  # noqa: E501
+        if 'hide' in local_var_params:
+            query_params.append(('hide', local_var_params['hide']))  # noqa: E501
 
         header_params = {}
 
@@ -6108,10 +6706,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -6125,83 +6719,96 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='FileEntity',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_fileset(self, ident, **kwargs):  # noqa: E501
         """get_fileset  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_fileset(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_fileset(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param str expand: List of sub-entities to expand in response. For filesets, `releases` is accepted.
         :param str hide: List of entity fields to elide in response. For filesets, 'manifest' is accepted.
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: FilesetEntity
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_fileset_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_fileset_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_fileset_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_fileset_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_fileset  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_fileset_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_fileset_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param str expand: List of sub-entities to expand in response. For filesets, `releases` is accepted.
         :param str hide: List of entity fields to elide in response. For filesets, 'manifest' is accepted.
-        :return: FilesetEntity
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(FilesetEntity, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident', 'expand', 'hide']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_fileset" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_fileset`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_fileset`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
-        if 'expand' in params:
-            query_params.append(('expand', params['expand']))  # noqa: E501
-        if 'hide' in params:
-            query_params.append(('hide', params['hide']))  # noqa: E501
+        if 'expand' in local_var_params:
+            query_params.append(('expand', local_var_params['expand']))  # noqa: E501
+        if 'hide' in local_var_params:
+            query_params.append(('hide', local_var_params['hide']))  # noqa: E501
 
         header_params = {}
 
@@ -6213,10 +6820,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -6230,81 +6833,94 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='FilesetEntity',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_fileset_edit(self, edit_id, **kwargs):  # noqa: E501
         """get_fileset_edit  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_fileset_edit(edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_fileset_edit(edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_fileset_edit_with_http_info(edit_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_fileset_edit_with_http_info(edit_id, **kwargs)  # noqa: E501
-            return data
+        return self.get_fileset_edit_with_http_info(edit_id, **kwargs)  # noqa: E501
 
     def get_fileset_edit_with_http_info(self, edit_id, **kwargs):  # noqa: E501
         """get_fileset_edit  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_fileset_edit_with_http_info(edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_fileset_edit_with_http_info(edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['edit_id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_fileset_edit" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'edit_id' is set
-        if ('edit_id' not in params or
-                params['edit_id'] is None):
-            raise ValueError("Missing the required parameter `edit_id` when calling `get_fileset_edit`")  # noqa: E501
-
-        if ('edit_id' in params and
-                len(params['edit_id']) > 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `get_fileset_edit`, length must be less than or equal to `36`")  # noqa: E501
-        if ('edit_id' in params and
-                len(params['edit_id']) < 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `get_fileset_edit`, length must be greater than or equal to `36`")  # noqa: E501
-        if 'edit_id' in params and not re.search('[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', params['edit_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `edit_id` when calling `get_fileset_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
+        if ('edit_id' not in local_var_params or
+                local_var_params['edit_id'] is None):
+            raise ApiValueError("Missing the required parameter `edit_id` when calling `get_fileset_edit`")  # noqa: E501
+
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) > 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `get_fileset_edit`, length must be less than or equal to `36`")  # noqa: E501
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) < 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `get_fileset_edit`, length must be greater than or equal to `36`")  # noqa: E501
+        if 'edit_id' in local_var_params and not re.search(r'[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', local_var_params['edit_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `get_fileset_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'edit_id' in params:
-            path_params['edit_id'] = params['edit_id']  # noqa: E501
+        if 'edit_id' in local_var_params:
+            path_params['edit_id'] = local_var_params['edit_id']  # noqa: E501
 
         query_params = []
 
@@ -6318,10 +6934,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -6335,79 +6947,92 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_fileset_history(self, ident, **kwargs):  # noqa: E501
         """get_fileset_history  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_fileset_history(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_fileset_history(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param int limit:
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: list[EntityHistoryEntry]
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_fileset_history_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_fileset_history_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_fileset_history_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_fileset_history_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_fileset_history  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_fileset_history_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_fileset_history_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param int limit:
-        :return: list[EntityHistoryEntry]
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(list[EntityHistoryEntry], status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident', 'limit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_fileset_history" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_fileset_history`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_fileset_history`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
+        if 'limit' in local_var_params:
+            query_params.append(('limit', local_var_params['limit']))  # noqa: E501
 
         header_params = {}
 
@@ -6419,10 +7044,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -6436,73 +7057,86 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='list[EntityHistoryEntry]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_fileset_redirects(self, ident, **kwargs):  # noqa: E501
         """get_fileset_redirects  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_fileset_redirects(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_fileset_redirects(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: list[str]
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_fileset_redirects_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_fileset_redirects_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_fileset_redirects_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_fileset_redirects_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_fileset_redirects  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_fileset_redirects_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_fileset_redirects_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
-        :return: list[str]
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(list[str], status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_fileset_redirects" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_fileset_redirects`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_fileset_redirects`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
 
@@ -6516,10 +7150,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -6533,91 +7163,104 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='list[str]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_fileset_revision(self, rev_id, **kwargs):  # noqa: E501
         """get_fileset_revision  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_fileset_revision(rev_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_fileset_revision(rev_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str rev_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
         :param str expand: List of sub-entities to expand in response. See `get_fileset`.
         :param str hide: List of entity fields to elide in response. See `get_fileset`.
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: FilesetEntity
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_fileset_revision_with_http_info(rev_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_fileset_revision_with_http_info(rev_id, **kwargs)  # noqa: E501
-            return data
+        return self.get_fileset_revision_with_http_info(rev_id, **kwargs)  # noqa: E501
 
     def get_fileset_revision_with_http_info(self, rev_id, **kwargs):  # noqa: E501
         """get_fileset_revision  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_fileset_revision_with_http_info(rev_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_fileset_revision_with_http_info(rev_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str rev_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
         :param str expand: List of sub-entities to expand in response. See `get_fileset`.
         :param str hide: List of entity fields to elide in response. See `get_fileset`.
-        :return: FilesetEntity
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(FilesetEntity, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['rev_id', 'expand', 'hide']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_fileset_revision" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'rev_id' is set
-        if ('rev_id' not in params or
-                params['rev_id'] is None):
-            raise ValueError("Missing the required parameter `rev_id` when calling `get_fileset_revision`")  # noqa: E501
-
-        if ('rev_id' in params and
-                len(params['rev_id']) > 36):
-            raise ValueError("Invalid value for parameter `rev_id` when calling `get_fileset_revision`, length must be less than or equal to `36`")  # noqa: E501
-        if ('rev_id' in params and
-                len(params['rev_id']) < 36):
-            raise ValueError("Invalid value for parameter `rev_id` when calling `get_fileset_revision`, length must be greater than or equal to `36`")  # noqa: E501
-        if 'rev_id' in params and not re.search('[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', params['rev_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `rev_id` when calling `get_fileset_revision`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
+        if ('rev_id' not in local_var_params or
+                local_var_params['rev_id'] is None):
+            raise ApiValueError("Missing the required parameter `rev_id` when calling `get_fileset_revision`")  # noqa: E501
+
+        if ('rev_id' in local_var_params and
+                len(local_var_params['rev_id']) > 36):
+            raise ApiValueError("Invalid value for parameter `rev_id` when calling `get_fileset_revision`, length must be less than or equal to `36`")  # noqa: E501
+        if ('rev_id' in local_var_params and
+                len(local_var_params['rev_id']) < 36):
+            raise ApiValueError("Invalid value for parameter `rev_id` when calling `get_fileset_revision`, length must be greater than or equal to `36`")  # noqa: E501
+        if 'rev_id' in local_var_params and not re.search(r'[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', local_var_params['rev_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `rev_id` when calling `get_fileset_revision`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'rev_id' in params:
-            path_params['rev_id'] = params['rev_id']  # noqa: E501
+        if 'rev_id' in local_var_params:
+            path_params['rev_id'] = local_var_params['rev_id']  # noqa: E501
 
         query_params = []
-        if 'expand' in params:
-            query_params.append(('expand', params['expand']))  # noqa: E501
-        if 'hide' in params:
-            query_params.append(('hide', params['hide']))  # noqa: E501
+        if 'expand' in local_var_params:
+            query_params.append(('expand', local_var_params['expand']))  # noqa: E501
+        if 'hide' in local_var_params:
+            query_params.append(('hide', local_var_params['hide']))  # noqa: E501
 
         header_params = {}
 
@@ -6629,10 +7272,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -6646,10 +7285,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='FilesetEntity',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_release(self, ident, **kwargs):  # noqa: E501
@@ -6657,74 +7296,87 @@ class DefaultApi(object):
 
         Fetches a single Release entity from the catalog.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_release(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_release(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param str expand: List of sub-entities to expand in response. For releases, 'files', 'filesets, 'webcaptures', 'container', and 'creators' are valid. 
         :param str hide: List of entity fields to elide in response (for efficiency). For releases, 'abstracts', 'refs', and 'contribs' are valid. 
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: ReleaseEntity
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_release_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_release_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_release_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_release_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_release  # noqa: E501
 
         Fetches a single Release entity from the catalog.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_release_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_release_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param str expand: List of sub-entities to expand in response. For releases, 'files', 'filesets, 'webcaptures', 'container', and 'creators' are valid. 
         :param str hide: List of entity fields to elide in response (for efficiency). For releases, 'abstracts', 'refs', and 'contribs' are valid. 
-        :return: ReleaseEntity
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(ReleaseEntity, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident', 'expand', 'hide']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_release" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_release`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_release`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
-        if 'expand' in params:
-            query_params.append(('expand', params['expand']))  # noqa: E501
-        if 'hide' in params:
-            query_params.append(('hide', params['hide']))  # noqa: E501
+        if 'expand' in local_var_params:
+            query_params.append(('expand', local_var_params['expand']))  # noqa: E501
+        if 'hide' in local_var_params:
+            query_params.append(('hide', local_var_params['hide']))  # noqa: E501
 
         header_params = {}
 
@@ -6736,10 +7388,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -6753,10 +7401,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='ReleaseEntity',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_release_edit(self, edit_id, **kwargs):  # noqa: E501
@@ -6764,72 +7412,85 @@ class DefaultApi(object):
 
         Returns the entity edit object with the given identifier. This method is expected to be used rarely.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_release_edit(edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_release_edit(edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_release_edit_with_http_info(edit_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_release_edit_with_http_info(edit_id, **kwargs)  # noqa: E501
-            return data
+        return self.get_release_edit_with_http_info(edit_id, **kwargs)  # noqa: E501
 
     def get_release_edit_with_http_info(self, edit_id, **kwargs):  # noqa: E501
         """get_release_edit  # noqa: E501
 
         Returns the entity edit object with the given identifier. This method is expected to be used rarely.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_release_edit_with_http_info(edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_release_edit_with_http_info(edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['edit_id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_release_edit" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'edit_id' is set
-        if ('edit_id' not in params or
-                params['edit_id'] is None):
-            raise ValueError("Missing the required parameter `edit_id` when calling `get_release_edit`")  # noqa: E501
-
-        if ('edit_id' in params and
-                len(params['edit_id']) > 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `get_release_edit`, length must be less than or equal to `36`")  # noqa: E501
-        if ('edit_id' in params and
-                len(params['edit_id']) < 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `get_release_edit`, length must be greater than or equal to `36`")  # noqa: E501
-        if 'edit_id' in params and not re.search('[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', params['edit_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `edit_id` when calling `get_release_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
+        if ('edit_id' not in local_var_params or
+                local_var_params['edit_id'] is None):
+            raise ApiValueError("Missing the required parameter `edit_id` when calling `get_release_edit`")  # noqa: E501
+
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) > 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `get_release_edit`, length must be less than or equal to `36`")  # noqa: E501
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) < 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `get_release_edit`, length must be greater than or equal to `36`")  # noqa: E501
+        if 'edit_id' in local_var_params and not re.search(r'[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', local_var_params['edit_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `get_release_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'edit_id' in params:
-            path_params['edit_id'] = params['edit_id']  # noqa: E501
+        if 'edit_id' in local_var_params:
+            path_params['edit_id'] = local_var_params['edit_id']  # noqa: E501
 
         query_params = []
 
@@ -6843,10 +7504,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -6860,10 +7517,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_release_files(self, ident, **kwargs):  # noqa: E501
@@ -6871,70 +7528,83 @@ class DefaultApi(object):
 
         Returns the set of File entities that have a `release_id` pointing to this release entity.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_release_files(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_release_files(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param str hide: List of entity fields to elide in response. See `get_file`.
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: list[FileEntity]
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_release_files_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_release_files_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_release_files_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_release_files_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_release_files  # noqa: E501
 
         Returns the set of File entities that have a `release_id` pointing to this release entity.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_release_files_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_release_files_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param str hide: List of entity fields to elide in response. See `get_file`.
-        :return: list[FileEntity]
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(list[FileEntity], status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident', 'hide']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_release_files" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_release_files`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_release_files`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
-        if 'hide' in params:
-            query_params.append(('hide', params['hide']))  # noqa: E501
+        if 'hide' in local_var_params:
+            query_params.append(('hide', local_var_params['hide']))  # noqa: E501
 
         header_params = {}
 
@@ -6946,10 +7616,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -6963,10 +7629,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='list[FileEntity]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_release_filesets(self, ident, **kwargs):  # noqa: E501
@@ -6974,70 +7640,83 @@ class DefaultApi(object):
 
         Returns the set of Fileset entities that have a `release_id` pointing to this release entity.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_release_filesets(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_release_filesets(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param str hide: List of entity fields to elide in response. See `get_fileset`.
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: list[FilesetEntity]
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_release_filesets_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_release_filesets_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_release_filesets_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_release_filesets_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_release_filesets  # noqa: E501
 
         Returns the set of Fileset entities that have a `release_id` pointing to this release entity.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_release_filesets_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_release_filesets_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param str hide: List of entity fields to elide in response. See `get_fileset`.
-        :return: list[FilesetEntity]
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(list[FilesetEntity], status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident', 'hide']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_release_filesets" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_release_filesets`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_release_filesets`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
-        if 'hide' in params:
-            query_params.append(('hide', params['hide']))  # noqa: E501
+        if 'hide' in local_var_params:
+            query_params.append(('hide', local_var_params['hide']))  # noqa: E501
 
         header_params = {}
 
@@ -7049,10 +7728,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -7066,10 +7741,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='list[FilesetEntity]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_release_history(self, ident, **kwargs):  # noqa: E501
@@ -7077,70 +7752,83 @@ class DefaultApi(object):
 
         Fetches the history of accepted edits (changelog entries) for a specific entity fatcat identifier.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_release_history(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_release_history(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param int limit:
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: list[EntityHistoryEntry]
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_release_history_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_release_history_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_release_history_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_release_history_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_release_history  # noqa: E501
 
         Fetches the history of accepted edits (changelog entries) for a specific entity fatcat identifier.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_release_history_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_release_history_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param int limit:
-        :return: list[EntityHistoryEntry]
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(list[EntityHistoryEntry], status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident', 'limit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_release_history" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_release_history`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_release_history`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
+        if 'limit' in local_var_params:
+            query_params.append(('limit', local_var_params['limit']))  # noqa: E501
 
         header_params = {}
 
@@ -7152,10 +7840,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -7169,10 +7853,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='list[EntityHistoryEntry]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_release_redirects(self, ident, **kwargs):  # noqa: E501
@@ -7180,64 +7864,77 @@ class DefaultApi(object):
 
         Returns the set of entity identifiers which currently redirect to this identifier.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_release_redirects(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_release_redirects(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: list[str]
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_release_redirects_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_release_redirects_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_release_redirects_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_release_redirects_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_release_redirects  # noqa: E501
 
         Returns the set of entity identifiers which currently redirect to this identifier.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_release_redirects_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_release_redirects_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
-        :return: list[str]
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(list[str], status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_release_redirects" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_release_redirects`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_release_redirects`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
 
@@ -7251,10 +7948,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -7268,10 +7961,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='list[str]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_release_revision(self, rev_id, **kwargs):  # noqa: E501
@@ -7279,82 +7972,95 @@ class DefaultApi(object):
 
         Fetches a specific entity revision. Note that the returned revision will not be associated with any particular fatcat identifier (even if one or more identifiers do currently point to this revision). The revision may even be part of an un-merged editgroup.  Revisions are immutable and can not be deleted or updated.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_release_revision(rev_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_release_revision(rev_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str rev_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
         :param str expand: List of sub-entities to expand in response. See `get_release`, though note that identifier-based exapansions like `file` will always be empty for revisions.
         :param str hide: List of entity fields to elide in response. See `get_release`.
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: ReleaseEntity
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_release_revision_with_http_info(rev_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_release_revision_with_http_info(rev_id, **kwargs)  # noqa: E501
-            return data
+        return self.get_release_revision_with_http_info(rev_id, **kwargs)  # noqa: E501
 
     def get_release_revision_with_http_info(self, rev_id, **kwargs):  # noqa: E501
         """get_release_revision  # noqa: E501
 
         Fetches a specific entity revision. Note that the returned revision will not be associated with any particular fatcat identifier (even if one or more identifiers do currently point to this revision). The revision may even be part of an un-merged editgroup.  Revisions are immutable and can not be deleted or updated.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_release_revision_with_http_info(rev_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_release_revision_with_http_info(rev_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str rev_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
         :param str expand: List of sub-entities to expand in response. See `get_release`, though note that identifier-based exapansions like `file` will always be empty for revisions.
         :param str hide: List of entity fields to elide in response. See `get_release`.
-        :return: ReleaseEntity
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(ReleaseEntity, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['rev_id', 'expand', 'hide']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_release_revision" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'rev_id' is set
-        if ('rev_id' not in params or
-                params['rev_id'] is None):
-            raise ValueError("Missing the required parameter `rev_id` when calling `get_release_revision`")  # noqa: E501
-
-        if ('rev_id' in params and
-                len(params['rev_id']) > 36):
-            raise ValueError("Invalid value for parameter `rev_id` when calling `get_release_revision`, length must be less than or equal to `36`")  # noqa: E501
-        if ('rev_id' in params and
-                len(params['rev_id']) < 36):
-            raise ValueError("Invalid value for parameter `rev_id` when calling `get_release_revision`, length must be greater than or equal to `36`")  # noqa: E501
-        if 'rev_id' in params and not re.search('[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', params['rev_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `rev_id` when calling `get_release_revision`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
+        if ('rev_id' not in local_var_params or
+                local_var_params['rev_id'] is None):
+            raise ApiValueError("Missing the required parameter `rev_id` when calling `get_release_revision`")  # noqa: E501
+
+        if ('rev_id' in local_var_params and
+                len(local_var_params['rev_id']) > 36):
+            raise ApiValueError("Invalid value for parameter `rev_id` when calling `get_release_revision`, length must be less than or equal to `36`")  # noqa: E501
+        if ('rev_id' in local_var_params and
+                len(local_var_params['rev_id']) < 36):
+            raise ApiValueError("Invalid value for parameter `rev_id` when calling `get_release_revision`, length must be greater than or equal to `36`")  # noqa: E501
+        if 'rev_id' in local_var_params and not re.search(r'[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', local_var_params['rev_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `rev_id` when calling `get_release_revision`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'rev_id' in params:
-            path_params['rev_id'] = params['rev_id']  # noqa: E501
+        if 'rev_id' in local_var_params:
+            path_params['rev_id'] = local_var_params['rev_id']  # noqa: E501
 
         query_params = []
-        if 'expand' in params:
-            query_params.append(('expand', params['expand']))  # noqa: E501
-        if 'hide' in params:
-            query_params.append(('hide', params['hide']))  # noqa: E501
+        if 'expand' in local_var_params:
+            query_params.append(('expand', local_var_params['expand']))  # noqa: E501
+        if 'hide' in local_var_params:
+            query_params.append(('hide', local_var_params['hide']))  # noqa: E501
 
         header_params = {}
 
@@ -7366,10 +8072,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -7383,10 +8085,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='ReleaseEntity',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_release_webcaptures(self, ident, **kwargs):  # noqa: E501
@@ -7394,70 +8096,83 @@ class DefaultApi(object):
 
         Returns the set of Web Capture entities that have a `release_id` pointing to this release entity.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_release_webcaptures(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_release_webcaptures(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param str hide: List of entity fields to elide in response. See `get_webcapture`.
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: list[WebcaptureEntity]
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_release_webcaptures_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_release_webcaptures_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_release_webcaptures_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_release_webcaptures_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_release_webcaptures  # noqa: E501
 
         Returns the set of Web Capture entities that have a `release_id` pointing to this release entity.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_release_webcaptures_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_release_webcaptures_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param str hide: List of entity fields to elide in response. See `get_webcapture`.
-        :return: list[WebcaptureEntity]
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(list[WebcaptureEntity], status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident', 'hide']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_release_webcaptures" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_release_webcaptures`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_release_webcaptures`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
-        if 'hide' in params:
-            query_params.append(('hide', params['hide']))  # noqa: E501
+        if 'hide' in local_var_params:
+            query_params.append(('hide', local_var_params['hide']))  # noqa: E501
 
         header_params = {}
 
@@ -7469,10 +8184,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -7486,83 +8197,96 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='list[WebcaptureEntity]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_webcapture(self, ident, **kwargs):  # noqa: E501
         """get_webcapture  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_webcapture(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_webcapture(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param str expand: List of sub-entities to expand in response. For webcaptures, `releases` is accepted.
         :param str hide: List of entity fields to elide in response. For webcaptures, 'cdx' is accepted.
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: WebcaptureEntity
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_webcapture_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_webcapture_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_webcapture_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_webcapture_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_webcapture  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_webcapture_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_webcapture_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param str expand: List of sub-entities to expand in response. For webcaptures, `releases` is accepted.
         :param str hide: List of entity fields to elide in response. For webcaptures, 'cdx' is accepted.
-        :return: WebcaptureEntity
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(WebcaptureEntity, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident', 'expand', 'hide']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_webcapture" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_webcapture`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_webcapture`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
-        if 'expand' in params:
-            query_params.append(('expand', params['expand']))  # noqa: E501
-        if 'hide' in params:
-            query_params.append(('hide', params['hide']))  # noqa: E501
+        if 'expand' in local_var_params:
+            query_params.append(('expand', local_var_params['expand']))  # noqa: E501
+        if 'hide' in local_var_params:
+            query_params.append(('hide', local_var_params['hide']))  # noqa: E501
 
         header_params = {}
 
@@ -7574,10 +8298,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -7591,81 +8311,94 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='WebcaptureEntity',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_webcapture_edit(self, edit_id, **kwargs):  # noqa: E501
         """get_webcapture_edit  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_webcapture_edit(edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_webcapture_edit(edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_webcapture_edit_with_http_info(edit_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_webcapture_edit_with_http_info(edit_id, **kwargs)  # noqa: E501
-            return data
+        return self.get_webcapture_edit_with_http_info(edit_id, **kwargs)  # noqa: E501
 
     def get_webcapture_edit_with_http_info(self, edit_id, **kwargs):  # noqa: E501
         """get_webcapture_edit  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_webcapture_edit_with_http_info(edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_webcapture_edit_with_http_info(edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['edit_id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_webcapture_edit" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'edit_id' is set
-        if ('edit_id' not in params or
-                params['edit_id'] is None):
-            raise ValueError("Missing the required parameter `edit_id` when calling `get_webcapture_edit`")  # noqa: E501
-
-        if ('edit_id' in params and
-                len(params['edit_id']) > 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `get_webcapture_edit`, length must be less than or equal to `36`")  # noqa: E501
-        if ('edit_id' in params and
-                len(params['edit_id']) < 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `get_webcapture_edit`, length must be greater than or equal to `36`")  # noqa: E501
-        if 'edit_id' in params and not re.search('[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', params['edit_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `edit_id` when calling `get_webcapture_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
+        if ('edit_id' not in local_var_params or
+                local_var_params['edit_id'] is None):
+            raise ApiValueError("Missing the required parameter `edit_id` when calling `get_webcapture_edit`")  # noqa: E501
+
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) > 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `get_webcapture_edit`, length must be less than or equal to `36`")  # noqa: E501
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) < 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `get_webcapture_edit`, length must be greater than or equal to `36`")  # noqa: E501
+        if 'edit_id' in local_var_params and not re.search(r'[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', local_var_params['edit_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `get_webcapture_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'edit_id' in params:
-            path_params['edit_id'] = params['edit_id']  # noqa: E501
+        if 'edit_id' in local_var_params:
+            path_params['edit_id'] = local_var_params['edit_id']  # noqa: E501
 
         query_params = []
 
@@ -7679,10 +8412,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -7696,79 +8425,92 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_webcapture_history(self, ident, **kwargs):  # noqa: E501
         """get_webcapture_history  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_webcapture_history(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_webcapture_history(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param int limit:
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: list[EntityHistoryEntry]
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_webcapture_history_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_webcapture_history_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_webcapture_history_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_webcapture_history_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_webcapture_history  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_webcapture_history_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_webcapture_history_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param int limit:
-        :return: list[EntityHistoryEntry]
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(list[EntityHistoryEntry], status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident', 'limit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_webcapture_history" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_webcapture_history`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_webcapture_history`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
+        if 'limit' in local_var_params:
+            query_params.append(('limit', local_var_params['limit']))  # noqa: E501
 
         header_params = {}
 
@@ -7780,10 +8522,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -7797,73 +8535,86 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='list[EntityHistoryEntry]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_webcapture_redirects(self, ident, **kwargs):  # noqa: E501
         """get_webcapture_redirects  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_webcapture_redirects(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_webcapture_redirects(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: list[str]
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_webcapture_redirects_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_webcapture_redirects_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_webcapture_redirects_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_webcapture_redirects_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_webcapture_redirects  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_webcapture_redirects_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_webcapture_redirects_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
-        :return: list[str]
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(list[str], status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_webcapture_redirects" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_webcapture_redirects`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_webcapture_redirects`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
 
@@ -7877,10 +8628,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -7894,91 +8641,104 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='list[str]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_webcapture_revision(self, rev_id, **kwargs):  # noqa: E501
         """get_webcapture_revision  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_webcapture_revision(rev_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_webcapture_revision(rev_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str rev_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
         :param str expand: List of sub-entities to expand in response. See `get_webcapture`.
         :param str hide: List of entity fields to elide in response. See `get_webcapture`.
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: WebcaptureEntity
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_webcapture_revision_with_http_info(rev_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_webcapture_revision_with_http_info(rev_id, **kwargs)  # noqa: E501
-            return data
+        return self.get_webcapture_revision_with_http_info(rev_id, **kwargs)  # noqa: E501
 
     def get_webcapture_revision_with_http_info(self, rev_id, **kwargs):  # noqa: E501
         """get_webcapture_revision  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_webcapture_revision_with_http_info(rev_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_webcapture_revision_with_http_info(rev_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str rev_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
         :param str expand: List of sub-entities to expand in response. See `get_webcapture`.
         :param str hide: List of entity fields to elide in response. See `get_webcapture`.
-        :return: WebcaptureEntity
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(WebcaptureEntity, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['rev_id', 'expand', 'hide']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_webcapture_revision" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'rev_id' is set
-        if ('rev_id' not in params or
-                params['rev_id'] is None):
-            raise ValueError("Missing the required parameter `rev_id` when calling `get_webcapture_revision`")  # noqa: E501
-
-        if ('rev_id' in params and
-                len(params['rev_id']) > 36):
-            raise ValueError("Invalid value for parameter `rev_id` when calling `get_webcapture_revision`, length must be less than or equal to `36`")  # noqa: E501
-        if ('rev_id' in params and
-                len(params['rev_id']) < 36):
-            raise ValueError("Invalid value for parameter `rev_id` when calling `get_webcapture_revision`, length must be greater than or equal to `36`")  # noqa: E501
-        if 'rev_id' in params and not re.search('[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', params['rev_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `rev_id` when calling `get_webcapture_revision`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
+        if ('rev_id' not in local_var_params or
+                local_var_params['rev_id'] is None):
+            raise ApiValueError("Missing the required parameter `rev_id` when calling `get_webcapture_revision`")  # noqa: E501
+
+        if ('rev_id' in local_var_params and
+                len(local_var_params['rev_id']) > 36):
+            raise ApiValueError("Invalid value for parameter `rev_id` when calling `get_webcapture_revision`, length must be less than or equal to `36`")  # noqa: E501
+        if ('rev_id' in local_var_params and
+                len(local_var_params['rev_id']) < 36):
+            raise ApiValueError("Invalid value for parameter `rev_id` when calling `get_webcapture_revision`, length must be greater than or equal to `36`")  # noqa: E501
+        if 'rev_id' in local_var_params and not re.search(r'[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', local_var_params['rev_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `rev_id` when calling `get_webcapture_revision`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'rev_id' in params:
-            path_params['rev_id'] = params['rev_id']  # noqa: E501
+        if 'rev_id' in local_var_params:
+            path_params['rev_id'] = local_var_params['rev_id']  # noqa: E501
 
         query_params = []
-        if 'expand' in params:
-            query_params.append(('expand', params['expand']))  # noqa: E501
-        if 'hide' in params:
-            query_params.append(('hide', params['hide']))  # noqa: E501
+        if 'expand' in local_var_params:
+            query_params.append(('expand', local_var_params['expand']))  # noqa: E501
+        if 'hide' in local_var_params:
+            query_params.append(('hide', local_var_params['hide']))  # noqa: E501
 
         header_params = {}
 
@@ -7990,10 +8750,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -8007,83 +8763,96 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='WebcaptureEntity',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_work(self, ident, **kwargs):  # noqa: E501
         """get_work  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_work(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_work(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param str expand: List of sub-entities to expand in response. For works, none accepted (yet).
         :param str hide: List of entity fields to elide in response. For works, none accepted (yet).
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: WorkEntity
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_work_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_work_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_work_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_work_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_work  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_work_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_work_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param str expand: List of sub-entities to expand in response. For works, none accepted (yet).
         :param str hide: List of entity fields to elide in response. For works, none accepted (yet).
-        :return: WorkEntity
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(WorkEntity, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident', 'expand', 'hide']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_work" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_work`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_work`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
-        if 'expand' in params:
-            query_params.append(('expand', params['expand']))  # noqa: E501
-        if 'hide' in params:
-            query_params.append(('hide', params['hide']))  # noqa: E501
+        if 'expand' in local_var_params:
+            query_params.append(('expand', local_var_params['expand']))  # noqa: E501
+        if 'hide' in local_var_params:
+            query_params.append(('hide', local_var_params['hide']))  # noqa: E501
 
         header_params = {}
 
@@ -8095,10 +8864,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -8112,81 +8877,94 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='WorkEntity',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_work_edit(self, edit_id, **kwargs):  # noqa: E501
         """get_work_edit  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_work_edit(edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_work_edit(edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_work_edit_with_http_info(edit_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_work_edit_with_http_info(edit_id, **kwargs)  # noqa: E501
-            return data
+        return self.get_work_edit_with_http_info(edit_id, **kwargs)  # noqa: E501
 
     def get_work_edit_with_http_info(self, edit_id, **kwargs):  # noqa: E501
         """get_work_edit  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_work_edit_with_http_info(edit_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_work_edit_with_http_info(edit_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str edit_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['edit_id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_work_edit" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'edit_id' is set
-        if ('edit_id' not in params or
-                params['edit_id'] is None):
-            raise ValueError("Missing the required parameter `edit_id` when calling `get_work_edit`")  # noqa: E501
-
-        if ('edit_id' in params and
-                len(params['edit_id']) > 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `get_work_edit`, length must be less than or equal to `36`")  # noqa: E501
-        if ('edit_id' in params and
-                len(params['edit_id']) < 36):
-            raise ValueError("Invalid value for parameter `edit_id` when calling `get_work_edit`, length must be greater than or equal to `36`")  # noqa: E501
-        if 'edit_id' in params and not re.search('[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', params['edit_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `edit_id` when calling `get_work_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
+        if ('edit_id' not in local_var_params or
+                local_var_params['edit_id'] is None):
+            raise ApiValueError("Missing the required parameter `edit_id` when calling `get_work_edit`")  # noqa: E501
+
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) > 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `get_work_edit`, length must be less than or equal to `36`")  # noqa: E501
+        if ('edit_id' in local_var_params and
+                len(local_var_params['edit_id']) < 36):
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `get_work_edit`, length must be greater than or equal to `36`")  # noqa: E501
+        if 'edit_id' in local_var_params and not re.search(r'[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', local_var_params['edit_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `edit_id` when calling `get_work_edit`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'edit_id' in params:
-            path_params['edit_id'] = params['edit_id']  # noqa: E501
+        if 'edit_id' in local_var_params:
+            path_params['edit_id'] = local_var_params['edit_id']  # noqa: E501
 
         query_params = []
 
@@ -8200,10 +8978,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -8217,79 +8991,92 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_work_history(self, ident, **kwargs):  # noqa: E501
         """get_work_history  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_work_history(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_work_history(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param int limit:
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: list[EntityHistoryEntry]
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_work_history_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_work_history_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_work_history_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_work_history_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_work_history  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_work_history_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_work_history_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param int limit:
-        :return: list[EntityHistoryEntry]
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(list[EntityHistoryEntry], status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident', 'limit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_work_history" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_work_history`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_work_history`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
+        if 'limit' in local_var_params:
+            query_params.append(('limit', local_var_params['limit']))  # noqa: E501
 
         header_params = {}
 
@@ -8301,10 +9088,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -8318,73 +9101,86 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='list[EntityHistoryEntry]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_work_redirects(self, ident, **kwargs):  # noqa: E501
         """get_work_redirects  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_work_redirects(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_work_redirects(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: list[str]
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_work_redirects_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_work_redirects_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_work_redirects_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_work_redirects_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_work_redirects  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_work_redirects_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_work_redirects_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
-        :return: list[str]
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(list[str], status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_work_redirects" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_work_redirects`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_work_redirects`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
 
@@ -8398,10 +9194,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -8415,10 +9207,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='list[str]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_work_releases(self, ident, **kwargs):  # noqa: E501
@@ -8426,70 +9218,83 @@ class DefaultApi(object):
 
         Returns the set of release entities that are part of this work (aka, have `work_id` pointing to this work entity).   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_work_releases(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_work_releases(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param str hide: List of entity fields to elide in response. See `get_release`.
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: list[ReleaseEntity]
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_work_releases_with_http_info(ident, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_work_releases_with_http_info(ident, **kwargs)  # noqa: E501
-            return data
+        return self.get_work_releases_with_http_info(ident, **kwargs)  # noqa: E501
 
     def get_work_releases_with_http_info(self, ident, **kwargs):  # noqa: E501
         """get_work_releases  # noqa: E501
 
         Returns the set of release entities that are part of this work (aka, have `work_id` pointing to this work entity).   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_work_releases_with_http_info(ident, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_work_releases_with_http_info(ident, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str ident: (required)
         :param str hide: List of entity fields to elide in response. See `get_release`.
-        :return: list[ReleaseEntity]
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(list[ReleaseEntity], status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['ident', 'hide']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_work_releases" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `get_work_releases`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `get_work_releases`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
-        if 'hide' in params:
-            query_params.append(('hide', params['hide']))  # noqa: E501
+        if 'hide' in local_var_params:
+            query_params.append(('hide', local_var_params['hide']))  # noqa: E501
 
         header_params = {}
 
@@ -8501,10 +9306,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -8518,91 +9319,104 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='list[ReleaseEntity]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def get_work_revision(self, rev_id, **kwargs):  # noqa: E501
         """get_work_revision  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_work_revision(rev_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_work_revision(rev_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str rev_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
         :param str expand: List of sub-entities to expand in response. See `get_work`, though note that identifier-based expansions like `releases` will always be empty for revisions.
         :param str hide: List of entity fields to elide in response. See `get_work`.
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: WorkEntity
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.get_work_revision_with_http_info(rev_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_work_revision_with_http_info(rev_id, **kwargs)  # noqa: E501
-            return data
+        return self.get_work_revision_with_http_info(rev_id, **kwargs)  # noqa: E501
 
     def get_work_revision_with_http_info(self, rev_id, **kwargs):  # noqa: E501
         """get_work_revision  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_work_revision_with_http_info(rev_id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_work_revision_with_http_info(rev_id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str rev_id: UUID (lower-case, dash-separated, hex-encoded 128-bit) (required)
         :param str expand: List of sub-entities to expand in response. See `get_work`, though note that identifier-based expansions like `releases` will always be empty for revisions.
         :param str hide: List of entity fields to elide in response. See `get_work`.
-        :return: WorkEntity
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(WorkEntity, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['rev_id', 'expand', 'hide']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method get_work_revision" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'rev_id' is set
-        if ('rev_id' not in params or
-                params['rev_id'] is None):
-            raise ValueError("Missing the required parameter `rev_id` when calling `get_work_revision`")  # noqa: E501
-
-        if ('rev_id' in params and
-                len(params['rev_id']) > 36):
-            raise ValueError("Invalid value for parameter `rev_id` when calling `get_work_revision`, length must be less than or equal to `36`")  # noqa: E501
-        if ('rev_id' in params and
-                len(params['rev_id']) < 36):
-            raise ValueError("Invalid value for parameter `rev_id` when calling `get_work_revision`, length must be greater than or equal to `36`")  # noqa: E501
-        if 'rev_id' in params and not re.search('[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', params['rev_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `rev_id` when calling `get_work_revision`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
+        if ('rev_id' not in local_var_params or
+                local_var_params['rev_id'] is None):
+            raise ApiValueError("Missing the required parameter `rev_id` when calling `get_work_revision`")  # noqa: E501
+
+        if ('rev_id' in local_var_params and
+                len(local_var_params['rev_id']) > 36):
+            raise ApiValueError("Invalid value for parameter `rev_id` when calling `get_work_revision`, length must be less than or equal to `36`")  # noqa: E501
+        if ('rev_id' in local_var_params and
+                len(local_var_params['rev_id']) < 36):
+            raise ApiValueError("Invalid value for parameter `rev_id` when calling `get_work_revision`, length must be greater than or equal to `36`")  # noqa: E501
+        if 'rev_id' in local_var_params and not re.search(r'[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', local_var_params['rev_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `rev_id` when calling `get_work_revision`, must conform to the pattern `/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'rev_id' in params:
-            path_params['rev_id'] = params['rev_id']  # noqa: E501
+        if 'rev_id' in local_var_params:
+            path_params['rev_id'] = local_var_params['rev_id']  # noqa: E501
 
         query_params = []
-        if 'expand' in params:
-            query_params.append(('expand', params['expand']))  # noqa: E501
-        if 'hide' in params:
-            query_params.append(('hide', params['hide']))  # noqa: E501
+        if 'expand' in local_var_params:
+            query_params.append(('expand', local_var_params['expand']))  # noqa: E501
+        if 'hide' in local_var_params:
+            query_params.append(('hide', local_var_params['hide']))  # noqa: E501
 
         header_params = {}
 
@@ -8614,10 +9428,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -8631,10 +9441,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='WorkEntity',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def lookup_container(self, **kwargs):  # noqa: E501
@@ -8642,82 +9452,95 @@ class DefaultApi(object):
 
         Looks for an active entity with the given external identifier. If any such entity is found, returns a single complete entity. If multiple entities have the same external identifier, this is considered a soft catalog error, and the behavior of which entity is returned is undefined.  One (and only one) external identifier should be specified per request.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.lookup_container(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.lookup_container(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str issnl:
         :param str wikidata_qid:
         :param str expand: List of sub-entities to expand in response. See `get_container`.
         :param str hide: List of entity fields to elide in response. See `get_container`.
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: ContainerEntity
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.lookup_container_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.lookup_container_with_http_info(**kwargs)  # noqa: E501
-            return data
+        return self.lookup_container_with_http_info(**kwargs)  # noqa: E501
 
     def lookup_container_with_http_info(self, **kwargs):  # noqa: E501
         """lookup_container  # noqa: E501
 
         Looks for an active entity with the given external identifier. If any such entity is found, returns a single complete entity. If multiple entities have the same external identifier, this is considered a soft catalog error, and the behavior of which entity is returned is undefined.  One (and only one) external identifier should be specified per request.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.lookup_container_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.lookup_container_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str issnl:
         :param str wikidata_qid:
         :param str expand: List of sub-entities to expand in response. See `get_container`.
         :param str hide: List of entity fields to elide in response. See `get_container`.
-        :return: ContainerEntity
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(ContainerEntity, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['issnl', 'wikidata_qid', 'expand', 'hide']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method lookup_container" % key
                 )
-            params[key] = val
-        del params['kwargs']
-
-        if ('issnl' in params and
-                len(params['issnl']) > 9):
-            raise ValueError("Invalid value for parameter `issnl` when calling `lookup_container`, length must be less than or equal to `9`")  # noqa: E501
-        if ('issnl' in params and
-                len(params['issnl']) < 9):
-            raise ValueError("Invalid value for parameter `issnl` when calling `lookup_container`, length must be greater than or equal to `9`")  # noqa: E501
-        if 'issnl' in params and not re.search('\\d{4}-\\d{3}[0-9X]', params['issnl']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `issnl` when calling `lookup_container`, must conform to the pattern `/\\d{4}-\\d{3}[0-9X]/`")  # noqa: E501
+            local_var_params[key] = val
+        del local_var_params['kwargs']
+
+        if ('issnl' in local_var_params and
+                len(local_var_params['issnl']) > 9):
+            raise ApiValueError("Invalid value for parameter `issnl` when calling `lookup_container`, length must be less than or equal to `9`")  # noqa: E501
+        if ('issnl' in local_var_params and
+                len(local_var_params['issnl']) < 9):
+            raise ApiValueError("Invalid value for parameter `issnl` when calling `lookup_container`, length must be greater than or equal to `9`")  # noqa: E501
+        if 'issnl' in local_var_params and not re.search(r'\d{4}-\d{3}[0-9X]', local_var_params['issnl']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `issnl` when calling `lookup_container`, must conform to the pattern `/\d{4}-\d{3}[0-9X]/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
 
         query_params = []
-        if 'issnl' in params:
-            query_params.append(('issnl', params['issnl']))  # noqa: E501
-        if 'wikidata_qid' in params:
-            query_params.append(('wikidata_qid', params['wikidata_qid']))  # noqa: E501
-        if 'expand' in params:
-            query_params.append(('expand', params['expand']))  # noqa: E501
-        if 'hide' in params:
-            query_params.append(('hide', params['hide']))  # noqa: E501
+        if 'issnl' in local_var_params:
+            query_params.append(('issnl', local_var_params['issnl']))  # noqa: E501
+        if 'wikidata_qid' in local_var_params:
+            query_params.append(('wikidata_qid', local_var_params['wikidata_qid']))  # noqa: E501
+        if 'expand' in local_var_params:
+            query_params.append(('expand', local_var_params['expand']))  # noqa: E501
+        if 'hide' in local_var_params:
+            query_params.append(('hide', local_var_params['hide']))  # noqa: E501
 
         header_params = {}
 
@@ -8729,10 +9552,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -8746,91 +9565,104 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='ContainerEntity',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def lookup_creator(self, **kwargs):  # noqa: E501
         """lookup_creator  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.lookup_creator(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.lookup_creator(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str orcid: ORCiD (https://orcid.org) identifier
         :param str wikidata_qid:
         :param str expand: List of sub-entities to expand in response. See `get_creator`.
         :param str hide: List of entity fields to elide in response. See `get_creator`.
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: CreatorEntity
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.lookup_creator_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.lookup_creator_with_http_info(**kwargs)  # noqa: E501
-            return data
+        return self.lookup_creator_with_http_info(**kwargs)  # noqa: E501
 
     def lookup_creator_with_http_info(self, **kwargs):  # noqa: E501
         """lookup_creator  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.lookup_creator_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.lookup_creator_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str orcid: ORCiD (https://orcid.org) identifier
         :param str wikidata_qid:
         :param str expand: List of sub-entities to expand in response. See `get_creator`.
         :param str hide: List of entity fields to elide in response. See `get_creator`.
-        :return: CreatorEntity
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(CreatorEntity, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['orcid', 'wikidata_qid', 'expand', 'hide']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method lookup_creator" % key
                 )
-            params[key] = val
-        del params['kwargs']
-
-        if ('orcid' in params and
-                len(params['orcid']) > 19):
-            raise ValueError("Invalid value for parameter `orcid` when calling `lookup_creator`, length must be less than or equal to `19`")  # noqa: E501
-        if ('orcid' in params and
-                len(params['orcid']) < 19):
-            raise ValueError("Invalid value for parameter `orcid` when calling `lookup_creator`, length must be greater than or equal to `19`")  # noqa: E501
-        if 'orcid' in params and not re.search('\\d{4}-\\d{4}-\\d{4}-\\d{3}[\\dX]', params['orcid']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `orcid` when calling `lookup_creator`, must conform to the pattern `/\\d{4}-\\d{4}-\\d{4}-\\d{3}[\\dX]/`")  # noqa: E501
+            local_var_params[key] = val
+        del local_var_params['kwargs']
+
+        if ('orcid' in local_var_params and
+                len(local_var_params['orcid']) > 19):
+            raise ApiValueError("Invalid value for parameter `orcid` when calling `lookup_creator`, length must be less than or equal to `19`")  # noqa: E501
+        if ('orcid' in local_var_params and
+                len(local_var_params['orcid']) < 19):
+            raise ApiValueError("Invalid value for parameter `orcid` when calling `lookup_creator`, length must be greater than or equal to `19`")  # noqa: E501
+        if 'orcid' in local_var_params and not re.search(r'\d{4}-\d{4}-\d{4}-\d{3}[\dX]', local_var_params['orcid']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `orcid` when calling `lookup_creator`, must conform to the pattern `/\d{4}-\d{4}-\d{4}-\d{3}[\dX]/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
 
         query_params = []
-        if 'orcid' in params:
-            query_params.append(('orcid', params['orcid']))  # noqa: E501
-        if 'wikidata_qid' in params:
-            query_params.append(('wikidata_qid', params['wikidata_qid']))  # noqa: E501
-        if 'expand' in params:
-            query_params.append(('expand', params['expand']))  # noqa: E501
-        if 'hide' in params:
-            query_params.append(('hide', params['hide']))  # noqa: E501
+        if 'orcid' in local_var_params:
+            query_params.append(('orcid', local_var_params['orcid']))  # noqa: E501
+        if 'wikidata_qid' in local_var_params:
+            query_params.append(('wikidata_qid', local_var_params['wikidata_qid']))  # noqa: E501
+        if 'expand' in local_var_params:
+            query_params.append(('expand', local_var_params['expand']))  # noqa: E501
+        if 'hide' in local_var_params:
+            query_params.append(('hide', local_var_params['hide']))  # noqa: E501
 
         header_params = {}
 
@@ -8842,10 +9674,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -8859,111 +9687,124 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='CreatorEntity',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def lookup_file(self, **kwargs):  # noqa: E501
         """lookup_file  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.lookup_file(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.lookup_file(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str md5: MD5 hash of data, in hex encoding
         :param str sha1: SHA-1 hash of data, in hex encoding
         :param str sha256: SHA-256 hash of data, in hex encoding
         :param str expand: List of sub-entities to expand in response. See `get_file`.
         :param str hide: List of entity fields to elide in response. See `get_file`.
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: FileEntity
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.lookup_file_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.lookup_file_with_http_info(**kwargs)  # noqa: E501
-            return data
+        return self.lookup_file_with_http_info(**kwargs)  # noqa: E501
 
     def lookup_file_with_http_info(self, **kwargs):  # noqa: E501
         """lookup_file  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.lookup_file_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.lookup_file_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str md5: MD5 hash of data, in hex encoding
         :param str sha1: SHA-1 hash of data, in hex encoding
         :param str sha256: SHA-256 hash of data, in hex encoding
         :param str expand: List of sub-entities to expand in response. See `get_file`.
         :param str hide: List of entity fields to elide in response. See `get_file`.
-        :return: FileEntity
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(FileEntity, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['md5', 'sha1', 'sha256', 'expand', 'hide']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method lookup_file" % key
                 )
-            params[key] = val
-        del params['kwargs']
-
-        if ('md5' in params and
-                len(params['md5']) > 32):
-            raise ValueError("Invalid value for parameter `md5` when calling `lookup_file`, length must be less than or equal to `32`")  # noqa: E501
-        if ('md5' in params and
-                len(params['md5']) < 32):
-            raise ValueError("Invalid value for parameter `md5` when calling `lookup_file`, length must be greater than or equal to `32`")  # noqa: E501
-        if 'md5' in params and not re.search('[a-f0-9]{32}', params['md5']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `md5` when calling `lookup_file`, must conform to the pattern `/[a-f0-9]{32}/`")  # noqa: E501
-        if ('sha1' in params and
-                len(params['sha1']) > 40):
-            raise ValueError("Invalid value for parameter `sha1` when calling `lookup_file`, length must be less than or equal to `40`")  # noqa: E501
-        if ('sha1' in params and
-                len(params['sha1']) < 40):
-            raise ValueError("Invalid value for parameter `sha1` when calling `lookup_file`, length must be greater than or equal to `40`")  # noqa: E501
-        if 'sha1' in params and not re.search('[a-f0-9]{40}', params['sha1']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `sha1` when calling `lookup_file`, must conform to the pattern `/[a-f0-9]{40}/`")  # noqa: E501
-        if ('sha256' in params and
-                len(params['sha256']) > 64):
-            raise ValueError("Invalid value for parameter `sha256` when calling `lookup_file`, length must be less than or equal to `64`")  # noqa: E501
-        if ('sha256' in params and
-                len(params['sha256']) < 64):
-            raise ValueError("Invalid value for parameter `sha256` when calling `lookup_file`, length must be greater than or equal to `64`")  # noqa: E501
-        if 'sha256' in params and not re.search('[a-f0-9]{64}', params['sha256']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `sha256` when calling `lookup_file`, must conform to the pattern `/[a-f0-9]{64}/`")  # noqa: E501
+            local_var_params[key] = val
+        del local_var_params['kwargs']
+
+        if ('md5' in local_var_params and
+                len(local_var_params['md5']) > 32):
+            raise ApiValueError("Invalid value for parameter `md5` when calling `lookup_file`, length must be less than or equal to `32`")  # noqa: E501
+        if ('md5' in local_var_params and
+                len(local_var_params['md5']) < 32):
+            raise ApiValueError("Invalid value for parameter `md5` when calling `lookup_file`, length must be greater than or equal to `32`")  # noqa: E501
+        if 'md5' in local_var_params and not re.search(r'[a-f0-9]{32}', local_var_params['md5']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `md5` when calling `lookup_file`, must conform to the pattern `/[a-f0-9]{32}/`")  # noqa: E501
+        if ('sha1' in local_var_params and
+                len(local_var_params['sha1']) > 40):
+            raise ApiValueError("Invalid value for parameter `sha1` when calling `lookup_file`, length must be less than or equal to `40`")  # noqa: E501
+        if ('sha1' in local_var_params and
+                len(local_var_params['sha1']) < 40):
+            raise ApiValueError("Invalid value for parameter `sha1` when calling `lookup_file`, length must be greater than or equal to `40`")  # noqa: E501
+        if 'sha1' in local_var_params and not re.search(r'[a-f0-9]{40}', local_var_params['sha1']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `sha1` when calling `lookup_file`, must conform to the pattern `/[a-f0-9]{40}/`")  # noqa: E501
+        if ('sha256' in local_var_params and
+                len(local_var_params['sha256']) > 64):
+            raise ApiValueError("Invalid value for parameter `sha256` when calling `lookup_file`, length must be less than or equal to `64`")  # noqa: E501
+        if ('sha256' in local_var_params and
+                len(local_var_params['sha256']) < 64):
+            raise ApiValueError("Invalid value for parameter `sha256` when calling `lookup_file`, length must be greater than or equal to `64`")  # noqa: E501
+        if 'sha256' in local_var_params and not re.search(r'[a-f0-9]{64}', local_var_params['sha256']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `sha256` when calling `lookup_file`, must conform to the pattern `/[a-f0-9]{64}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
 
         query_params = []
-        if 'md5' in params:
-            query_params.append(('md5', params['md5']))  # noqa: E501
-        if 'sha1' in params:
-            query_params.append(('sha1', params['sha1']))  # noqa: E501
-        if 'sha256' in params:
-            query_params.append(('sha256', params['sha256']))  # noqa: E501
-        if 'expand' in params:
-            query_params.append(('expand', params['expand']))  # noqa: E501
-        if 'hide' in params:
-            query_params.append(('hide', params['hide']))  # noqa: E501
+        if 'md5' in local_var_params:
+            query_params.append(('md5', local_var_params['md5']))  # noqa: E501
+        if 'sha1' in local_var_params:
+            query_params.append(('sha1', local_var_params['sha1']))  # noqa: E501
+        if 'sha256' in local_var_params:
+            query_params.append(('sha256', local_var_params['sha256']))  # noqa: E501
+        if 'expand' in local_var_params:
+            query_params.append(('expand', local_var_params['expand']))  # noqa: E501
+        if 'hide' in local_var_params:
+            query_params.append(('hide', local_var_params['hide']))  # noqa: E501
 
         header_params = {}
 
@@ -8975,10 +9816,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -8992,10 +9829,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='FileEntity',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def lookup_release(self, **kwargs):  # noqa: E501
@@ -9003,11 +9840,11 @@ class DefaultApi(object):
 
         Looks for an active entity with the given external identifier. If any such entity is found, returns a single complete entity. If multiple entities have the same external identifier, this is considered a soft catalog error, and the behavior of which entity is returned is undefined.  One (and only one) external identifier should be specified per request.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.lookup_release(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.lookup_release(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str doi:
         :param str wikidata_qid:
         :param str isbn13:
@@ -9020,27 +9857,30 @@ class DefaultApi(object):
         :param str mag:
         :param str expand: List of sub-entities to expand in response. See `get_release`.
         :param str hide: List of sub-entities to elide in response. See `get_release`.
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: ReleaseEntity
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.lookup_release_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.lookup_release_with_http_info(**kwargs)  # noqa: E501
-            return data
+        return self.lookup_release_with_http_info(**kwargs)  # noqa: E501
 
     def lookup_release_with_http_info(self, **kwargs):  # noqa: E501
         """lookup_release  # noqa: E501
 
         Looks for an active entity with the given external identifier. If any such entity is found, returns a single complete entity. If multiple entities have the same external identifier, this is considered a soft catalog error, and the behavior of which entity is returned is undefined.  One (and only one) external identifier should be specified per request.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.lookup_release_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.lookup_release_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str doi:
         :param str wikidata_qid:
         :param str isbn13:
@@ -9053,56 +9893,66 @@ class DefaultApi(object):
         :param str mag:
         :param str expand: List of sub-entities to expand in response. See `get_release`.
         :param str hide: List of sub-entities to elide in response. See `get_release`.
-        :return: ReleaseEntity
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(ReleaseEntity, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['doi', 'wikidata_qid', 'isbn13', 'pmid', 'pmcid', 'core', 'arxiv', 'jstor', 'ark', 'mag', 'expand', 'hide']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method lookup_release" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
 
         collection_formats = {}
 
         path_params = {}
 
         query_params = []
-        if 'doi' in params:
-            query_params.append(('doi', params['doi']))  # noqa: E501
-        if 'wikidata_qid' in params:
-            query_params.append(('wikidata_qid', params['wikidata_qid']))  # noqa: E501
-        if 'isbn13' in params:
-            query_params.append(('isbn13', params['isbn13']))  # noqa: E501
-        if 'pmid' in params:
-            query_params.append(('pmid', params['pmid']))  # noqa: E501
-        if 'pmcid' in params:
-            query_params.append(('pmcid', params['pmcid']))  # noqa: E501
-        if 'core' in params:
-            query_params.append(('core', params['core']))  # noqa: E501
-        if 'arxiv' in params:
-            query_params.append(('arxiv', params['arxiv']))  # noqa: E501
-        if 'jstor' in params:
-            query_params.append(('jstor', params['jstor']))  # noqa: E501
-        if 'ark' in params:
-            query_params.append(('ark', params['ark']))  # noqa: E501
-        if 'mag' in params:
-            query_params.append(('mag', params['mag']))  # noqa: E501
-        if 'expand' in params:
-            query_params.append(('expand', params['expand']))  # noqa: E501
-        if 'hide' in params:
-            query_params.append(('hide', params['hide']))  # noqa: E501
+        if 'doi' in local_var_params:
+            query_params.append(('doi', local_var_params['doi']))  # noqa: E501
+        if 'wikidata_qid' in local_var_params:
+            query_params.append(('wikidata_qid', local_var_params['wikidata_qid']))  # noqa: E501
+        if 'isbn13' in local_var_params:
+            query_params.append(('isbn13', local_var_params['isbn13']))  # noqa: E501
+        if 'pmid' in local_var_params:
+            query_params.append(('pmid', local_var_params['pmid']))  # noqa: E501
+        if 'pmcid' in local_var_params:
+            query_params.append(('pmcid', local_var_params['pmcid']))  # noqa: E501
+        if 'core' in local_var_params:
+            query_params.append(('core', local_var_params['core']))  # noqa: E501
+        if 'arxiv' in local_var_params:
+            query_params.append(('arxiv', local_var_params['arxiv']))  # noqa: E501
+        if 'jstor' in local_var_params:
+            query_params.append(('jstor', local_var_params['jstor']))  # noqa: E501
+        if 'ark' in local_var_params:
+            query_params.append(('ark', local_var_params['ark']))  # noqa: E501
+        if 'mag' in local_var_params:
+            query_params.append(('mag', local_var_params['mag']))  # noqa: E501
+        if 'expand' in local_var_params:
+            query_params.append(('expand', local_var_params['expand']))  # noqa: E501
+        if 'hide' in local_var_params:
+            query_params.append(('hide', local_var_params['hide']))  # noqa: E501
 
         header_params = {}
 
@@ -9114,10 +9964,6 @@ class DefaultApi(object):
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = []  # noqa: E501
 
@@ -9131,10 +9977,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='ReleaseEntity',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def update_container(self, editgroup_id, ident, entity, **kwargs):  # noqa: E501
@@ -9142,78 +9988,91 @@ class DefaultApi(object):
 
         Updates an existing entity as part of a specific (existing) editgroup. The editgroup must be open for updates (aka, not accepted/merged), and the editor making the requiest must have permissions (aka, must have created the editgroup or have `admin` role).  This method can also be used to update an existing entity edit as part of an editgroup. For example, if an entity was created in this editgroup, an editor could make changes to the new entity's metadata before merging.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_container(editgroup_id, ident, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_container(editgroup_id, ident, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
         :param ContainerEntity entity: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.update_container_with_http_info(editgroup_id, ident, entity, **kwargs)  # noqa: E501
-        else:
-            (data) = self.update_container_with_http_info(editgroup_id, ident, entity, **kwargs)  # noqa: E501
-            return data
+        return self.update_container_with_http_info(editgroup_id, ident, entity, **kwargs)  # noqa: E501
 
     def update_container_with_http_info(self, editgroup_id, ident, entity, **kwargs):  # noqa: E501
         """update_container  # noqa: E501
 
         Updates an existing entity as part of a specific (existing) editgroup. The editgroup must be open for updates (aka, not accepted/merged), and the editor making the requiest must have permissions (aka, must have created the editgroup or have `admin` role).  This method can also be used to update an existing entity edit as part of an editgroup. For example, if an entity was created in this editgroup, an editor could make changes to the new entity's metadata before merging.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_container_with_http_info(editgroup_id, ident, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_container_with_http_info(editgroup_id, ident, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
         :param ContainerEntity entity: (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'ident', 'entity']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method update_container" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `update_container`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `update_container`")  # noqa: E501
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `update_container`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `update_container`")  # noqa: E501
         # verify the required parameter 'entity' is set
-        if ('entity' not in params or
-                params['entity'] is None):
-            raise ValueError("Missing the required parameter `entity` when calling `update_container`")  # noqa: E501
+        if ('entity' not in local_var_params or
+                local_var_params['entity'] is None):
+            raise ApiValueError("Missing the required parameter `entity` when calling `update_container`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
 
@@ -9223,8 +10082,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'entity' in params:
-            body_params = params['entity']
+        if 'entity' in local_var_params:
+            body_params = local_var_params['entity']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -9246,87 +10105,100 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def update_creator(self, editgroup_id, ident, entity, **kwargs):  # noqa: E501
         """update_creator  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_creator(editgroup_id, ident, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_creator(editgroup_id, ident, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
         :param CreatorEntity entity: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.update_creator_with_http_info(editgroup_id, ident, entity, **kwargs)  # noqa: E501
-        else:
-            (data) = self.update_creator_with_http_info(editgroup_id, ident, entity, **kwargs)  # noqa: E501
-            return data
+        return self.update_creator_with_http_info(editgroup_id, ident, entity, **kwargs)  # noqa: E501
 
     def update_creator_with_http_info(self, editgroup_id, ident, entity, **kwargs):  # noqa: E501
         """update_creator  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_creator_with_http_info(editgroup_id, ident, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_creator_with_http_info(editgroup_id, ident, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
         :param CreatorEntity entity: (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'ident', 'entity']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method update_creator" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `update_creator`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `update_creator`")  # noqa: E501
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `update_creator`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `update_creator`")  # noqa: E501
         # verify the required parameter 'entity' is set
-        if ('entity' not in params or
-                params['entity'] is None):
-            raise ValueError("Missing the required parameter `entity` when calling `update_creator`")  # noqa: E501
+        if ('entity' not in local_var_params or
+                local_var_params['entity'] is None):
+            raise ApiValueError("Missing the required parameter `entity` when calling `update_creator`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
 
@@ -9336,8 +10208,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'entity' in params:
-            body_params = params['entity']
+        if 'entity' in local_var_params:
+            body_params = local_var_params['entity']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -9359,10 +10231,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def update_editgroup(self, editgroup_id, editgroup, **kwargs):  # noqa: E501
@@ -9370,84 +10242,97 @@ class DefaultApi(object):
 
         Updates metadata for a single editgroup object. Note that only metadata fields such as the `description` or `extra` metadata can be changed with this method; it does not allow adding or removing edits to the editgroup (for that use the individual entity create/update/delete methods).   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_editgroup(editgroup_id, editgroup, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_editgroup(editgroup_id, editgroup, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: base32-encoded unique identifier (required)
         :param Editgroup editgroup: (required)
         :param bool submit:
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: Editgroup
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.update_editgroup_with_http_info(editgroup_id, editgroup, **kwargs)  # noqa: E501
-        else:
-            (data) = self.update_editgroup_with_http_info(editgroup_id, editgroup, **kwargs)  # noqa: E501
-            return data
+        return self.update_editgroup_with_http_info(editgroup_id, editgroup, **kwargs)  # noqa: E501
 
     def update_editgroup_with_http_info(self, editgroup_id, editgroup, **kwargs):  # noqa: E501
         """update_editgroup  # noqa: E501
 
         Updates metadata for a single editgroup object. Note that only metadata fields such as the `description` or `extra` metadata can be changed with this method; it does not allow adding or removing edits to the editgroup (for that use the individual entity create/update/delete methods).   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_editgroup_with_http_info(editgroup_id, editgroup, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_editgroup_with_http_info(editgroup_id, editgroup, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: base32-encoded unique identifier (required)
         :param Editgroup editgroup: (required)
         :param bool submit:
-        :return: Editgroup
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(Editgroup, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'editgroup', 'submit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method update_editgroup" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `update_editgroup`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `update_editgroup`")  # noqa: E501
         # verify the required parameter 'editgroup' is set
-        if ('editgroup' not in params or
-                params['editgroup'] is None):
-            raise ValueError("Missing the required parameter `editgroup` when calling `update_editgroup`")  # noqa: E501
-
-        if ('editgroup_id' in params and
-                len(params['editgroup_id']) > 26):
-            raise ValueError("Invalid value for parameter `editgroup_id` when calling `update_editgroup`, length must be less than or equal to `26`")  # noqa: E501
-        if ('editgroup_id' in params and
-                len(params['editgroup_id']) < 26):
-            raise ValueError("Invalid value for parameter `editgroup_id` when calling `update_editgroup`, length must be greater than or equal to `26`")  # noqa: E501
-        if 'editgroup_id' in params and not re.search('[a-zA-Z2-7]{26}', params['editgroup_id']):  # noqa: E501
-            raise ValueError("Invalid value for parameter `editgroup_id` when calling `update_editgroup`, must conform to the pattern `/[a-zA-Z2-7]{26}/`")  # noqa: E501
+        if ('editgroup' not in local_var_params or
+                local_var_params['editgroup'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup` when calling `update_editgroup`")  # noqa: E501
+
+        if ('editgroup_id' in local_var_params and
+                len(local_var_params['editgroup_id']) > 26):
+            raise ApiValueError("Invalid value for parameter `editgroup_id` when calling `update_editgroup`, length must be less than or equal to `26`")  # noqa: E501
+        if ('editgroup_id' in local_var_params and
+                len(local_var_params['editgroup_id']) < 26):
+            raise ApiValueError("Invalid value for parameter `editgroup_id` when calling `update_editgroup`, length must be greater than or equal to `26`")  # noqa: E501
+        if 'editgroup_id' in local_var_params and not re.search(r'[a-zA-Z2-7]{26}', local_var_params['editgroup_id']):  # noqa: E501
+            raise ApiValueError("Invalid value for parameter `editgroup_id` when calling `update_editgroup`, must conform to the pattern `/[a-zA-Z2-7]{26}/`")  # noqa: E501
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
 
         query_params = []
-        if 'submit' in params:
-            query_params.append(('submit', params['submit']))  # noqa: E501
+        if 'submit' in local_var_params:
+            query_params.append(('submit', local_var_params['submit']))  # noqa: E501
 
         header_params = {}
 
@@ -9455,8 +10340,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'editgroup' in params:
-            body_params = params['editgroup']
+        if 'editgroup' in local_var_params:
+            body_params = local_var_params['editgroup']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -9478,10 +10363,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='Editgroup',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def update_editor(self, editor_id, editor, **kwargs):  # noqa: E501
@@ -9489,70 +10374,83 @@ class DefaultApi(object):
 
         Allows metadata changes to some editor fields, such as the username.  Changes require authentication and permissions. An editor can change their own username; changes to role flags require the `admin` role by the editor making the request.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_editor(editor_id, editor, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_editor(editor_id, editor, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editor_id: (required)
         :param Editor editor: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: Editor
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.update_editor_with_http_info(editor_id, editor, **kwargs)  # noqa: E501
-        else:
-            (data) = self.update_editor_with_http_info(editor_id, editor, **kwargs)  # noqa: E501
-            return data
+        return self.update_editor_with_http_info(editor_id, editor, **kwargs)  # noqa: E501
 
     def update_editor_with_http_info(self, editor_id, editor, **kwargs):  # noqa: E501
         """update_editor  # noqa: E501
 
         Allows metadata changes to some editor fields, such as the username.  Changes require authentication and permissions. An editor can change their own username; changes to role flags require the `admin` role by the editor making the request.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_editor_with_http_info(editor_id, editor, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_editor_with_http_info(editor_id, editor, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editor_id: (required)
         :param Editor editor: (required)
-        :return: Editor
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(Editor, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editor_id', 'editor']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method update_editor" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editor_id' is set
-        if ('editor_id' not in params or
-                params['editor_id'] is None):
-            raise ValueError("Missing the required parameter `editor_id` when calling `update_editor`")  # noqa: E501
+        if ('editor_id' not in local_var_params or
+                local_var_params['editor_id'] is None):
+            raise ApiValueError("Missing the required parameter `editor_id` when calling `update_editor`")  # noqa: E501
         # verify the required parameter 'editor' is set
-        if ('editor' not in params or
-                params['editor'] is None):
-            raise ValueError("Missing the required parameter `editor` when calling `update_editor`")  # noqa: E501
+        if ('editor' not in local_var_params or
+                local_var_params['editor'] is None):
+            raise ApiValueError("Missing the required parameter `editor` when calling `update_editor`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'editor_id' in params:
-            path_params['editor_id'] = params['editor_id']  # noqa: E501
+        if 'editor_id' in local_var_params:
+            path_params['editor_id'] = local_var_params['editor_id']  # noqa: E501
 
         query_params = []
 
@@ -9562,8 +10460,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'editor' in params:
-            body_params = params['editor']
+        if 'editor' in local_var_params:
+            body_params = local_var_params['editor']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -9585,87 +10483,100 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='Editor',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def update_file(self, editgroup_id, ident, entity, **kwargs):  # noqa: E501
         """update_file  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_file(editgroup_id, ident, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_file(editgroup_id, ident, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
         :param FileEntity entity: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.update_file_with_http_info(editgroup_id, ident, entity, **kwargs)  # noqa: E501
-        else:
-            (data) = self.update_file_with_http_info(editgroup_id, ident, entity, **kwargs)  # noqa: E501
-            return data
+        return self.update_file_with_http_info(editgroup_id, ident, entity, **kwargs)  # noqa: E501
 
     def update_file_with_http_info(self, editgroup_id, ident, entity, **kwargs):  # noqa: E501
         """update_file  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_file_with_http_info(editgroup_id, ident, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_file_with_http_info(editgroup_id, ident, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
         :param FileEntity entity: (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'ident', 'entity']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method update_file" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `update_file`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `update_file`")  # noqa: E501
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `update_file`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `update_file`")  # noqa: E501
         # verify the required parameter 'entity' is set
-        if ('entity' not in params or
-                params['entity'] is None):
-            raise ValueError("Missing the required parameter `entity` when calling `update_file`")  # noqa: E501
+        if ('entity' not in local_var_params or
+                local_var_params['entity'] is None):
+            raise ApiValueError("Missing the required parameter `entity` when calling `update_file`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
 
@@ -9675,8 +10586,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'entity' in params:
-            body_params = params['entity']
+        if 'entity' in local_var_params:
+            body_params = local_var_params['entity']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -9698,87 +10609,100 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def update_fileset(self, editgroup_id, ident, entity, **kwargs):  # noqa: E501
         """update_fileset  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_fileset(editgroup_id, ident, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_fileset(editgroup_id, ident, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
         :param FilesetEntity entity: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.update_fileset_with_http_info(editgroup_id, ident, entity, **kwargs)  # noqa: E501
-        else:
-            (data) = self.update_fileset_with_http_info(editgroup_id, ident, entity, **kwargs)  # noqa: E501
-            return data
+        return self.update_fileset_with_http_info(editgroup_id, ident, entity, **kwargs)  # noqa: E501
 
     def update_fileset_with_http_info(self, editgroup_id, ident, entity, **kwargs):  # noqa: E501
         """update_fileset  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_fileset_with_http_info(editgroup_id, ident, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_fileset_with_http_info(editgroup_id, ident, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
         :param FilesetEntity entity: (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'ident', 'entity']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method update_fileset" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `update_fileset`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `update_fileset`")  # noqa: E501
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `update_fileset`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `update_fileset`")  # noqa: E501
         # verify the required parameter 'entity' is set
-        if ('entity' not in params or
-                params['entity'] is None):
-            raise ValueError("Missing the required parameter `entity` when calling `update_fileset`")  # noqa: E501
+        if ('entity' not in local_var_params or
+                local_var_params['entity'] is None):
+            raise ApiValueError("Missing the required parameter `entity` when calling `update_fileset`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
 
@@ -9788,8 +10712,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'entity' in params:
-            body_params = params['entity']
+        if 'entity' in local_var_params:
+            body_params = local_var_params['entity']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -9811,10 +10735,10 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def update_release(self, editgroup_id, ident, entity, **kwargs):  # noqa: E501
@@ -9822,78 +10746,91 @@ class DefaultApi(object):
 
         Updates an existing entity as part of a specific (existing) editgroup. The editgroup must be open for updates (aka, not accepted/merged), and the editor making the requiest must have permissions (aka, must have created the editgroup or have `admin` role).  This method can also be used to update an existing entity edit as part of an editgroup. For example, if an entity was created in this editgroup, an editor could make changes to the new entity's metadata before merging.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_release(editgroup_id, ident, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_release(editgroup_id, ident, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
         :param ReleaseEntity entity: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.update_release_with_http_info(editgroup_id, ident, entity, **kwargs)  # noqa: E501
-        else:
-            (data) = self.update_release_with_http_info(editgroup_id, ident, entity, **kwargs)  # noqa: E501
-            return data
+        return self.update_release_with_http_info(editgroup_id, ident, entity, **kwargs)  # noqa: E501
 
     def update_release_with_http_info(self, editgroup_id, ident, entity, **kwargs):  # noqa: E501
         """update_release  # noqa: E501
 
         Updates an existing entity as part of a specific (existing) editgroup. The editgroup must be open for updates (aka, not accepted/merged), and the editor making the requiest must have permissions (aka, must have created the editgroup or have `admin` role).  This method can also be used to update an existing entity edit as part of an editgroup. For example, if an entity was created in this editgroup, an editor could make changes to the new entity's metadata before merging.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_release_with_http_info(editgroup_id, ident, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_release_with_http_info(editgroup_id, ident, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
         :param ReleaseEntity entity: (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'ident', 'entity']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method update_release" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `update_release`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `update_release`")  # noqa: E501
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `update_release`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `update_release`")  # noqa: E501
         # verify the required parameter 'entity' is set
-        if ('entity' not in params or
-                params['entity'] is None):
-            raise ValueError("Missing the required parameter `entity` when calling `update_release`")  # noqa: E501
+        if ('entity' not in local_var_params or
+                local_var_params['entity'] is None):
+            raise ApiValueError("Missing the required parameter `entity` when calling `update_release`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
 
@@ -9903,8 +10840,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'entity' in params:
-            body_params = params['entity']
+        if 'entity' in local_var_params:
+            body_params = local_var_params['entity']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -9926,87 +10863,100 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def update_webcapture(self, editgroup_id, ident, entity, **kwargs):  # noqa: E501
         """update_webcapture  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_webcapture(editgroup_id, ident, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_webcapture(editgroup_id, ident, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
         :param WebcaptureEntity entity: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.update_webcapture_with_http_info(editgroup_id, ident, entity, **kwargs)  # noqa: E501
-        else:
-            (data) = self.update_webcapture_with_http_info(editgroup_id, ident, entity, **kwargs)  # noqa: E501
-            return data
+        return self.update_webcapture_with_http_info(editgroup_id, ident, entity, **kwargs)  # noqa: E501
 
     def update_webcapture_with_http_info(self, editgroup_id, ident, entity, **kwargs):  # noqa: E501
         """update_webcapture  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_webcapture_with_http_info(editgroup_id, ident, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_webcapture_with_http_info(editgroup_id, ident, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
         :param WebcaptureEntity entity: (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'ident', 'entity']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method update_webcapture" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `update_webcapture`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `update_webcapture`")  # noqa: E501
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `update_webcapture`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `update_webcapture`")  # noqa: E501
         # verify the required parameter 'entity' is set
-        if ('entity' not in params or
-                params['entity'] is None):
-            raise ValueError("Missing the required parameter `entity` when calling `update_webcapture`")  # noqa: E501
+        if ('entity' not in local_var_params or
+                local_var_params['entity'] is None):
+            raise ApiValueError("Missing the required parameter `entity` when calling `update_webcapture`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
 
@@ -10016,8 +10966,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'entity' in params:
-            body_params = params['entity']
+        if 'entity' in local_var_params:
+            body_params = local_var_params['entity']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -10039,87 +10989,100 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)
 
     def update_work(self, editgroup_id, ident, entity, **kwargs):  # noqa: E501
         """update_work  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_work(editgroup_id, ident, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_work(editgroup_id, ident, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
         :param WorkEntity entity: (required)
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         :return: EntityEdit
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
-            return self.update_work_with_http_info(editgroup_id, ident, entity, **kwargs)  # noqa: E501
-        else:
-            (data) = self.update_work_with_http_info(editgroup_id, ident, entity, **kwargs)  # noqa: E501
-            return data
+        return self.update_work_with_http_info(editgroup_id, ident, entity, **kwargs)  # noqa: E501
 
     def update_work_with_http_info(self, editgroup_id, ident, entity, **kwargs):  # noqa: E501
         """update_work  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_work_with_http_info(editgroup_id, ident, entity, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_work_with_http_info(editgroup_id, ident, entity, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool: execute request asynchronously
         :param str editgroup_id: (required)
         :param str ident: (required)
         :param WorkEntity entity: (required)
-        :return: EntityEdit
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: tuple(EntityEdit, status_code(int), headers(HTTPHeaderDict))
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
+        local_var_params = locals()
+
         all_params = ['editgroup_id', 'ident', 'entity']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
 
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
+        for key, val in six.iteritems(local_var_params['kwargs']):
             if key not in all_params:
-                raise TypeError(
+                raise ApiTypeError(
                     "Got an unexpected keyword argument '%s'"
                     " to method update_work" % key
                 )
-            params[key] = val
-        del params['kwargs']
+            local_var_params[key] = val
+        del local_var_params['kwargs']
         # verify the required parameter 'editgroup_id' is set
-        if ('editgroup_id' not in params or
-                params['editgroup_id'] is None):
-            raise ValueError("Missing the required parameter `editgroup_id` when calling `update_work`")  # noqa: E501
+        if ('editgroup_id' not in local_var_params or
+                local_var_params['editgroup_id'] is None):
+            raise ApiValueError("Missing the required parameter `editgroup_id` when calling `update_work`")  # noqa: E501
         # verify the required parameter 'ident' is set
-        if ('ident' not in params or
-                params['ident'] is None):
-            raise ValueError("Missing the required parameter `ident` when calling `update_work`")  # noqa: E501
+        if ('ident' not in local_var_params or
+                local_var_params['ident'] is None):
+            raise ApiValueError("Missing the required parameter `ident` when calling `update_work`")  # noqa: E501
         # verify the required parameter 'entity' is set
-        if ('entity' not in params or
-                params['entity'] is None):
-            raise ValueError("Missing the required parameter `entity` when calling `update_work`")  # noqa: E501
+        if ('entity' not in local_var_params or
+                local_var_params['entity'] is None):
+            raise ApiValueError("Missing the required parameter `entity` when calling `update_work`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'editgroup_id' in params:
-            path_params['editgroup_id'] = params['editgroup_id']  # noqa: E501
-        if 'ident' in params:
-            path_params['ident'] = params['ident']  # noqa: E501
+        if 'editgroup_id' in local_var_params:
+            path_params['editgroup_id'] = local_var_params['editgroup_id']  # noqa: E501
+        if 'ident' in local_var_params:
+            path_params['ident'] = local_var_params['ident']  # noqa: E501
 
         query_params = []
 
@@ -10129,8 +11092,8 @@ class DefaultApi(object):
         local_var_files = {}
 
         body_params = None
-        if 'entity' in params:
-            body_params = params['entity']
+        if 'entity' in local_var_params:
+            body_params = local_var_params['entity']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -10152,8 +11115,8 @@ class DefaultApi(object):
             files=local_var_files,
             response_type='EntityEdit',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
             collection_formats=collection_formats)