From 83d6adb2f6fc7eec5f27eed328731db6b86e663e Mon Sep 17 00:00:00 2001
From: Theo Truong <theotr@amazon.com>
Date: Wed, 14 Aug 2024 12:50:48 -0600
Subject: [PATCH] # Removed Generic Response

Signed-off-by: Theo Truong <theotr@amazon.com>
---
 index.d.ts                                    |   4 -
 lib/Transport.d.ts                            |   9 +-
 test/types/client.test-d.ts                   |   8 +-
 test/types/transport.test-d.ts                |   5 +-
 types/Client.d.ts                             | 642 +++++++++---------
 types/functions/bulk.d.ts                     |   6 +-
 types/functions/cat.aliases.d.ts              |   6 +-
 types/functions/cat.all_pit_segments.d.ts     |   6 +-
 types/functions/cat.allocation.d.ts           |   6 +-
 types/functions/cat.cluster_manager.d.ts      |   6 +-
 types/functions/cat.count.d.ts                |   6 +-
 types/functions/cat.fielddata.d.ts            |   6 +-
 types/functions/cat.health.d.ts               |   6 +-
 types/functions/cat.help.d.ts                 |   6 +-
 types/functions/cat.indices.d.ts              |   6 +-
 types/functions/cat.master.d.ts               |   6 +-
 types/functions/cat.nodeattrs.d.ts            |   6 +-
 types/functions/cat.nodes.d.ts                |   6 +-
 types/functions/cat.pending_tasks.d.ts        |   6 +-
 types/functions/cat.pit_segments.d.ts         |   6 +-
 types/functions/cat.plugins.d.ts              |   6 +-
 types/functions/cat.recovery.d.ts             |   6 +-
 types/functions/cat.repositories.d.ts         |   6 +-
 types/functions/cat.segment_replication.d.ts  |   6 +-
 types/functions/cat.segments.d.ts             |   6 +-
 types/functions/cat.shards.d.ts               |   6 +-
 types/functions/cat.snapshots.d.ts            |   6 +-
 types/functions/cat.tasks.d.ts                |   6 +-
 types/functions/cat.templates.d.ts            |   6 +-
 types/functions/cat.thread_pool.d.ts          |   6 +-
 types/functions/clear_scroll.d.ts             |   6 +-
 .../functions/cluster.allocation_explain.d.ts |   6 +-
 .../cluster.delete_component_template.d.ts    |   6 +-
 ...cluster.delete_decommission_awareness.d.ts |   6 +-
 ...uster.delete_voting_config_exclusions.d.ts |   6 +-
 .../cluster.delete_weighted_routing.d.ts      |   6 +-
 .../cluster.exists_component_template.d.ts    |   6 +-
 .../cluster.get_component_template.d.ts       |   6 +-
 .../cluster.get_decommission_awareness.d.ts   |   6 +-
 types/functions/cluster.get_settings.d.ts     |   6 +-
 .../cluster.get_weighted_routing.d.ts         |   6 +-
 types/functions/cluster.health.d.ts           |   6 +-
 types/functions/cluster.pending_tasks.d.ts    |   6 +-
 ...cluster.post_voting_config_exclusions.d.ts |   6 +-
 .../cluster.put_component_template.d.ts       |   6 +-
 .../cluster.put_decommission_awareness.d.ts   |   6 +-
 types/functions/cluster.put_settings.d.ts     |   6 +-
 .../cluster.put_weighted_routing.d.ts         |   6 +-
 types/functions/cluster.remote_info.d.ts      |   6 +-
 types/functions/cluster.reroute.d.ts          |   6 +-
 types/functions/cluster.state.d.ts            |   6 +-
 types/functions/cluster.stats.d.ts            |   6 +-
 types/functions/count.d.ts                    |   6 +-
 types/functions/create.d.ts                   |   6 +-
 types/functions/create_pit.d.ts               |   6 +-
 ...angling_indices.delete_dangling_index.d.ts |   6 +-
 ...angling_indices.import_dangling_index.d.ts |   6 +-
 ...angling_indices.list_dangling_indices.d.ts |   6 +-
 types/functions/delete.d.ts                   |   6 +-
 types/functions/delete_all_pits.d.ts          |   6 +-
 types/functions/delete_by_query.d.ts          |   6 +-
 .../functions/delete_by_query_rethrottle.d.ts |   6 +-
 types/functions/delete_pit.d.ts               |   6 +-
 types/functions/delete_script.d.ts            |   6 +-
 types/functions/exists.d.ts                   |   6 +-
 types/functions/exists_source.d.ts            |   6 +-
 types/functions/explain.d.ts                  |   6 +-
 types/functions/field_caps.d.ts               |   6 +-
 types/functions/get.d.ts                      |   6 +-
 types/functions/get_all_pits.d.ts             |   6 +-
 types/functions/get_script.d.ts               |   6 +-
 types/functions/get_script_context.d.ts       |   6 +-
 types/functions/get_script_languages.d.ts     |   6 +-
 types/functions/get_source.d.ts               |   6 +-
 types/functions/index.d.ts                    |   6 +-
 types/functions/indices.add_block.d.ts        |   6 +-
 types/functions/indices.analyze.d.ts          |   6 +-
 types/functions/indices.clear_cache.d.ts      |   6 +-
 types/functions/indices.clone.d.ts            |   6 +-
 types/functions/indices.close.d.ts            |   6 +-
 types/functions/indices.create.d.ts           |   6 +-
 .../functions/indices.create_data_stream.d.ts |   6 +-
 .../functions/indices.data_streams_stats.d.ts |   6 +-
 types/functions/indices.delete.d.ts           |   6 +-
 types/functions/indices.delete_alias.d.ts     |   6 +-
 .../functions/indices.delete_data_stream.d.ts |   6 +-
 .../indices.delete_index_template.d.ts        |   6 +-
 types/functions/indices.delete_template.d.ts  |   6 +-
 types/functions/indices.exists.d.ts           |   6 +-
 types/functions/indices.exists_alias.d.ts     |   6 +-
 .../indices.exists_index_template.d.ts        |   6 +-
 types/functions/indices.exists_template.d.ts  |   6 +-
 types/functions/indices.flush.d.ts            |   6 +-
 types/functions/indices.forcemerge.d.ts       |   6 +-
 types/functions/indices.get.d.ts              |   6 +-
 types/functions/indices.get_alias.d.ts        |   6 +-
 types/functions/indices.get_data_stream.d.ts  |   6 +-
 .../functions/indices.get_field_mapping.d.ts  |   6 +-
 .../functions/indices.get_index_template.d.ts |   6 +-
 types/functions/indices.get_mapping.d.ts      |   6 +-
 types/functions/indices.get_settings.d.ts     |   6 +-
 types/functions/indices.get_template.d.ts     |   6 +-
 types/functions/indices.get_upgrade.d.ts      |   6 +-
 types/functions/indices.open.d.ts             |   6 +-
 types/functions/indices.put_alias.d.ts        |   6 +-
 .../functions/indices.put_index_template.d.ts |   6 +-
 types/functions/indices.put_mapping.d.ts      |   6 +-
 types/functions/indices.put_settings.d.ts     |   6 +-
 types/functions/indices.put_template.d.ts     |   6 +-
 types/functions/indices.recovery.d.ts         |   6 +-
 types/functions/indices.refresh.d.ts          |   6 +-
 types/functions/indices.resolve_index.d.ts    |   6 +-
 types/functions/indices.rollover.d.ts         |   6 +-
 types/functions/indices.segments.d.ts         |   6 +-
 types/functions/indices.shard_stores.d.ts     |   6 +-
 types/functions/indices.shrink.d.ts           |   6 +-
 .../indices.simulate_index_template.d.ts      |   6 +-
 .../functions/indices.simulate_template.d.ts  |   6 +-
 types/functions/indices.split.d.ts            |   6 +-
 types/functions/indices.stats.d.ts            |   6 +-
 types/functions/indices.update_aliases.d.ts   |   6 +-
 types/functions/indices.upgrade.d.ts          |   6 +-
 types/functions/indices.validate_query.d.ts   |   6 +-
 types/functions/info.d.ts                     |   6 +-
 types/functions/ingest.delete_pipeline.d.ts   |   6 +-
 types/functions/ingest.get_pipeline.d.ts      |   6 +-
 types/functions/ingest.processor_grok.d.ts    |   6 +-
 types/functions/ingest.put_pipeline.d.ts      |   6 +-
 types/functions/ingest.simulate.d.ts          |   6 +-
 types/functions/knn.delete_model.d.ts         |   6 +-
 types/functions/knn.get_model.d.ts            |   6 +-
 types/functions/knn.search_models.d.ts        |   6 +-
 types/functions/knn.stats.d.ts                |   6 +-
 types/functions/knn.train_model.d.ts          |   6 +-
 types/functions/knn.warmup.d.ts               |   6 +-
 types/functions/mget.d.ts                     |   6 +-
 types/functions/ml.delete_model.d.ts          |   6 +-
 types/functions/ml.delete_model_group.d.ts    |   6 +-
 types/functions/ml.get_model_group.d.ts       |   6 +-
 types/functions/ml.get_task.d.ts              |   6 +-
 types/functions/ml.register_model.d.ts        |   6 +-
 types/functions/ml.register_model_group.d.ts  |   6 +-
 types/functions/ml.search_models.d.ts         |   6 +-
 types/functions/msearch.d.ts                  |   6 +-
 types/functions/msearch_template.d.ts         |   6 +-
 types/functions/mtermvectors.d.ts             |   6 +-
 types/functions/nodes.hot_threads.d.ts        |   6 +-
 types/functions/nodes.info.d.ts               |   6 +-
 .../nodes.reload_secure_settings.d.ts         |   6 +-
 types/functions/nodes.stats.d.ts              |   6 +-
 types/functions/nodes.usage.d.ts              |   6 +-
 .../notifications.create_config.d.ts          |   6 +-
 .../notifications.delete_config.d.ts          |   6 +-
 .../notifications.delete_configs.d.ts         |   6 +-
 types/functions/notifications.get_config.d.ts |   6 +-
 .../functions/notifications.get_configs.d.ts  |   6 +-
 .../notifications.list_channels.d.ts          |   6 +-
 .../notifications.list_features.d.ts          |   6 +-
 types/functions/notifications.send_test.d.ts  |   6 +-
 .../notifications.update_config.d.ts          |   6 +-
 types/functions/ping.d.ts                     |   6 +-
 types/functions/ppl.explain.d.ts              |   6 +-
 types/functions/ppl.get_stats.d.ts            |   6 +-
 types/functions/ppl.post_stats.d.ts           |   6 +-
 types/functions/ppl.query.d.ts                |   6 +-
 types/functions/put_script.d.ts               |   6 +-
 types/functions/rank_eval.d.ts                |   6 +-
 types/functions/reindex.d.ts                  |   6 +-
 types/functions/reindex_rethrottle.d.ts       |   6 +-
 types/functions/remote_store.restore.d.ts     |   6 +-
 types/functions/render_search_template.d.ts   |   6 +-
 types/functions/rollups.delete.d.ts           |   6 +-
 types/functions/rollups.explain.d.ts          |   6 +-
 types/functions/rollups.get.d.ts              |   6 +-
 types/functions/rollups.put.d.ts              |   6 +-
 types/functions/rollups.start.d.ts            |   6 +-
 types/functions/rollups.stop.d.ts             |   6 +-
 types/functions/scripts_painless_execute.d.ts |   6 +-
 types/functions/scroll.d.ts                   |   6 +-
 types/functions/search.d.ts                   |   6 +-
 types/functions/search_pipeline.delete.d.ts   |   6 +-
 types/functions/search_pipeline.get.d.ts      |   6 +-
 types/functions/search_pipeline.put.d.ts      |   6 +-
 types/functions/search_shards.d.ts            |   6 +-
 types/functions/search_template.d.ts          |   6 +-
 types/functions/security.authinfo.d.ts        |   6 +-
 types/functions/security.authtoken.d.ts       |   6 +-
 types/functions/security.change_password.d.ts |   6 +-
 .../security.config_upgrade_check.d.ts        |   6 +-
 .../security.config_upgrade_perform.d.ts      |   6 +-
 .../security.create_action_group.d.ts         |   6 +-
 .../functions/security.create_allowlist.d.ts  |   6 +-
 types/functions/security.create_role.d.ts     |   6 +-
 .../security.create_role_mapping.d.ts         |   6 +-
 types/functions/security.create_tenant.d.ts   |   6 +-
 ...security.create_update_tenancy_config.d.ts |   6 +-
 types/functions/security.create_user.d.ts     |   6 +-
 .../security.create_user_legacy.d.ts          |   6 +-
 .../security.delete_action_group.d.ts         |   6 +-
 .../security.delete_distinguished_name.d.ts   |   6 +-
 types/functions/security.delete_role.d.ts     |   6 +-
 .../security.delete_role_mapping.d.ts         |   6 +-
 types/functions/security.delete_tenant.d.ts   |   6 +-
 types/functions/security.delete_user.d.ts     |   6 +-
 .../security.delete_user_legacy.d.ts          |   6 +-
 types/functions/security.flush_cache.d.ts     |   6 +-
 .../security.generate_obo_token.d.ts          |   6 +-
 .../security.generate_user_token.d.ts         |   6 +-
 .../security.generate_user_token_legacy.d.ts  |   6 +-
 .../security.get_account_details.d.ts         |   6 +-
 .../functions/security.get_action_group.d.ts  |   6 +-
 .../functions/security.get_action_groups.d.ts |   6 +-
 types/functions/security.get_allowlist.d.ts   |   6 +-
 .../security.get_audit_configuration.d.ts     |   6 +-
 .../functions/security.get_certificates.d.ts  |   6 +-
 .../functions/security.get_configuration.d.ts |   6 +-
 .../security.get_dashboards_info.d.ts         |   6 +-
 .../security.get_distinguished_name.d.ts      |   6 +-
 .../security.get_distinguished_names.d.ts     |   6 +-
 .../security.get_permissions_info.d.ts        |   6 +-
 types/functions/security.get_role.d.ts        |   6 +-
 .../functions/security.get_role_mapping.d.ts  |   6 +-
 .../functions/security.get_role_mappings.d.ts |   6 +-
 types/functions/security.get_roles.d.ts       |   6 +-
 types/functions/security.get_sslinfo.d.ts     |   6 +-
 .../security.get_tenancy_config.d.ts          |   6 +-
 types/functions/security.get_tenant.d.ts      |   6 +-
 types/functions/security.get_tenants.d.ts     |   6 +-
 types/functions/security.get_user.d.ts        |   6 +-
 types/functions/security.get_user_legacy.d.ts |   6 +-
 types/functions/security.get_users.d.ts       |   6 +-
 .../functions/security.get_users_legacy.d.ts  |   6 +-
 types/functions/security.health.d.ts          |   6 +-
 types/functions/security.migrate.d.ts         |   6 +-
 .../security.patch_action_group.d.ts          |   6 +-
 .../security.patch_action_groups.d.ts         |   6 +-
 types/functions/security.patch_allowlist.d.ts |   6 +-
 .../security.patch_audit_configuration.d.ts   |   6 +-
 .../security.patch_configuration.d.ts         |   6 +-
 .../security.patch_distinguished_name.d.ts    |   6 +-
 .../security.patch_distinguished_names.d.ts   |   6 +-
 types/functions/security.patch_role.d.ts      |   6 +-
 .../security.patch_role_mapping.d.ts          |   6 +-
 .../security.patch_role_mappings.d.ts         |   6 +-
 types/functions/security.patch_roles.d.ts     |   6 +-
 types/functions/security.patch_tenant.d.ts    |   6 +-
 types/functions/security.patch_tenants.d.ts   |   6 +-
 types/functions/security.patch_user.d.ts      |   6 +-
 types/functions/security.patch_users.d.ts     |   6 +-
 .../security.post_dashboards_info.d.ts        |   6 +-
 .../security.reload_http_certificates.d.ts    |   6 +-
 ...ecurity.reload_transport_certificates.d.ts |   6 +-
 types/functions/security.tenant_info.d.ts     |   6 +-
 .../security.update_audit_configuration.d.ts  |   6 +-
 .../security.update_configuration.d.ts        |   6 +-
 .../security.update_distinguished_name.d.ts   |   6 +-
 types/functions/security.validate.d.ts        |   6 +-
 types/functions/security.who_am_i.d.ts        |   6 +-
 .../security.who_am_i_protected.d.ts          |   6 +-
 .../snapshot.cleanup_repository.d.ts          |   6 +-
 types/functions/snapshot.clone.d.ts           |   6 +-
 types/functions/snapshot.create.d.ts          |   6 +-
 .../functions/snapshot.create_repository.d.ts |   6 +-
 types/functions/snapshot.delete.d.ts          |   6 +-
 .../functions/snapshot.delete_repository.d.ts |   6 +-
 types/functions/snapshot.get.d.ts             |   6 +-
 types/functions/snapshot.get_repository.d.ts  |   6 +-
 types/functions/snapshot.restore.d.ts         |   6 +-
 types/functions/snapshot.status.d.ts          |   6 +-
 .../functions/snapshot.verify_repository.d.ts |   6 +-
 types/functions/sql.close.d.ts                |   6 +-
 types/functions/sql.explain.d.ts              |   6 +-
 types/functions/sql.get_stats.d.ts            |   6 +-
 types/functions/sql.post_stats.d.ts           |   6 +-
 types/functions/sql.query.d.ts                |   6 +-
 types/functions/sql.settings.d.ts             |   6 +-
 types/functions/tasks.cancel.d.ts             |   6 +-
 types/functions/tasks.get.d.ts                |   6 +-
 types/functions/tasks.list.d.ts               |   6 +-
 types/functions/termvectors.d.ts              |   6 +-
 types/functions/transforms.delete.d.ts        |   6 +-
 types/functions/transforms.explain.d.ts       |   6 +-
 types/functions/transforms.get.d.ts           |   6 +-
 types/functions/transforms.preview.d.ts       |   6 +-
 types/functions/transforms.put.d.ts           |   6 +-
 types/functions/transforms.search.d.ts        |   6 +-
 types/functions/transforms.start.d.ts         |   6 +-
 types/functions/transforms.stop.d.ts          |   6 +-
 types/functions/update.d.ts                   |   6 +-
 types/functions/update_by_query.d.ts          |   6 +-
 .../functions/update_by_query_rethrottle.d.ts |   6 +-
 291 files changed, 1758 insertions(+), 626 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index 47c87f56c..8dfe876d6 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -27,12 +27,9 @@
  * under the License.
  */
 
-/// <reference types="node" />
-
 import Transport, {
   ApiError,
   ApiResponse,
-  RequestEvent,
 } from './lib/Transport';
 import Connection from './lib/Connection';
 import {
@@ -67,7 +64,6 @@ export {
   errors,
   ApiError,
   ApiResponse,
-  RequestEvent,
   ResurrectEvent,
   ClientOptions,
   NodeOptions,
diff --git a/lib/Transport.d.ts b/lib/Transport.d.ts
index 6f23d7414..79d1efc84 100644
--- a/lib/Transport.d.ts
+++ b/lib/Transport.d.ts
@@ -83,8 +83,8 @@ interface TransportOptions {
   auth?: BasicAuth | AwsSigv4Auth;
 }
 
-export interface RequestEvent<TResponse = Record<string, any>> {
-  body: TResponse;
+export interface ApiResponse {
+  body: any;
   statusCode: number | null;
   headers: Record<string, any> | null;
   warnings: string[] | null;
@@ -106,11 +106,6 @@ export interface RequestEvent<TResponse = Record<string, any>> {
   };
 }
 
-// ApiResponse and RequestEvent are the same thing
-// we are doing this for have more clear names
-export interface ApiResponse<TResponse = Record<string, any>>
-  extends RequestEvent<TResponse> {}
-
 export type RequestBody<T = Record<string, any>> = T | string | Buffer | ReadableStream;
 export type RequestNDBody<T = Record<string, any>[]> =
   | T
diff --git a/test/types/client.test-d.ts b/test/types/client.test-d.ts
index cf924aa5d..5da0a4672 100644
--- a/test/types/client.test-d.ts
+++ b/test/types/client.test-d.ts
@@ -28,7 +28,7 @@
  */
 
 import { expectType } from 'tsd';
-import { Client, ApiError, ApiResponse, RequestEvent, ResurrectEvent } from '../../';
+import { Client, ApiError, ApiResponse, ResurrectEvent } from '../../';
 import { TransportRequestCallback, TransportRequestPromise } from '../../lib/Transport';
 
 const client = new Client({
@@ -37,17 +37,17 @@ const client = new Client({
 
 client.on('request', (err, meta) => {
   expectType<ApiError>(err);
-  expectType<RequestEvent>(meta);
+  expectType<ApiResponse>(meta);
 });
 
 client.on('response', (err, meta) => {
   expectType<ApiError>(err);
-  expectType<RequestEvent>(meta);
+  expectType<ApiResponse>(meta);
 });
 
 client.on('sniff', (err, meta) => {
   expectType<ApiError>(err);
-  expectType<RequestEvent>(meta);
+  expectType<ApiResponse>(meta);
 });
 
 client.on('resurrect', (err, meta) => {
diff --git a/test/types/transport.test-d.ts b/test/types/transport.test-d.ts
index 3381f97cf..93ed24a7c 100644
--- a/test/types/transport.test-d.ts
+++ b/test/types/transport.test-d.ts
@@ -35,11 +35,10 @@ import {
   TransportRequestOptions,
   TransportRequestCallback,
   TransportRequestPromise,
-  RequestEvent,
+  ApiResponse,
   ApiError,
   RequestBody,
   RequestNDBody,
-  ApiResponse,
 } from '../../lib/Transport';
 
 const params = {
@@ -84,7 +83,7 @@ const response = {
 expectAssignable<TransportRequestParams>(params);
 expectAssignable<TransportRequestParams>({ method: 'GET', path: '/' });
 expectAssignable<TransportRequestOptions>(options);
-expectAssignable<RequestEvent>(response);
+expectAssignable<ApiResponse>(response);
 expectAssignable<ApiResponse>(response);
 
 // verify that RequestBody, RequestNDBody and ResponseBody works as expected
diff --git a/types/Client.d.ts b/types/Client.d.ts
index a02e32793..42a3615fd 100644
--- a/types/Client.d.ts
+++ b/types/Client.d.ts
@@ -304,7 +304,6 @@ import * as Tasks_Get from './functions/tasks.get';
 import Transport, {
   ApiError,
   ApiResponse,
-  RequestEvent,
   TransportRequestOptions,
   TransportRequestCallback,
   TransportRequestPromise,
@@ -314,10 +313,9 @@ import Serializer from '../lib/Serializer';
 import Helpers from '../lib/Helpers';
 import { ClientOptions, ClientExtendsCallbackOptions } from './client_options';
 
-declare type callbackFn<TResponse> = (err: ApiError, result: ApiResponse<TResponse>) => void;
+declare type callbackFn<TResponse> = (err: ApiError, result: TResponse) => void;
 declare type extendsCallback = (options: ClientExtendsCallbackOptions) => any;
 
-declare type HttpResponse = any
 declare interface HttpRequest {
   path: string;
   querystring?: Global.Params;
@@ -337,133 +335,133 @@ declare class Client {
   close(callback: Function): void;
   close(): Promise<void>;
   emit(event: string | symbol, ...args: any[]): boolean;
-  on(event: 'request', listener: (err: ApiError, meta: RequestEvent) => void): this;
-  on(event: 'response', listener: (err: ApiError, meta: RequestEvent) => void): this;
-  on(event: 'sniff', listener: (err: ApiError, meta: RequestEvent) => void): this;
+  on(event: 'request', listener: (err: ApiError, meta: ApiResponse) => void): this;
+  on(event: 'response', listener: (err: ApiError, meta: ApiResponse) => void): this;
+  on(event: 'sniff', listener: (err: ApiError, meta: ApiResponse) => void): this;
   on(event: 'resurrect', listener: (err: null, meta: ResurrectEvent) => void): this;
-  once(event: 'request', listener: (err: ApiError, meta: RequestEvent) => void): this;
-  once(event: 'response', listener: (err: ApiError, meta: RequestEvent) => void): this;
-  once(event: 'sniff', listener: (err: ApiError, meta: RequestEvent) => void): this;
+  once(event: 'request', listener: (err: ApiError, meta: ApiResponse) => void): this;
+  once(event: 'response', listener: (err: ApiError, meta: ApiResponse) => void): this;
+  once(event: 'sniff', listener: (err: ApiError, meta: ApiResponse) => void): this;
   once(event: 'resurrect', listener: (err: null, meta: ResurrectEvent) => void): this;
   off(event: string | symbol, listener: (...args: any[]) => void): this;
 
   cat: {
-    help (params?: Cat_Help.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cat_Help.Response>>;
+    help (params?: Cat_Help.Request, options?: TransportRequestOptions): TransportRequestPromise<Cat_Help.Response>;
     help (callback: callbackFn<Cat_Help.Response>): TransportRequestCallback;
     help (params: Cat_Help.Request, callback: callbackFn<Cat_Help.Response>): TransportRequestCallback;
     help (params: Cat_Help.Request, options: TransportRequestOptions, callback: callbackFn<Cat_Help.Response>): TransportRequestCallback;
 
-    aliases (params?: Cat_Aliases.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cat_Aliases.Response>>;
+    aliases (params?: Cat_Aliases.Request, options?: TransportRequestOptions): TransportRequestPromise<Cat_Aliases.Response>;
     aliases (callback: callbackFn<Cat_Aliases.Response>): TransportRequestCallback;
     aliases (params: Cat_Aliases.Request, callback: callbackFn<Cat_Aliases.Response>): TransportRequestCallback;
     aliases (params: Cat_Aliases.Request, options: TransportRequestOptions, callback: callbackFn<Cat_Aliases.Response>): TransportRequestCallback;
 
-    allocation (params?: Cat_Allocation.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cat_Allocation.Response>>;
+    allocation (params?: Cat_Allocation.Request, options?: TransportRequestOptions): TransportRequestPromise<Cat_Allocation.Response>;
     allocation (callback: callbackFn<Cat_Allocation.Response>): TransportRequestCallback;
     allocation (params: Cat_Allocation.Request, callback: callbackFn<Cat_Allocation.Response>): TransportRequestCallback;
     allocation (params: Cat_Allocation.Request, options: TransportRequestOptions, callback: callbackFn<Cat_Allocation.Response>): TransportRequestCallback;
 
-    clusterManager (params?: Cat_ClusterManager.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cat_ClusterManager.Response>>;
+    clusterManager (params?: Cat_ClusterManager.Request, options?: TransportRequestOptions): TransportRequestPromise<Cat_ClusterManager.Response>;
     clusterManager (callback: callbackFn<Cat_ClusterManager.Response>): TransportRequestCallback;
     clusterManager (params: Cat_ClusterManager.Request, callback: callbackFn<Cat_ClusterManager.Response>): TransportRequestCallback;
     clusterManager (params: Cat_ClusterManager.Request, options: TransportRequestOptions, callback: callbackFn<Cat_ClusterManager.Response>): TransportRequestCallback;
 
-    count (params?: Cat_Count.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cat_Count.Response>>;
+    count (params?: Cat_Count.Request, options?: TransportRequestOptions): TransportRequestPromise<Cat_Count.Response>;
     count (callback: callbackFn<Cat_Count.Response>): TransportRequestCallback;
     count (params: Cat_Count.Request, callback: callbackFn<Cat_Count.Response>): TransportRequestCallback;
     count (params: Cat_Count.Request, options: TransportRequestOptions, callback: callbackFn<Cat_Count.Response>): TransportRequestCallback;
 
-    fielddata (params?: Cat_Fielddata.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cat_Fielddata.Response>>;
+    fielddata (params?: Cat_Fielddata.Request, options?: TransportRequestOptions): TransportRequestPromise<Cat_Fielddata.Response>;
     fielddata (callback: callbackFn<Cat_Fielddata.Response>): TransportRequestCallback;
     fielddata (params: Cat_Fielddata.Request, callback: callbackFn<Cat_Fielddata.Response>): TransportRequestCallback;
     fielddata (params: Cat_Fielddata.Request, options: TransportRequestOptions, callback: callbackFn<Cat_Fielddata.Response>): TransportRequestCallback;
 
-    health (params?: Cat_Health.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cat_Health.Response>>;
+    health (params?: Cat_Health.Request, options?: TransportRequestOptions): TransportRequestPromise<Cat_Health.Response>;
     health (callback: callbackFn<Cat_Health.Response>): TransportRequestCallback;
     health (params: Cat_Health.Request, callback: callbackFn<Cat_Health.Response>): TransportRequestCallback;
     health (params: Cat_Health.Request, options: TransportRequestOptions, callback: callbackFn<Cat_Health.Response>): TransportRequestCallback;
 
-    indices (params?: Cat_Indices.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cat_Indices.Response>>;
+    indices (params?: Cat_Indices.Request, options?: TransportRequestOptions): TransportRequestPromise<Cat_Indices.Response>;
     indices (callback: callbackFn<Cat_Indices.Response>): TransportRequestCallback;
     indices (params: Cat_Indices.Request, callback: callbackFn<Cat_Indices.Response>): TransportRequestCallback;
     indices (params: Cat_Indices.Request, options: TransportRequestOptions, callback: callbackFn<Cat_Indices.Response>): TransportRequestCallback;
 
-    master (params?: Cat_Master.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cat_Master.Response>>;
+    master (params?: Cat_Master.Request, options?: TransportRequestOptions): TransportRequestPromise<Cat_Master.Response>;
     master (callback: callbackFn<Cat_Master.Response>): TransportRequestCallback;
     master (params: Cat_Master.Request, callback: callbackFn<Cat_Master.Response>): TransportRequestCallback;
     master (params: Cat_Master.Request, options: TransportRequestOptions, callback: callbackFn<Cat_Master.Response>): TransportRequestCallback;
 
-    nodeattrs (params?: Cat_Nodeattrs.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cat_Nodeattrs.Response>>;
+    nodeattrs (params?: Cat_Nodeattrs.Request, options?: TransportRequestOptions): TransportRequestPromise<Cat_Nodeattrs.Response>;
     nodeattrs (callback: callbackFn<Cat_Nodeattrs.Response>): TransportRequestCallback;
     nodeattrs (params: Cat_Nodeattrs.Request, callback: callbackFn<Cat_Nodeattrs.Response>): TransportRequestCallback;
     nodeattrs (params: Cat_Nodeattrs.Request, options: TransportRequestOptions, callback: callbackFn<Cat_Nodeattrs.Response>): TransportRequestCallback;
 
-    nodes (params?: Cat_Nodes.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cat_Nodes.Response>>;
+    nodes (params?: Cat_Nodes.Request, options?: TransportRequestOptions): TransportRequestPromise<Cat_Nodes.Response>;
     nodes (callback: callbackFn<Cat_Nodes.Response>): TransportRequestCallback;
     nodes (params: Cat_Nodes.Request, callback: callbackFn<Cat_Nodes.Response>): TransportRequestCallback;
     nodes (params: Cat_Nodes.Request, options: TransportRequestOptions, callback: callbackFn<Cat_Nodes.Response>): TransportRequestCallback;
 
-    pendingTasks (params?: Cat_PendingTasks.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cat_PendingTasks.Response>>;
+    pendingTasks (params?: Cat_PendingTasks.Request, options?: TransportRequestOptions): TransportRequestPromise<Cat_PendingTasks.Response>;
     pendingTasks (callback: callbackFn<Cat_PendingTasks.Response>): TransportRequestCallback;
     pendingTasks (params: Cat_PendingTasks.Request, callback: callbackFn<Cat_PendingTasks.Response>): TransportRequestCallback;
     pendingTasks (params: Cat_PendingTasks.Request, options: TransportRequestOptions, callback: callbackFn<Cat_PendingTasks.Response>): TransportRequestCallback;
 
-    pitSegments (params?: Cat_PitSegments.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cat_PitSegments.Response>>;
+    pitSegments (params?: Cat_PitSegments.Request, options?: TransportRequestOptions): TransportRequestPromise<Cat_PitSegments.Response>;
     pitSegments (callback: callbackFn<Cat_PitSegments.Response>): TransportRequestCallback;
     pitSegments (params: Cat_PitSegments.Request, callback: callbackFn<Cat_PitSegments.Response>): TransportRequestCallback;
     pitSegments (params: Cat_PitSegments.Request, options: TransportRequestOptions, callback: callbackFn<Cat_PitSegments.Response>): TransportRequestCallback;
 
-    allPitSegments (params?: Cat_AllPitSegments.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cat_AllPitSegments.Response>>;
+    allPitSegments (params?: Cat_AllPitSegments.Request, options?: TransportRequestOptions): TransportRequestPromise<Cat_AllPitSegments.Response>;
     allPitSegments (callback: callbackFn<Cat_AllPitSegments.Response>): TransportRequestCallback;
     allPitSegments (params: Cat_AllPitSegments.Request, callback: callbackFn<Cat_AllPitSegments.Response>): TransportRequestCallback;
     allPitSegments (params: Cat_AllPitSegments.Request, options: TransportRequestOptions, callback: callbackFn<Cat_AllPitSegments.Response>): TransportRequestCallback;
 
-    plugins (params?: Cat_Plugins.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cat_Plugins.Response>>;
+    plugins (params?: Cat_Plugins.Request, options?: TransportRequestOptions): TransportRequestPromise<Cat_Plugins.Response>;
     plugins (callback: callbackFn<Cat_Plugins.Response>): TransportRequestCallback;
     plugins (params: Cat_Plugins.Request, callback: callbackFn<Cat_Plugins.Response>): TransportRequestCallback;
     plugins (params: Cat_Plugins.Request, options: TransportRequestOptions, callback: callbackFn<Cat_Plugins.Response>): TransportRequestCallback;
 
-    recovery (params?: Cat_Recovery.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cat_Recovery.Response>>;
+    recovery (params?: Cat_Recovery.Request, options?: TransportRequestOptions): TransportRequestPromise<Cat_Recovery.Response>;
     recovery (callback: callbackFn<Cat_Recovery.Response>): TransportRequestCallback;
     recovery (params: Cat_Recovery.Request, callback: callbackFn<Cat_Recovery.Response>): TransportRequestCallback;
     recovery (params: Cat_Recovery.Request, options: TransportRequestOptions, callback: callbackFn<Cat_Recovery.Response>): TransportRequestCallback;
 
-    repositories (params?: Cat_Repositories.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cat_Repositories.Response>>;
+    repositories (params?: Cat_Repositories.Request, options?: TransportRequestOptions): TransportRequestPromise<Cat_Repositories.Response>;
     repositories (callback: callbackFn<Cat_Repositories.Response>): TransportRequestCallback;
     repositories (params: Cat_Repositories.Request, callback: callbackFn<Cat_Repositories.Response>): TransportRequestCallback;
     repositories (params: Cat_Repositories.Request, options: TransportRequestOptions, callback: callbackFn<Cat_Repositories.Response>): TransportRequestCallback;
 
-    segmentReplication (params?: Cat_SegmentReplication.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cat_SegmentReplication.Response>>;
+    segmentReplication (params?: Cat_SegmentReplication.Request, options?: TransportRequestOptions): TransportRequestPromise<Cat_SegmentReplication.Response>;
     segmentReplication (callback: callbackFn<Cat_SegmentReplication.Response>): TransportRequestCallback;
     segmentReplication (params: Cat_SegmentReplication.Request, callback: callbackFn<Cat_SegmentReplication.Response>): TransportRequestCallback;
     segmentReplication (params: Cat_SegmentReplication.Request, options: TransportRequestOptions, callback: callbackFn<Cat_SegmentReplication.Response>): TransportRequestCallback;
 
-    segments (params?: Cat_Segments.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cat_Segments.Response>>;
+    segments (params?: Cat_Segments.Request, options?: TransportRequestOptions): TransportRequestPromise<Cat_Segments.Response>;
     segments (callback: callbackFn<Cat_Segments.Response>): TransportRequestCallback;
     segments (params: Cat_Segments.Request, callback: callbackFn<Cat_Segments.Response>): TransportRequestCallback;
     segments (params: Cat_Segments.Request, options: TransportRequestOptions, callback: callbackFn<Cat_Segments.Response>): TransportRequestCallback;
 
-    shards (params?: Cat_Shards.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cat_Shards.Response>>;
+    shards (params?: Cat_Shards.Request, options?: TransportRequestOptions): TransportRequestPromise<Cat_Shards.Response>;
     shards (callback: callbackFn<Cat_Shards.Response>): TransportRequestCallback;
     shards (params: Cat_Shards.Request, callback: callbackFn<Cat_Shards.Response>): TransportRequestCallback;
     shards (params: Cat_Shards.Request, options: TransportRequestOptions, callback: callbackFn<Cat_Shards.Response>): TransportRequestCallback;
 
-    snapshots (params?: Cat_Snapshots.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cat_Snapshots.Response>>;
+    snapshots (params?: Cat_Snapshots.Request, options?: TransportRequestOptions): TransportRequestPromise<Cat_Snapshots.Response>;
     snapshots (callback: callbackFn<Cat_Snapshots.Response>): TransportRequestCallback;
     snapshots (params: Cat_Snapshots.Request, callback: callbackFn<Cat_Snapshots.Response>): TransportRequestCallback;
     snapshots (params: Cat_Snapshots.Request, options: TransportRequestOptions, callback: callbackFn<Cat_Snapshots.Response>): TransportRequestCallback;
 
-    tasks (params?: Cat_Tasks.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cat_Tasks.Response>>;
+    tasks (params?: Cat_Tasks.Request, options?: TransportRequestOptions): TransportRequestPromise<Cat_Tasks.Response>;
     tasks (callback: callbackFn<Cat_Tasks.Response>): TransportRequestCallback;
     tasks (params: Cat_Tasks.Request, callback: callbackFn<Cat_Tasks.Response>): TransportRequestCallback;
     tasks (params: Cat_Tasks.Request, options: TransportRequestOptions, callback: callbackFn<Cat_Tasks.Response>): TransportRequestCallback;
 
-    templates (params?: Cat_Templates.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cat_Templates.Response>>;
+    templates (params?: Cat_Templates.Request, options?: TransportRequestOptions): TransportRequestPromise<Cat_Templates.Response>;
     templates (callback: callbackFn<Cat_Templates.Response>): TransportRequestCallback;
     templates (params: Cat_Templates.Request, callback: callbackFn<Cat_Templates.Response>): TransportRequestCallback;
     templates (params: Cat_Templates.Request, options: TransportRequestOptions, callback: callbackFn<Cat_Templates.Response>): TransportRequestCallback;
 
-    threadPool (params?: Cat_ThreadPool.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cat_ThreadPool.Response>>;
+    threadPool (params?: Cat_ThreadPool.Request, options?: TransportRequestOptions): TransportRequestPromise<Cat_ThreadPool.Response>;
     threadPool (callback: callbackFn<Cat_ThreadPool.Response>): TransportRequestCallback;
     threadPool (params: Cat_ThreadPool.Request, callback: callbackFn<Cat_ThreadPool.Response>): TransportRequestCallback;
     threadPool (params: Cat_ThreadPool.Request, options: TransportRequestOptions, callback: callbackFn<Cat_ThreadPool.Response>): TransportRequestCallback;
@@ -471,99 +469,99 @@ declare class Client {
   };
 
   cluster: {
-    allocationExplain (params?: Cluster_AllocationExplain.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cluster_AllocationExplain.Response>>;
+    allocationExplain (params?: Cluster_AllocationExplain.Request, options?: TransportRequestOptions): TransportRequestPromise<Cluster_AllocationExplain.Response>;
     allocationExplain (callback: callbackFn<Cluster_AllocationExplain.Response>): TransportRequestCallback;
     allocationExplain (params: Cluster_AllocationExplain.Request, callback: callbackFn<Cluster_AllocationExplain.Response>): TransportRequestCallback;
     allocationExplain (params: Cluster_AllocationExplain.Request, options: TransportRequestOptions, callback: callbackFn<Cluster_AllocationExplain.Response>): TransportRequestCallback;
 
-    deleteDecommissionAwareness (params?: Cluster_DeleteDecommissionAwareness.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cluster_DeleteDecommissionAwareness.Response>>;
+    deleteDecommissionAwareness (params?: Cluster_DeleteDecommissionAwareness.Request, options?: TransportRequestOptions): TransportRequestPromise<Cluster_DeleteDecommissionAwareness.Response>;
     deleteDecommissionAwareness (callback: callbackFn<Cluster_DeleteDecommissionAwareness.Response>): TransportRequestCallback;
     deleteDecommissionAwareness (params: Cluster_DeleteDecommissionAwareness.Request, callback: callbackFn<Cluster_DeleteDecommissionAwareness.Response>): TransportRequestCallback;
     deleteDecommissionAwareness (params: Cluster_DeleteDecommissionAwareness.Request, options: TransportRequestOptions, callback: callbackFn<Cluster_DeleteDecommissionAwareness.Response>): TransportRequestCallback;
 
-    getDecommissionAwareness (params: Cluster_GetDecommissionAwareness.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cluster_GetDecommissionAwareness.Response>>;
+    getDecommissionAwareness (params: Cluster_GetDecommissionAwareness.Request, options?: TransportRequestOptions): TransportRequestPromise<Cluster_GetDecommissionAwareness.Response>;
     getDecommissionAwareness (params: Cluster_GetDecommissionAwareness.Request, callback: callbackFn<Cluster_GetDecommissionAwareness.Response>): TransportRequestCallback;
     getDecommissionAwareness (params: Cluster_GetDecommissionAwareness.Request, options: TransportRequestOptions, callback: callbackFn<Cluster_GetDecommissionAwareness.Response>): TransportRequestCallback;
 
-    putDecommissionAwareness (params: Cluster_PutDecommissionAwareness.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cluster_PutDecommissionAwareness.Response>>;
+    putDecommissionAwareness (params: Cluster_PutDecommissionAwareness.Request, options?: TransportRequestOptions): TransportRequestPromise<Cluster_PutDecommissionAwareness.Response>;
     putDecommissionAwareness (params: Cluster_PutDecommissionAwareness.Request, callback: callbackFn<Cluster_PutDecommissionAwareness.Response>): TransportRequestCallback;
     putDecommissionAwareness (params: Cluster_PutDecommissionAwareness.Request, options: TransportRequestOptions, callback: callbackFn<Cluster_PutDecommissionAwareness.Response>): TransportRequestCallback;
 
-    health (params?: Cluster_Health.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cluster_Health.Response>>;
+    health (params?: Cluster_Health.Request, options?: TransportRequestOptions): TransportRequestPromise<Cluster_Health.Response>;
     health (callback: callbackFn<Cluster_Health.Response>): TransportRequestCallback;
     health (params: Cluster_Health.Request, callback: callbackFn<Cluster_Health.Response>): TransportRequestCallback;
     health (params: Cluster_Health.Request, options: TransportRequestOptions, callback: callbackFn<Cluster_Health.Response>): TransportRequestCallback;
 
-    pendingTasks (params?: Cluster_PendingTasks.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cluster_PendingTasks.Response>>;
+    pendingTasks (params?: Cluster_PendingTasks.Request, options?: TransportRequestOptions): TransportRequestPromise<Cluster_PendingTasks.Response>;
     pendingTasks (callback: callbackFn<Cluster_PendingTasks.Response>): TransportRequestCallback;
     pendingTasks (params: Cluster_PendingTasks.Request, callback: callbackFn<Cluster_PendingTasks.Response>): TransportRequestCallback;
     pendingTasks (params: Cluster_PendingTasks.Request, options: TransportRequestOptions, callback: callbackFn<Cluster_PendingTasks.Response>): TransportRequestCallback;
 
-    reroute (params?: Cluster_Reroute.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cluster_Reroute.Response>>;
+    reroute (params?: Cluster_Reroute.Request, options?: TransportRequestOptions): TransportRequestPromise<Cluster_Reroute.Response>;
     reroute (callback: callbackFn<Cluster_Reroute.Response>): TransportRequestCallback;
     reroute (params: Cluster_Reroute.Request, callback: callbackFn<Cluster_Reroute.Response>): TransportRequestCallback;
     reroute (params: Cluster_Reroute.Request, options: TransportRequestOptions, callback: callbackFn<Cluster_Reroute.Response>): TransportRequestCallback;
 
-    getWeightedRouting (params: Cluster_GetWeightedRouting.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cluster_GetWeightedRouting.Response>>;
+    getWeightedRouting (params: Cluster_GetWeightedRouting.Request, options?: TransportRequestOptions): TransportRequestPromise<Cluster_GetWeightedRouting.Response>;
     getWeightedRouting (params: Cluster_GetWeightedRouting.Request, callback: callbackFn<Cluster_GetWeightedRouting.Response>): TransportRequestCallback;
     getWeightedRouting (params: Cluster_GetWeightedRouting.Request, options: TransportRequestOptions, callback: callbackFn<Cluster_GetWeightedRouting.Response>): TransportRequestCallback;
 
-    putWeightedRouting (params: Cluster_PutWeightedRouting.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cluster_PutWeightedRouting.Response>>;
+    putWeightedRouting (params: Cluster_PutWeightedRouting.Request, options?: TransportRequestOptions): TransportRequestPromise<Cluster_PutWeightedRouting.Response>;
     putWeightedRouting (params: Cluster_PutWeightedRouting.Request, callback: callbackFn<Cluster_PutWeightedRouting.Response>): TransportRequestCallback;
     putWeightedRouting (params: Cluster_PutWeightedRouting.Request, options: TransportRequestOptions, callback: callbackFn<Cluster_PutWeightedRouting.Response>): TransportRequestCallback;
 
-    deleteWeightedRouting (params?: Cluster_DeleteWeightedRouting.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cluster_DeleteWeightedRouting.Response>>;
+    deleteWeightedRouting (params?: Cluster_DeleteWeightedRouting.Request, options?: TransportRequestOptions): TransportRequestPromise<Cluster_DeleteWeightedRouting.Response>;
     deleteWeightedRouting (callback: callbackFn<Cluster_DeleteWeightedRouting.Response>): TransportRequestCallback;
     deleteWeightedRouting (params: Cluster_DeleteWeightedRouting.Request, callback: callbackFn<Cluster_DeleteWeightedRouting.Response>): TransportRequestCallback;
     deleteWeightedRouting (params: Cluster_DeleteWeightedRouting.Request, options: TransportRequestOptions, callback: callbackFn<Cluster_DeleteWeightedRouting.Response>): TransportRequestCallback;
 
-    getSettings (params?: Cluster_GetSettings.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cluster_GetSettings.Response>>;
+    getSettings (params?: Cluster_GetSettings.Request, options?: TransportRequestOptions): TransportRequestPromise<Cluster_GetSettings.Response>;
     getSettings (callback: callbackFn<Cluster_GetSettings.Response>): TransportRequestCallback;
     getSettings (params: Cluster_GetSettings.Request, callback: callbackFn<Cluster_GetSettings.Response>): TransportRequestCallback;
     getSettings (params: Cluster_GetSettings.Request, options: TransportRequestOptions, callback: callbackFn<Cluster_GetSettings.Response>): TransportRequestCallback;
 
-    putSettings (params: Cluster_PutSettings.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cluster_PutSettings.Response>>;
+    putSettings (params: Cluster_PutSettings.Request, options?: TransportRequestOptions): TransportRequestPromise<Cluster_PutSettings.Response>;
     putSettings (params: Cluster_PutSettings.Request, callback: callbackFn<Cluster_PutSettings.Response>): TransportRequestCallback;
     putSettings (params: Cluster_PutSettings.Request, options: TransportRequestOptions, callback: callbackFn<Cluster_PutSettings.Response>): TransportRequestCallback;
 
-    state (params?: Cluster_State.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cluster_State.Response>>;
+    state (params?: Cluster_State.Request, options?: TransportRequestOptions): TransportRequestPromise<Cluster_State.Response>;
     state (callback: callbackFn<Cluster_State.Response>): TransportRequestCallback;
     state (params: Cluster_State.Request, callback: callbackFn<Cluster_State.Response>): TransportRequestCallback;
     state (params: Cluster_State.Request, options: TransportRequestOptions, callback: callbackFn<Cluster_State.Response>): TransportRequestCallback;
 
-    stats (params?: Cluster_Stats.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cluster_Stats.Response>>;
+    stats (params?: Cluster_Stats.Request, options?: TransportRequestOptions): TransportRequestPromise<Cluster_Stats.Response>;
     stats (callback: callbackFn<Cluster_Stats.Response>): TransportRequestCallback;
     stats (params: Cluster_Stats.Request, callback: callbackFn<Cluster_Stats.Response>): TransportRequestCallback;
     stats (params: Cluster_Stats.Request, options: TransportRequestOptions, callback: callbackFn<Cluster_Stats.Response>): TransportRequestCallback;
 
-    deleteVotingConfigExclusions (params?: Cluster_DeleteVotingConfigExclusions.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cluster_DeleteVotingConfigExclusions.Response>>;
+    deleteVotingConfigExclusions (params?: Cluster_DeleteVotingConfigExclusions.Request, options?: TransportRequestOptions): TransportRequestPromise<Cluster_DeleteVotingConfigExclusions.Response>;
     deleteVotingConfigExclusions (callback: callbackFn<Cluster_DeleteVotingConfigExclusions.Response>): TransportRequestCallback;
     deleteVotingConfigExclusions (params: Cluster_DeleteVotingConfigExclusions.Request, callback: callbackFn<Cluster_DeleteVotingConfigExclusions.Response>): TransportRequestCallback;
     deleteVotingConfigExclusions (params: Cluster_DeleteVotingConfigExclusions.Request, options: TransportRequestOptions, callback: callbackFn<Cluster_DeleteVotingConfigExclusions.Response>): TransportRequestCallback;
 
-    postVotingConfigExclusions (params?: Cluster_PostVotingConfigExclusions.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cluster_PostVotingConfigExclusions.Response>>;
+    postVotingConfigExclusions (params?: Cluster_PostVotingConfigExclusions.Request, options?: TransportRequestOptions): TransportRequestPromise<Cluster_PostVotingConfigExclusions.Response>;
     postVotingConfigExclusions (callback: callbackFn<Cluster_PostVotingConfigExclusions.Response>): TransportRequestCallback;
     postVotingConfigExclusions (params: Cluster_PostVotingConfigExclusions.Request, callback: callbackFn<Cluster_PostVotingConfigExclusions.Response>): TransportRequestCallback;
     postVotingConfigExclusions (params: Cluster_PostVotingConfigExclusions.Request, options: TransportRequestOptions, callback: callbackFn<Cluster_PostVotingConfigExclusions.Response>): TransportRequestCallback;
 
-    getComponentTemplate (params?: Cluster_GetComponentTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cluster_GetComponentTemplate.Response>>;
+    getComponentTemplate (params?: Cluster_GetComponentTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<Cluster_GetComponentTemplate.Response>;
     getComponentTemplate (callback: callbackFn<Cluster_GetComponentTemplate.Response>): TransportRequestCallback;
     getComponentTemplate (params: Cluster_GetComponentTemplate.Request, callback: callbackFn<Cluster_GetComponentTemplate.Response>): TransportRequestCallback;
     getComponentTemplate (params: Cluster_GetComponentTemplate.Request, options: TransportRequestOptions, callback: callbackFn<Cluster_GetComponentTemplate.Response>): TransportRequestCallback;
 
-    deleteComponentTemplate (params: Cluster_DeleteComponentTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cluster_DeleteComponentTemplate.Response>>;
+    deleteComponentTemplate (params: Cluster_DeleteComponentTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<Cluster_DeleteComponentTemplate.Response>;
     deleteComponentTemplate (params: Cluster_DeleteComponentTemplate.Request, callback: callbackFn<Cluster_DeleteComponentTemplate.Response>): TransportRequestCallback;
     deleteComponentTemplate (params: Cluster_DeleteComponentTemplate.Request, options: TransportRequestOptions, callback: callbackFn<Cluster_DeleteComponentTemplate.Response>): TransportRequestCallback;
 
-    existsComponentTemplate (params: Cluster_ExistsComponentTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cluster_ExistsComponentTemplate.Response>>;
+    existsComponentTemplate (params: Cluster_ExistsComponentTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<Cluster_ExistsComponentTemplate.Response>;
     existsComponentTemplate (params: Cluster_ExistsComponentTemplate.Request, callback: callbackFn<Cluster_ExistsComponentTemplate.Response>): TransportRequestCallback;
     existsComponentTemplate (params: Cluster_ExistsComponentTemplate.Request, options: TransportRequestOptions, callback: callbackFn<Cluster_ExistsComponentTemplate.Response>): TransportRequestCallback;
 
-    putComponentTemplate (params: Cluster_PutComponentTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cluster_PutComponentTemplate.Response>>;
+    putComponentTemplate (params: Cluster_PutComponentTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<Cluster_PutComponentTemplate.Response>;
     putComponentTemplate (params: Cluster_PutComponentTemplate.Request, callback: callbackFn<Cluster_PutComponentTemplate.Response>): TransportRequestCallback;
     putComponentTemplate (params: Cluster_PutComponentTemplate.Request, options: TransportRequestOptions, callback: callbackFn<Cluster_PutComponentTemplate.Response>): TransportRequestCallback;
 
-    remoteInfo (params?: Cluster_RemoteInfo.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Cluster_RemoteInfo.Response>>;
+    remoteInfo (params?: Cluster_RemoteInfo.Request, options?: TransportRequestOptions): TransportRequestPromise<Cluster_RemoteInfo.Response>;
     remoteInfo (callback: callbackFn<Cluster_RemoteInfo.Response>): TransportRequestCallback;
     remoteInfo (params: Cluster_RemoteInfo.Request, callback: callbackFn<Cluster_RemoteInfo.Response>): TransportRequestCallback;
     remoteInfo (params: Cluster_RemoteInfo.Request, options: TransportRequestOptions, callback: callbackFn<Cluster_RemoteInfo.Response>): TransportRequestCallback;
@@ -571,256 +569,256 @@ declare class Client {
   };
 
   dangling_indices: {
-    listDanglingIndices (params?: DanglingIndices_ListDanglingIndices.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<DanglingIndices_ListDanglingIndices.Response>>;
+    listDanglingIndices (params?: DanglingIndices_ListDanglingIndices.Request, options?: TransportRequestOptions): TransportRequestPromise<DanglingIndices_ListDanglingIndices.Response>;
     listDanglingIndices (callback: callbackFn<DanglingIndices_ListDanglingIndices.Response>): TransportRequestCallback;
     listDanglingIndices (params: DanglingIndices_ListDanglingIndices.Request, callback: callbackFn<DanglingIndices_ListDanglingIndices.Response>): TransportRequestCallback;
     listDanglingIndices (params: DanglingIndices_ListDanglingIndices.Request, options: TransportRequestOptions, callback: callbackFn<DanglingIndices_ListDanglingIndices.Response>): TransportRequestCallback;
 
-    deleteDanglingIndex (params: DanglingIndices_DeleteDanglingIndex.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<DanglingIndices_DeleteDanglingIndex.Response>>;
+    deleteDanglingIndex (params: DanglingIndices_DeleteDanglingIndex.Request, options?: TransportRequestOptions): TransportRequestPromise<DanglingIndices_DeleteDanglingIndex.Response>;
     deleteDanglingIndex (params: DanglingIndices_DeleteDanglingIndex.Request, callback: callbackFn<DanglingIndices_DeleteDanglingIndex.Response>): TransportRequestCallback;
     deleteDanglingIndex (params: DanglingIndices_DeleteDanglingIndex.Request, options: TransportRequestOptions, callback: callbackFn<DanglingIndices_DeleteDanglingIndex.Response>): TransportRequestCallback;
 
-    importDanglingIndex (params: DanglingIndices_ImportDanglingIndex.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<DanglingIndices_ImportDanglingIndex.Response>>;
+    importDanglingIndex (params: DanglingIndices_ImportDanglingIndex.Request, options?: TransportRequestOptions): TransportRequestPromise<DanglingIndices_ImportDanglingIndex.Response>;
     importDanglingIndex (params: DanglingIndices_ImportDanglingIndex.Request, callback: callbackFn<DanglingIndices_ImportDanglingIndex.Response>): TransportRequestCallback;
     importDanglingIndex (params: DanglingIndices_ImportDanglingIndex.Request, options: TransportRequestOptions, callback: callbackFn<DanglingIndices_ImportDanglingIndex.Response>): TransportRequestCallback;
 
   };
 
   indices: {
-    getAlias (params?: Indices_GetAlias.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_GetAlias.Response>>;
+    getAlias (params?: Indices_GetAlias.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_GetAlias.Response>;
     getAlias (callback: callbackFn<Indices_GetAlias.Response>): TransportRequestCallback;
     getAlias (params: Indices_GetAlias.Request, callback: callbackFn<Indices_GetAlias.Response>): TransportRequestCallback;
     getAlias (params: Indices_GetAlias.Request, options: TransportRequestOptions, callback: callbackFn<Indices_GetAlias.Response>): TransportRequestCallback;
 
-    putAlias (params?: Indices_PutAlias.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_PutAlias.Response>>;
+    putAlias (params?: Indices_PutAlias.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_PutAlias.Response>;
     putAlias (callback: callbackFn<Indices_PutAlias.Response>): TransportRequestCallback;
     putAlias (params: Indices_PutAlias.Request, callback: callbackFn<Indices_PutAlias.Response>): TransportRequestCallback;
     putAlias (params: Indices_PutAlias.Request, options: TransportRequestOptions, callback: callbackFn<Indices_PutAlias.Response>): TransportRequestCallback;
 
-    existsAlias (params: Indices_ExistsAlias.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_ExistsAlias.Response>>;
+    existsAlias (params: Indices_ExistsAlias.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_ExistsAlias.Response>;
     existsAlias (params: Indices_ExistsAlias.Request, callback: callbackFn<Indices_ExistsAlias.Response>): TransportRequestCallback;
     existsAlias (params: Indices_ExistsAlias.Request, options: TransportRequestOptions, callback: callbackFn<Indices_ExistsAlias.Response>): TransportRequestCallback;
 
-    updateAliases (params: Indices_UpdateAliases.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_UpdateAliases.Response>>;
+    updateAliases (params: Indices_UpdateAliases.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_UpdateAliases.Response>;
     updateAliases (params: Indices_UpdateAliases.Request, callback: callbackFn<Indices_UpdateAliases.Response>): TransportRequestCallback;
     updateAliases (params: Indices_UpdateAliases.Request, options: TransportRequestOptions, callback: callbackFn<Indices_UpdateAliases.Response>): TransportRequestCallback;
 
-    analyze (params?: Indices_Analyze.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_Analyze.Response>>;
+    analyze (params?: Indices_Analyze.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_Analyze.Response>;
     analyze (callback: callbackFn<Indices_Analyze.Response>): TransportRequestCallback;
     analyze (params: Indices_Analyze.Request, callback: callbackFn<Indices_Analyze.Response>): TransportRequestCallback;
     analyze (params: Indices_Analyze.Request, options: TransportRequestOptions, callback: callbackFn<Indices_Analyze.Response>): TransportRequestCallback;
 
-    clearCache (params?: Indices_ClearCache.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_ClearCache.Response>>;
+    clearCache (params?: Indices_ClearCache.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_ClearCache.Response>;
     clearCache (callback: callbackFn<Indices_ClearCache.Response>): TransportRequestCallback;
     clearCache (params: Indices_ClearCache.Request, callback: callbackFn<Indices_ClearCache.Response>): TransportRequestCallback;
     clearCache (params: Indices_ClearCache.Request, options: TransportRequestOptions, callback: callbackFn<Indices_ClearCache.Response>): TransportRequestCallback;
 
-    getDataStream (params?: Indices_GetDataStream.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_GetDataStream.Response>>;
+    getDataStream (params?: Indices_GetDataStream.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_GetDataStream.Response>;
     getDataStream (callback: callbackFn<Indices_GetDataStream.Response>): TransportRequestCallback;
     getDataStream (params: Indices_GetDataStream.Request, callback: callbackFn<Indices_GetDataStream.Response>): TransportRequestCallback;
     getDataStream (params: Indices_GetDataStream.Request, options: TransportRequestOptions, callback: callbackFn<Indices_GetDataStream.Response>): TransportRequestCallback;
 
-    dataStreamsStats (params?: Indices_DataStreamsStats.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_DataStreamsStats.Response>>;
+    dataStreamsStats (params?: Indices_DataStreamsStats.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_DataStreamsStats.Response>;
     dataStreamsStats (callback: callbackFn<Indices_DataStreamsStats.Response>): TransportRequestCallback;
     dataStreamsStats (params: Indices_DataStreamsStats.Request, callback: callbackFn<Indices_DataStreamsStats.Response>): TransportRequestCallback;
     dataStreamsStats (params: Indices_DataStreamsStats.Request, options: TransportRequestOptions, callback: callbackFn<Indices_DataStreamsStats.Response>): TransportRequestCallback;
 
-    deleteDataStream (params: Indices_DeleteDataStream.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_DeleteDataStream.Response>>;
+    deleteDataStream (params: Indices_DeleteDataStream.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_DeleteDataStream.Response>;
     deleteDataStream (params: Indices_DeleteDataStream.Request, callback: callbackFn<Indices_DeleteDataStream.Response>): TransportRequestCallback;
     deleteDataStream (params: Indices_DeleteDataStream.Request, options: TransportRequestOptions, callback: callbackFn<Indices_DeleteDataStream.Response>): TransportRequestCallback;
 
-    createDataStream (params: Indices_CreateDataStream.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_CreateDataStream.Response>>;
+    createDataStream (params: Indices_CreateDataStream.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_CreateDataStream.Response>;
     createDataStream (params: Indices_CreateDataStream.Request, callback: callbackFn<Indices_CreateDataStream.Response>): TransportRequestCallback;
     createDataStream (params: Indices_CreateDataStream.Request, options: TransportRequestOptions, callback: callbackFn<Indices_CreateDataStream.Response>): TransportRequestCallback;
 
-    flush (params?: Indices_Flush.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_Flush.Response>>;
+    flush (params?: Indices_Flush.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_Flush.Response>;
     flush (callback: callbackFn<Indices_Flush.Response>): TransportRequestCallback;
     flush (params: Indices_Flush.Request, callback: callbackFn<Indices_Flush.Response>): TransportRequestCallback;
     flush (params: Indices_Flush.Request, options: TransportRequestOptions, callback: callbackFn<Indices_Flush.Response>): TransportRequestCallback;
 
-    forcemerge (params?: Indices_Forcemerge.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_Forcemerge.Response>>;
+    forcemerge (params?: Indices_Forcemerge.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_Forcemerge.Response>;
     forcemerge (callback: callbackFn<Indices_Forcemerge.Response>): TransportRequestCallback;
     forcemerge (params: Indices_Forcemerge.Request, callback: callbackFn<Indices_Forcemerge.Response>): TransportRequestCallback;
     forcemerge (params: Indices_Forcemerge.Request, options: TransportRequestOptions, callback: callbackFn<Indices_Forcemerge.Response>): TransportRequestCallback;
 
-    getIndexTemplate (params?: Indices_GetIndexTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_GetIndexTemplate.Response>>;
+    getIndexTemplate (params?: Indices_GetIndexTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_GetIndexTemplate.Response>;
     getIndexTemplate (callback: callbackFn<Indices_GetIndexTemplate.Response>): TransportRequestCallback;
     getIndexTemplate (params: Indices_GetIndexTemplate.Request, callback: callbackFn<Indices_GetIndexTemplate.Response>): TransportRequestCallback;
     getIndexTemplate (params: Indices_GetIndexTemplate.Request, options: TransportRequestOptions, callback: callbackFn<Indices_GetIndexTemplate.Response>): TransportRequestCallback;
 
-    simulateTemplate (params?: Indices_SimulateTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_SimulateTemplate.Response>>;
+    simulateTemplate (params?: Indices_SimulateTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_SimulateTemplate.Response>;
     simulateTemplate (callback: callbackFn<Indices_SimulateTemplate.Response>): TransportRequestCallback;
     simulateTemplate (params: Indices_SimulateTemplate.Request, callback: callbackFn<Indices_SimulateTemplate.Response>): TransportRequestCallback;
     simulateTemplate (params: Indices_SimulateTemplate.Request, options: TransportRequestOptions, callback: callbackFn<Indices_SimulateTemplate.Response>): TransportRequestCallback;
 
-    simulateIndexTemplate (params: Indices_SimulateIndexTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_SimulateIndexTemplate.Response>>;
+    simulateIndexTemplate (params: Indices_SimulateIndexTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_SimulateIndexTemplate.Response>;
     simulateIndexTemplate (params: Indices_SimulateIndexTemplate.Request, callback: callbackFn<Indices_SimulateIndexTemplate.Response>): TransportRequestCallback;
     simulateIndexTemplate (params: Indices_SimulateIndexTemplate.Request, options: TransportRequestOptions, callback: callbackFn<Indices_SimulateIndexTemplate.Response>): TransportRequestCallback;
 
-    deleteIndexTemplate (params: Indices_DeleteIndexTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_DeleteIndexTemplate.Response>>;
+    deleteIndexTemplate (params: Indices_DeleteIndexTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_DeleteIndexTemplate.Response>;
     deleteIndexTemplate (params: Indices_DeleteIndexTemplate.Request, callback: callbackFn<Indices_DeleteIndexTemplate.Response>): TransportRequestCallback;
     deleteIndexTemplate (params: Indices_DeleteIndexTemplate.Request, options: TransportRequestOptions, callback: callbackFn<Indices_DeleteIndexTemplate.Response>): TransportRequestCallback;
 
-    existsIndexTemplate (params: Indices_ExistsIndexTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_ExistsIndexTemplate.Response>>;
+    existsIndexTemplate (params: Indices_ExistsIndexTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_ExistsIndexTemplate.Response>;
     existsIndexTemplate (params: Indices_ExistsIndexTemplate.Request, callback: callbackFn<Indices_ExistsIndexTemplate.Response>): TransportRequestCallback;
     existsIndexTemplate (params: Indices_ExistsIndexTemplate.Request, options: TransportRequestOptions, callback: callbackFn<Indices_ExistsIndexTemplate.Response>): TransportRequestCallback;
 
-    putIndexTemplate (params: Indices_PutIndexTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_PutIndexTemplate.Response>>;
+    putIndexTemplate (params: Indices_PutIndexTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_PutIndexTemplate.Response>;
     putIndexTemplate (params: Indices_PutIndexTemplate.Request, callback: callbackFn<Indices_PutIndexTemplate.Response>): TransportRequestCallback;
     putIndexTemplate (params: Indices_PutIndexTemplate.Request, options: TransportRequestOptions, callback: callbackFn<Indices_PutIndexTemplate.Response>): TransportRequestCallback;
 
-    getMapping (params?: Indices_GetMapping.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_GetMapping.Response>>;
+    getMapping (params?: Indices_GetMapping.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_GetMapping.Response>;
     getMapping (callback: callbackFn<Indices_GetMapping.Response>): TransportRequestCallback;
     getMapping (params: Indices_GetMapping.Request, callback: callbackFn<Indices_GetMapping.Response>): TransportRequestCallback;
     getMapping (params: Indices_GetMapping.Request, options: TransportRequestOptions, callback: callbackFn<Indices_GetMapping.Response>): TransportRequestCallback;
 
-    getFieldMapping (params: Indices_GetFieldMapping.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_GetFieldMapping.Response>>;
+    getFieldMapping (params: Indices_GetFieldMapping.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_GetFieldMapping.Response>;
     getFieldMapping (params: Indices_GetFieldMapping.Request, callback: callbackFn<Indices_GetFieldMapping.Response>): TransportRequestCallback;
     getFieldMapping (params: Indices_GetFieldMapping.Request, options: TransportRequestOptions, callback: callbackFn<Indices_GetFieldMapping.Response>): TransportRequestCallback;
 
-    recovery (params?: Indices_Recovery.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_Recovery.Response>>;
+    recovery (params?: Indices_Recovery.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_Recovery.Response>;
     recovery (callback: callbackFn<Indices_Recovery.Response>): TransportRequestCallback;
     recovery (params: Indices_Recovery.Request, callback: callbackFn<Indices_Recovery.Response>): TransportRequestCallback;
     recovery (params: Indices_Recovery.Request, options: TransportRequestOptions, callback: callbackFn<Indices_Recovery.Response>): TransportRequestCallback;
 
-    refresh (params?: Indices_Refresh.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_Refresh.Response>>;
+    refresh (params?: Indices_Refresh.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_Refresh.Response>;
     refresh (callback: callbackFn<Indices_Refresh.Response>): TransportRequestCallback;
     refresh (params: Indices_Refresh.Request, callback: callbackFn<Indices_Refresh.Response>): TransportRequestCallback;
     refresh (params: Indices_Refresh.Request, options: TransportRequestOptions, callback: callbackFn<Indices_Refresh.Response>): TransportRequestCallback;
 
-    resolveIndex (params: Indices_ResolveIndex.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_ResolveIndex.Response>>;
+    resolveIndex (params: Indices_ResolveIndex.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_ResolveIndex.Response>;
     resolveIndex (params: Indices_ResolveIndex.Request, callback: callbackFn<Indices_ResolveIndex.Response>): TransportRequestCallback;
     resolveIndex (params: Indices_ResolveIndex.Request, options: TransportRequestOptions, callback: callbackFn<Indices_ResolveIndex.Response>): TransportRequestCallback;
 
-    segments (params?: Indices_Segments.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_Segments.Response>>;
+    segments (params?: Indices_Segments.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_Segments.Response>;
     segments (callback: callbackFn<Indices_Segments.Response>): TransportRequestCallback;
     segments (params: Indices_Segments.Request, callback: callbackFn<Indices_Segments.Response>): TransportRequestCallback;
     segments (params: Indices_Segments.Request, options: TransportRequestOptions, callback: callbackFn<Indices_Segments.Response>): TransportRequestCallback;
 
-    getSettings (params?: Indices_GetSettings.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_GetSettings.Response>>;
+    getSettings (params?: Indices_GetSettings.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_GetSettings.Response>;
     getSettings (callback: callbackFn<Indices_GetSettings.Response>): TransportRequestCallback;
     getSettings (params: Indices_GetSettings.Request, callback: callbackFn<Indices_GetSettings.Response>): TransportRequestCallback;
     getSettings (params: Indices_GetSettings.Request, options: TransportRequestOptions, callback: callbackFn<Indices_GetSettings.Response>): TransportRequestCallback;
 
-    putSettings (params: Indices_PutSettings.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_PutSettings.Response>>;
+    putSettings (params: Indices_PutSettings.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_PutSettings.Response>;
     putSettings (params: Indices_PutSettings.Request, callback: callbackFn<Indices_PutSettings.Response>): TransportRequestCallback;
     putSettings (params: Indices_PutSettings.Request, options: TransportRequestOptions, callback: callbackFn<Indices_PutSettings.Response>): TransportRequestCallback;
 
-    shardStores (params?: Indices_ShardStores.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_ShardStores.Response>>;
+    shardStores (params?: Indices_ShardStores.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_ShardStores.Response>;
     shardStores (callback: callbackFn<Indices_ShardStores.Response>): TransportRequestCallback;
     shardStores (params: Indices_ShardStores.Request, callback: callbackFn<Indices_ShardStores.Response>): TransportRequestCallback;
     shardStores (params: Indices_ShardStores.Request, options: TransportRequestOptions, callback: callbackFn<Indices_ShardStores.Response>): TransportRequestCallback;
 
-    stats (params?: Indices_Stats.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_Stats.Response>>;
+    stats (params?: Indices_Stats.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_Stats.Response>;
     stats (callback: callbackFn<Indices_Stats.Response>): TransportRequestCallback;
     stats (params: Indices_Stats.Request, callback: callbackFn<Indices_Stats.Response>): TransportRequestCallback;
     stats (params: Indices_Stats.Request, options: TransportRequestOptions, callback: callbackFn<Indices_Stats.Response>): TransportRequestCallback;
 
-    getTemplate (params?: Indices_GetTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_GetTemplate.Response>>;
+    getTemplate (params?: Indices_GetTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_GetTemplate.Response>;
     getTemplate (callback: callbackFn<Indices_GetTemplate.Response>): TransportRequestCallback;
     getTemplate (params: Indices_GetTemplate.Request, callback: callbackFn<Indices_GetTemplate.Response>): TransportRequestCallback;
     getTemplate (params: Indices_GetTemplate.Request, options: TransportRequestOptions, callback: callbackFn<Indices_GetTemplate.Response>): TransportRequestCallback;
 
-    deleteTemplate (params: Indices_DeleteTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_DeleteTemplate.Response>>;
+    deleteTemplate (params: Indices_DeleteTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_DeleteTemplate.Response>;
     deleteTemplate (params: Indices_DeleteTemplate.Request, callback: callbackFn<Indices_DeleteTemplate.Response>): TransportRequestCallback;
     deleteTemplate (params: Indices_DeleteTemplate.Request, options: TransportRequestOptions, callback: callbackFn<Indices_DeleteTemplate.Response>): TransportRequestCallback;
 
-    existsTemplate (params: Indices_ExistsTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_ExistsTemplate.Response>>;
+    existsTemplate (params: Indices_ExistsTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_ExistsTemplate.Response>;
     existsTemplate (params: Indices_ExistsTemplate.Request, callback: callbackFn<Indices_ExistsTemplate.Response>): TransportRequestCallback;
     existsTemplate (params: Indices_ExistsTemplate.Request, options: TransportRequestOptions, callback: callbackFn<Indices_ExistsTemplate.Response>): TransportRequestCallback;
 
-    putTemplate (params: Indices_PutTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_PutTemplate.Response>>;
+    putTemplate (params: Indices_PutTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_PutTemplate.Response>;
     putTemplate (params: Indices_PutTemplate.Request, callback: callbackFn<Indices_PutTemplate.Response>): TransportRequestCallback;
     putTemplate (params: Indices_PutTemplate.Request, options: TransportRequestOptions, callback: callbackFn<Indices_PutTemplate.Response>): TransportRequestCallback;
 
-    getUpgrade (params?: Indices_GetUpgrade.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_GetUpgrade.Response>>;
+    getUpgrade (params?: Indices_GetUpgrade.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_GetUpgrade.Response>;
     getUpgrade (callback: callbackFn<Indices_GetUpgrade.Response>): TransportRequestCallback;
     getUpgrade (params: Indices_GetUpgrade.Request, callback: callbackFn<Indices_GetUpgrade.Response>): TransportRequestCallback;
     getUpgrade (params: Indices_GetUpgrade.Request, options: TransportRequestOptions, callback: callbackFn<Indices_GetUpgrade.Response>): TransportRequestCallback;
 
-    upgrade (params?: Indices_Upgrade.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_Upgrade.Response>>;
+    upgrade (params?: Indices_Upgrade.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_Upgrade.Response>;
     upgrade (callback: callbackFn<Indices_Upgrade.Response>): TransportRequestCallback;
     upgrade (params: Indices_Upgrade.Request, callback: callbackFn<Indices_Upgrade.Response>): TransportRequestCallback;
     upgrade (params: Indices_Upgrade.Request, options: TransportRequestOptions, callback: callbackFn<Indices_Upgrade.Response>): TransportRequestCallback;
 
-    validateQuery (params?: Indices_ValidateQuery.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_ValidateQuery.Response>>;
+    validateQuery (params?: Indices_ValidateQuery.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_ValidateQuery.Response>;
     validateQuery (callback: callbackFn<Indices_ValidateQuery.Response>): TransportRequestCallback;
     validateQuery (params: Indices_ValidateQuery.Request, callback: callbackFn<Indices_ValidateQuery.Response>): TransportRequestCallback;
     validateQuery (params: Indices_ValidateQuery.Request, options: TransportRequestOptions, callback: callbackFn<Indices_ValidateQuery.Response>): TransportRequestCallback;
 
-    rollover (params: Indices_Rollover.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_Rollover.Response>>;
+    rollover (params: Indices_Rollover.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_Rollover.Response>;
     rollover (params: Indices_Rollover.Request, callback: callbackFn<Indices_Rollover.Response>): TransportRequestCallback;
     rollover (params: Indices_Rollover.Request, options: TransportRequestOptions, callback: callbackFn<Indices_Rollover.Response>): TransportRequestCallback;
 
-    delete (params: Indices_Delete.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_Delete.Response>>;
+    delete (params: Indices_Delete.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_Delete.Response>;
     delete (params: Indices_Delete.Request, callback: callbackFn<Indices_Delete.Response>): TransportRequestCallback;
     delete (params: Indices_Delete.Request, options: TransportRequestOptions, callback: callbackFn<Indices_Delete.Response>): TransportRequestCallback;
 
-    get (params: Indices_Get.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_Get.Response>>;
+    get (params: Indices_Get.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_Get.Response>;
     get (params: Indices_Get.Request, callback: callbackFn<Indices_Get.Response>): TransportRequestCallback;
     get (params: Indices_Get.Request, options: TransportRequestOptions, callback: callbackFn<Indices_Get.Response>): TransportRequestCallback;
 
-    exists (params: Indices_Exists.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_Exists.Response>>;
+    exists (params: Indices_Exists.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_Exists.Response>;
     exists (params: Indices_Exists.Request, callback: callbackFn<Indices_Exists.Response>): TransportRequestCallback;
     exists (params: Indices_Exists.Request, options: TransportRequestOptions, callback: callbackFn<Indices_Exists.Response>): TransportRequestCallback;
 
-    create (params: Indices_Create.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_Create.Response>>;
+    create (params: Indices_Create.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_Create.Response>;
     create (params: Indices_Create.Request, callback: callbackFn<Indices_Create.Response>): TransportRequestCallback;
     create (params: Indices_Create.Request, options: TransportRequestOptions, callback: callbackFn<Indices_Create.Response>): TransportRequestCallback;
 
-    deleteAlias (params: Indices_DeleteAlias.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_DeleteAlias.Response>>;
+    deleteAlias (params: Indices_DeleteAlias.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_DeleteAlias.Response>;
     deleteAlias (params: Indices_DeleteAlias.Request, callback: callbackFn<Indices_DeleteAlias.Response>): TransportRequestCallback;
     deleteAlias (params: Indices_DeleteAlias.Request, options: TransportRequestOptions, callback: callbackFn<Indices_DeleteAlias.Response>): TransportRequestCallback;
 
-    addBlock (params: Indices_AddBlock.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_AddBlock.Response>>;
+    addBlock (params: Indices_AddBlock.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_AddBlock.Response>;
     addBlock (params: Indices_AddBlock.Request, callback: callbackFn<Indices_AddBlock.Response>): TransportRequestCallback;
     addBlock (params: Indices_AddBlock.Request, options: TransportRequestOptions, callback: callbackFn<Indices_AddBlock.Response>): TransportRequestCallback;
 
-    clone (params: Indices_Clone.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_Clone.Response>>;
+    clone (params: Indices_Clone.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_Clone.Response>;
     clone (params: Indices_Clone.Request, callback: callbackFn<Indices_Clone.Response>): TransportRequestCallback;
     clone (params: Indices_Clone.Request, options: TransportRequestOptions, callback: callbackFn<Indices_Clone.Response>): TransportRequestCallback;
 
-    close (params: Indices_Close.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_Close.Response>>;
+    close (params: Indices_Close.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_Close.Response>;
     close (params: Indices_Close.Request, callback: callbackFn<Indices_Close.Response>): TransportRequestCallback;
     close (params: Indices_Close.Request, options: TransportRequestOptions, callback: callbackFn<Indices_Close.Response>): TransportRequestCallback;
 
-    putMapping (params: Indices_PutMapping.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_PutMapping.Response>>;
+    putMapping (params: Indices_PutMapping.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_PutMapping.Response>;
     putMapping (params: Indices_PutMapping.Request, callback: callbackFn<Indices_PutMapping.Response>): TransportRequestCallback;
     putMapping (params: Indices_PutMapping.Request, options: TransportRequestOptions, callback: callbackFn<Indices_PutMapping.Response>): TransportRequestCallback;
 
-    open (params: Indices_Open.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_Open.Response>>;
+    open (params: Indices_Open.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_Open.Response>;
     open (params: Indices_Open.Request, callback: callbackFn<Indices_Open.Response>): TransportRequestCallback;
     open (params: Indices_Open.Request, options: TransportRequestOptions, callback: callbackFn<Indices_Open.Response>): TransportRequestCallback;
 
-    shrink (params: Indices_Shrink.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_Shrink.Response>>;
+    shrink (params: Indices_Shrink.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_Shrink.Response>;
     shrink (params: Indices_Shrink.Request, callback: callbackFn<Indices_Shrink.Response>): TransportRequestCallback;
     shrink (params: Indices_Shrink.Request, options: TransportRequestOptions, callback: callbackFn<Indices_Shrink.Response>): TransportRequestCallback;
 
-    split (params: Indices_Split.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Indices_Split.Response>>;
+    split (params: Indices_Split.Request, options?: TransportRequestOptions): TransportRequestPromise<Indices_Split.Response>;
     split (params: Indices_Split.Request, callback: callbackFn<Indices_Split.Response>): TransportRequestCallback;
     split (params: Indices_Split.Request, options: TransportRequestOptions, callback: callbackFn<Indices_Split.Response>): TransportRequestCallback;
 
   };
 
   ingest: {
-    getPipeline (params?: Ingest_GetPipeline.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Ingest_GetPipeline.Response>>;
+    getPipeline (params?: Ingest_GetPipeline.Request, options?: TransportRequestOptions): TransportRequestPromise<Ingest_GetPipeline.Response>;
     getPipeline (callback: callbackFn<Ingest_GetPipeline.Response>): TransportRequestCallback;
     getPipeline (params: Ingest_GetPipeline.Request, callback: callbackFn<Ingest_GetPipeline.Response>): TransportRequestCallback;
     getPipeline (params: Ingest_GetPipeline.Request, options: TransportRequestOptions, callback: callbackFn<Ingest_GetPipeline.Response>): TransportRequestCallback;
 
-    simulate (params: Ingest_Simulate.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Ingest_Simulate.Response>>;
+    simulate (params: Ingest_Simulate.Request, options?: TransportRequestOptions): TransportRequestPromise<Ingest_Simulate.Response>;
     simulate (params: Ingest_Simulate.Request, callback: callbackFn<Ingest_Simulate.Response>): TransportRequestCallback;
     simulate (params: Ingest_Simulate.Request, options: TransportRequestOptions, callback: callbackFn<Ingest_Simulate.Response>): TransportRequestCallback;
 
-    deletePipeline (params: Ingest_DeletePipeline.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Ingest_DeletePipeline.Response>>;
+    deletePipeline (params: Ingest_DeletePipeline.Request, options?: TransportRequestOptions): TransportRequestPromise<Ingest_DeletePipeline.Response>;
     deletePipeline (params: Ingest_DeletePipeline.Request, callback: callbackFn<Ingest_DeletePipeline.Response>): TransportRequestCallback;
     deletePipeline (params: Ingest_DeletePipeline.Request, options: TransportRequestOptions, callback: callbackFn<Ingest_DeletePipeline.Response>): TransportRequestCallback;
 
-    putPipeline (params: Ingest_PutPipeline.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Ingest_PutPipeline.Response>>;
+    putPipeline (params: Ingest_PutPipeline.Request, options?: TransportRequestOptions): TransportRequestPromise<Ingest_PutPipeline.Response>;
     putPipeline (params: Ingest_PutPipeline.Request, callback: callbackFn<Ingest_PutPipeline.Response>): TransportRequestCallback;
     putPipeline (params: Ingest_PutPipeline.Request, options: TransportRequestOptions, callback: callbackFn<Ingest_PutPipeline.Response>): TransportRequestCallback;
 
-    processorGrok (params?: Ingest_ProcessorGrok.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Ingest_ProcessorGrok.Response>>;
+    processorGrok (params?: Ingest_ProcessorGrok.Request, options?: TransportRequestOptions): TransportRequestPromise<Ingest_ProcessorGrok.Response>;
     processorGrok (callback: callbackFn<Ingest_ProcessorGrok.Response>): TransportRequestCallback;
     processorGrok (params: Ingest_ProcessorGrok.Request, callback: callbackFn<Ingest_ProcessorGrok.Response>): TransportRequestCallback;
     processorGrok (params: Ingest_ProcessorGrok.Request, options: TransportRequestOptions, callback: callbackFn<Ingest_ProcessorGrok.Response>): TransportRequestCallback;
@@ -828,90 +826,90 @@ declare class Client {
   };
 
   knn: {
-    stats (params?: Knn_Stats.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Knn_Stats.Response>>;
+    stats (params?: Knn_Stats.Request, options?: TransportRequestOptions): TransportRequestPromise<Knn_Stats.Response>;
     stats (callback: callbackFn<Knn_Stats.Response>): TransportRequestCallback;
     stats (params: Knn_Stats.Request, callback: callbackFn<Knn_Stats.Response>): TransportRequestCallback;
     stats (params: Knn_Stats.Request, options: TransportRequestOptions, callback: callbackFn<Knn_Stats.Response>): TransportRequestCallback;
 
-    searchModels (params?: Knn_SearchModels.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Knn_SearchModels.Response>>;
+    searchModels (params?: Knn_SearchModels.Request, options?: TransportRequestOptions): TransportRequestPromise<Knn_SearchModels.Response>;
     searchModels (callback: callbackFn<Knn_SearchModels.Response>): TransportRequestCallback;
     searchModels (params: Knn_SearchModels.Request, callback: callbackFn<Knn_SearchModels.Response>): TransportRequestCallback;
     searchModels (params: Knn_SearchModels.Request, options: TransportRequestOptions, callback: callbackFn<Knn_SearchModels.Response>): TransportRequestCallback;
 
-    trainModel (params: Knn_TrainModel.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Knn_TrainModel.Response>>;
+    trainModel (params: Knn_TrainModel.Request, options?: TransportRequestOptions): TransportRequestPromise<Knn_TrainModel.Response>;
     trainModel (params: Knn_TrainModel.Request, callback: callbackFn<Knn_TrainModel.Response>): TransportRequestCallback;
     trainModel (params: Knn_TrainModel.Request, options: TransportRequestOptions, callback: callbackFn<Knn_TrainModel.Response>): TransportRequestCallback;
 
-    deleteModel (params: Knn_DeleteModel.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Knn_DeleteModel.Response>>;
+    deleteModel (params: Knn_DeleteModel.Request, options?: TransportRequestOptions): TransportRequestPromise<Knn_DeleteModel.Response>;
     deleteModel (params: Knn_DeleteModel.Request, callback: callbackFn<Knn_DeleteModel.Response>): TransportRequestCallback;
     deleteModel (params: Knn_DeleteModel.Request, options: TransportRequestOptions, callback: callbackFn<Knn_DeleteModel.Response>): TransportRequestCallback;
 
-    getModel (params: Knn_GetModel.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Knn_GetModel.Response>>;
+    getModel (params: Knn_GetModel.Request, options?: TransportRequestOptions): TransportRequestPromise<Knn_GetModel.Response>;
     getModel (params: Knn_GetModel.Request, callback: callbackFn<Knn_GetModel.Response>): TransportRequestCallback;
     getModel (params: Knn_GetModel.Request, options: TransportRequestOptions, callback: callbackFn<Knn_GetModel.Response>): TransportRequestCallback;
 
-    warmup (params: Knn_Warmup.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Knn_Warmup.Response>>;
+    warmup (params: Knn_Warmup.Request, options?: TransportRequestOptions): TransportRequestPromise<Knn_Warmup.Response>;
     warmup (params: Knn_Warmup.Request, callback: callbackFn<Knn_Warmup.Response>): TransportRequestCallback;
     warmup (params: Knn_Warmup.Request, options: TransportRequestOptions, callback: callbackFn<Knn_Warmup.Response>): TransportRequestCallback;
 
   };
 
   ml: {
-    registerModelGroup (params?: Ml_RegisterModelGroup.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Ml_RegisterModelGroup.Response>>;
+    registerModelGroup (params?: Ml_RegisterModelGroup.Request, options?: TransportRequestOptions): TransportRequestPromise<Ml_RegisterModelGroup.Response>;
     registerModelGroup (callback: callbackFn<Ml_RegisterModelGroup.Response>): TransportRequestCallback;
     registerModelGroup (params: Ml_RegisterModelGroup.Request, callback: callbackFn<Ml_RegisterModelGroup.Response>): TransportRequestCallback;
     registerModelGroup (params: Ml_RegisterModelGroup.Request, options: TransportRequestOptions, callback: callbackFn<Ml_RegisterModelGroup.Response>): TransportRequestCallback;
 
-    deleteModelGroup (params: Ml_DeleteModelGroup.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Ml_DeleteModelGroup.Response>>;
+    deleteModelGroup (params: Ml_DeleteModelGroup.Request, options?: TransportRequestOptions): TransportRequestPromise<Ml_DeleteModelGroup.Response>;
     deleteModelGroup (params: Ml_DeleteModelGroup.Request, callback: callbackFn<Ml_DeleteModelGroup.Response>): TransportRequestCallback;
     deleteModelGroup (params: Ml_DeleteModelGroup.Request, options: TransportRequestOptions, callback: callbackFn<Ml_DeleteModelGroup.Response>): TransportRequestCallback;
 
-    getModelGroup (params: Ml_GetModelGroup.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Ml_GetModelGroup.Response>>;
+    getModelGroup (params: Ml_GetModelGroup.Request, options?: TransportRequestOptions): TransportRequestPromise<Ml_GetModelGroup.Response>;
     getModelGroup (params: Ml_GetModelGroup.Request, callback: callbackFn<Ml_GetModelGroup.Response>): TransportRequestCallback;
     getModelGroup (params: Ml_GetModelGroup.Request, options: TransportRequestOptions, callback: callbackFn<Ml_GetModelGroup.Response>): TransportRequestCallback;
 
-    registerModel (params?: Ml_RegisterModel.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Ml_RegisterModel.Response>>;
+    registerModel (params?: Ml_RegisterModel.Request, options?: TransportRequestOptions): TransportRequestPromise<Ml_RegisterModel.Response>;
     registerModel (callback: callbackFn<Ml_RegisterModel.Response>): TransportRequestCallback;
     registerModel (params: Ml_RegisterModel.Request, callback: callbackFn<Ml_RegisterModel.Response>): TransportRequestCallback;
     registerModel (params: Ml_RegisterModel.Request, options: TransportRequestOptions, callback: callbackFn<Ml_RegisterModel.Response>): TransportRequestCallback;
 
-    searchModels (params?: Ml_SearchModels.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Ml_SearchModels.Response>>;
+    searchModels (params?: Ml_SearchModels.Request, options?: TransportRequestOptions): TransportRequestPromise<Ml_SearchModels.Response>;
     searchModels (callback: callbackFn<Ml_SearchModels.Response>): TransportRequestCallback;
     searchModels (params: Ml_SearchModels.Request, callback: callbackFn<Ml_SearchModels.Response>): TransportRequestCallback;
     searchModels (params: Ml_SearchModels.Request, options: TransportRequestOptions, callback: callbackFn<Ml_SearchModels.Response>): TransportRequestCallback;
 
-    deleteModel (params: Ml_DeleteModel.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Ml_DeleteModel.Response>>;
+    deleteModel (params: Ml_DeleteModel.Request, options?: TransportRequestOptions): TransportRequestPromise<Ml_DeleteModel.Response>;
     deleteModel (params: Ml_DeleteModel.Request, callback: callbackFn<Ml_DeleteModel.Response>): TransportRequestCallback;
     deleteModel (params: Ml_DeleteModel.Request, options: TransportRequestOptions, callback: callbackFn<Ml_DeleteModel.Response>): TransportRequestCallback;
 
-    getTask (params: Ml_GetTask.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Ml_GetTask.Response>>;
+    getTask (params: Ml_GetTask.Request, options?: TransportRequestOptions): TransportRequestPromise<Ml_GetTask.Response>;
     getTask (params: Ml_GetTask.Request, callback: callbackFn<Ml_GetTask.Response>): TransportRequestCallback;
     getTask (params: Ml_GetTask.Request, options: TransportRequestOptions, callback: callbackFn<Ml_GetTask.Response>): TransportRequestCallback;
 
   };
 
   nodes: {
-    info (params?: Nodes_Info.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Nodes_Info.Response>>;
+    info (params?: Nodes_Info.Request, options?: TransportRequestOptions): TransportRequestPromise<Nodes_Info.Response>;
     info (callback: callbackFn<Nodes_Info.Response>): TransportRequestCallback;
     info (params: Nodes_Info.Request, callback: callbackFn<Nodes_Info.Response>): TransportRequestCallback;
     info (params: Nodes_Info.Request, options: TransportRequestOptions, callback: callbackFn<Nodes_Info.Response>): TransportRequestCallback;
 
-    hotThreads (params?: Nodes_HotThreads.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Nodes_HotThreads.Response>>;
+    hotThreads (params?: Nodes_HotThreads.Request, options?: TransportRequestOptions): TransportRequestPromise<Nodes_HotThreads.Response>;
     hotThreads (callback: callbackFn<Nodes_HotThreads.Response>): TransportRequestCallback;
     hotThreads (params: Nodes_HotThreads.Request, callback: callbackFn<Nodes_HotThreads.Response>): TransportRequestCallback;
     hotThreads (params: Nodes_HotThreads.Request, options: TransportRequestOptions, callback: callbackFn<Nodes_HotThreads.Response>): TransportRequestCallback;
 
-    reloadSecureSettings (params?: Nodes_ReloadSecureSettings.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Nodes_ReloadSecureSettings.Response>>;
+    reloadSecureSettings (params?: Nodes_ReloadSecureSettings.Request, options?: TransportRequestOptions): TransportRequestPromise<Nodes_ReloadSecureSettings.Response>;
     reloadSecureSettings (callback: callbackFn<Nodes_ReloadSecureSettings.Response>): TransportRequestCallback;
     reloadSecureSettings (params: Nodes_ReloadSecureSettings.Request, callback: callbackFn<Nodes_ReloadSecureSettings.Response>): TransportRequestCallback;
     reloadSecureSettings (params: Nodes_ReloadSecureSettings.Request, options: TransportRequestOptions, callback: callbackFn<Nodes_ReloadSecureSettings.Response>): TransportRequestCallback;
 
-    stats (params?: Nodes_Stats.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Nodes_Stats.Response>>;
+    stats (params?: Nodes_Stats.Request, options?: TransportRequestOptions): TransportRequestPromise<Nodes_Stats.Response>;
     stats (callback: callbackFn<Nodes_Stats.Response>): TransportRequestCallback;
     stats (params: Nodes_Stats.Request, callback: callbackFn<Nodes_Stats.Response>): TransportRequestCallback;
     stats (params: Nodes_Stats.Request, options: TransportRequestOptions, callback: callbackFn<Nodes_Stats.Response>): TransportRequestCallback;
 
-    usage (params?: Nodes_Usage.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Nodes_Usage.Response>>;
+    usage (params?: Nodes_Usage.Request, options?: TransportRequestOptions): TransportRequestPromise<Nodes_Usage.Response>;
     usage (callback: callbackFn<Nodes_Usage.Response>): TransportRequestCallback;
     usage (params: Nodes_Usage.Request, callback: callbackFn<Nodes_Usage.Response>): TransportRequestCallback;
     usage (params: Nodes_Usage.Request, options: TransportRequestOptions, callback: callbackFn<Nodes_Usage.Response>): TransportRequestCallback;
@@ -919,41 +917,41 @@ declare class Client {
   };
 
   notifications: {
-    listChannels (params?: Notifications_ListChannels.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Notifications_ListChannels.Response>>;
+    listChannels (params?: Notifications_ListChannels.Request, options?: TransportRequestOptions): TransportRequestPromise<Notifications_ListChannels.Response>;
     listChannels (callback: callbackFn<Notifications_ListChannels.Response>): TransportRequestCallback;
     listChannels (params: Notifications_ListChannels.Request, callback: callbackFn<Notifications_ListChannels.Response>): TransportRequestCallback;
     listChannels (params: Notifications_ListChannels.Request, options: TransportRequestOptions, callback: callbackFn<Notifications_ListChannels.Response>): TransportRequestCallback;
 
-    deleteConfigs (params: Notifications_DeleteConfigs.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Notifications_DeleteConfigs.Response>>;
+    deleteConfigs (params: Notifications_DeleteConfigs.Request, options?: TransportRequestOptions): TransportRequestPromise<Notifications_DeleteConfigs.Response>;
     deleteConfigs (params: Notifications_DeleteConfigs.Request, callback: callbackFn<Notifications_DeleteConfigs.Response>): TransportRequestCallback;
     deleteConfigs (params: Notifications_DeleteConfigs.Request, options: TransportRequestOptions, callback: callbackFn<Notifications_DeleteConfigs.Response>): TransportRequestCallback;
 
-    getConfigs (params?: Notifications_GetConfigs.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Notifications_GetConfigs.Response>>;
+    getConfigs (params?: Notifications_GetConfigs.Request, options?: TransportRequestOptions): TransportRequestPromise<Notifications_GetConfigs.Response>;
     getConfigs (callback: callbackFn<Notifications_GetConfigs.Response>): TransportRequestCallback;
     getConfigs (params: Notifications_GetConfigs.Request, callback: callbackFn<Notifications_GetConfigs.Response>): TransportRequestCallback;
     getConfigs (params: Notifications_GetConfigs.Request, options: TransportRequestOptions, callback: callbackFn<Notifications_GetConfigs.Response>): TransportRequestCallback;
 
-    createConfig (params: Notifications_CreateConfig.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Notifications_CreateConfig.Response>>;
+    createConfig (params: Notifications_CreateConfig.Request, options?: TransportRequestOptions): TransportRequestPromise<Notifications_CreateConfig.Response>;
     createConfig (params: Notifications_CreateConfig.Request, callback: callbackFn<Notifications_CreateConfig.Response>): TransportRequestCallback;
     createConfig (params: Notifications_CreateConfig.Request, options: TransportRequestOptions, callback: callbackFn<Notifications_CreateConfig.Response>): TransportRequestCallback;
 
-    deleteConfig (params: Notifications_DeleteConfig.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Notifications_DeleteConfig.Response>>;
+    deleteConfig (params: Notifications_DeleteConfig.Request, options?: TransportRequestOptions): TransportRequestPromise<Notifications_DeleteConfig.Response>;
     deleteConfig (params: Notifications_DeleteConfig.Request, callback: callbackFn<Notifications_DeleteConfig.Response>): TransportRequestCallback;
     deleteConfig (params: Notifications_DeleteConfig.Request, options: TransportRequestOptions, callback: callbackFn<Notifications_DeleteConfig.Response>): TransportRequestCallback;
 
-    getConfig (params: Notifications_GetConfig.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Notifications_GetConfig.Response>>;
+    getConfig (params: Notifications_GetConfig.Request, options?: TransportRequestOptions): TransportRequestPromise<Notifications_GetConfig.Response>;
     getConfig (params: Notifications_GetConfig.Request, callback: callbackFn<Notifications_GetConfig.Response>): TransportRequestCallback;
     getConfig (params: Notifications_GetConfig.Request, options: TransportRequestOptions, callback: callbackFn<Notifications_GetConfig.Response>): TransportRequestCallback;
 
-    updateConfig (params: Notifications_UpdateConfig.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Notifications_UpdateConfig.Response>>;
+    updateConfig (params: Notifications_UpdateConfig.Request, options?: TransportRequestOptions): TransportRequestPromise<Notifications_UpdateConfig.Response>;
     updateConfig (params: Notifications_UpdateConfig.Request, callback: callbackFn<Notifications_UpdateConfig.Response>): TransportRequestCallback;
     updateConfig (params: Notifications_UpdateConfig.Request, options: TransportRequestOptions, callback: callbackFn<Notifications_UpdateConfig.Response>): TransportRequestCallback;
 
-    sendTest (params: Notifications_SendTest.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Notifications_SendTest.Response>>;
+    sendTest (params: Notifications_SendTest.Request, options?: TransportRequestOptions): TransportRequestPromise<Notifications_SendTest.Response>;
     sendTest (params: Notifications_SendTest.Request, callback: callbackFn<Notifications_SendTest.Response>): TransportRequestCallback;
     sendTest (params: Notifications_SendTest.Request, options: TransportRequestOptions, callback: callbackFn<Notifications_SendTest.Response>): TransportRequestCallback;
 
-    listFeatures (params?: Notifications_ListFeatures.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Notifications_ListFeatures.Response>>;
+    listFeatures (params?: Notifications_ListFeatures.Request, options?: TransportRequestOptions): TransportRequestPromise<Notifications_ListFeatures.Response>;
     listFeatures (callback: callbackFn<Notifications_ListFeatures.Response>): TransportRequestCallback;
     listFeatures (params: Notifications_ListFeatures.Request, callback: callbackFn<Notifications_ListFeatures.Response>): TransportRequestCallback;
     listFeatures (params: Notifications_ListFeatures.Request, options: TransportRequestOptions, callback: callbackFn<Notifications_ListFeatures.Response>): TransportRequestCallback;
@@ -961,398 +959,398 @@ declare class Client {
   };
 
   ppl: {
-    query (params: Ppl_Query.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Ppl_Query.Response>>;
+    query (params: Ppl_Query.Request, options?: TransportRequestOptions): TransportRequestPromise<Ppl_Query.Response>;
     query (params: Ppl_Query.Request, callback: callbackFn<Ppl_Query.Response>): TransportRequestCallback;
     query (params: Ppl_Query.Request, options: TransportRequestOptions, callback: callbackFn<Ppl_Query.Response>): TransportRequestCallback;
 
-    explain (params: Ppl_Explain.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Ppl_Explain.Response>>;
+    explain (params: Ppl_Explain.Request, options?: TransportRequestOptions): TransportRequestPromise<Ppl_Explain.Response>;
     explain (params: Ppl_Explain.Request, callback: callbackFn<Ppl_Explain.Response>): TransportRequestCallback;
     explain (params: Ppl_Explain.Request, options: TransportRequestOptions, callback: callbackFn<Ppl_Explain.Response>): TransportRequestCallback;
 
-    getStats (params?: Ppl_GetStats.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Ppl_GetStats.Response>>;
+    getStats (params?: Ppl_GetStats.Request, options?: TransportRequestOptions): TransportRequestPromise<Ppl_GetStats.Response>;
     getStats (callback: callbackFn<Ppl_GetStats.Response>): TransportRequestCallback;
     getStats (params: Ppl_GetStats.Request, callback: callbackFn<Ppl_GetStats.Response>): TransportRequestCallback;
     getStats (params: Ppl_GetStats.Request, options: TransportRequestOptions, callback: callbackFn<Ppl_GetStats.Response>): TransportRequestCallback;
 
-    postStats (params: Ppl_PostStats.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Ppl_PostStats.Response>>;
+    postStats (params: Ppl_PostStats.Request, options?: TransportRequestOptions): TransportRequestPromise<Ppl_PostStats.Response>;
     postStats (params: Ppl_PostStats.Request, callback: callbackFn<Ppl_PostStats.Response>): TransportRequestCallback;
     postStats (params: Ppl_PostStats.Request, options: TransportRequestOptions, callback: callbackFn<Ppl_PostStats.Response>): TransportRequestCallback;
 
   };
 
   remote_store: {
-    restore (params: RemoteStore_Restore.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<RemoteStore_Restore.Response>>;
+    restore (params: RemoteStore_Restore.Request, options?: TransportRequestOptions): TransportRequestPromise<RemoteStore_Restore.Response>;
     restore (params: RemoteStore_Restore.Request, callback: callbackFn<RemoteStore_Restore.Response>): TransportRequestCallback;
     restore (params: RemoteStore_Restore.Request, options: TransportRequestOptions, callback: callbackFn<RemoteStore_Restore.Response>): TransportRequestCallback;
 
   };
 
   rollups: {
-    delete (params: Rollups_Delete.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Rollups_Delete.Response>>;
+    delete (params: Rollups_Delete.Request, options?: TransportRequestOptions): TransportRequestPromise<Rollups_Delete.Response>;
     delete (params: Rollups_Delete.Request, callback: callbackFn<Rollups_Delete.Response>): TransportRequestCallback;
     delete (params: Rollups_Delete.Request, options: TransportRequestOptions, callback: callbackFn<Rollups_Delete.Response>): TransportRequestCallback;
 
-    get (params: Rollups_Get.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Rollups_Get.Response>>;
+    get (params: Rollups_Get.Request, options?: TransportRequestOptions): TransportRequestPromise<Rollups_Get.Response>;
     get (params: Rollups_Get.Request, callback: callbackFn<Rollups_Get.Response>): TransportRequestCallback;
     get (params: Rollups_Get.Request, options: TransportRequestOptions, callback: callbackFn<Rollups_Get.Response>): TransportRequestCallback;
 
-    put (params: Rollups_Put.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Rollups_Put.Response>>;
+    put (params: Rollups_Put.Request, options?: TransportRequestOptions): TransportRequestPromise<Rollups_Put.Response>;
     put (params: Rollups_Put.Request, callback: callbackFn<Rollups_Put.Response>): TransportRequestCallback;
     put (params: Rollups_Put.Request, options: TransportRequestOptions, callback: callbackFn<Rollups_Put.Response>): TransportRequestCallback;
 
-    explain (params: Rollups_Explain.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Rollups_Explain.Response>>;
+    explain (params: Rollups_Explain.Request, options?: TransportRequestOptions): TransportRequestPromise<Rollups_Explain.Response>;
     explain (params: Rollups_Explain.Request, callback: callbackFn<Rollups_Explain.Response>): TransportRequestCallback;
     explain (params: Rollups_Explain.Request, options: TransportRequestOptions, callback: callbackFn<Rollups_Explain.Response>): TransportRequestCallback;
 
-    start (params: Rollups_Start.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Rollups_Start.Response>>;
+    start (params: Rollups_Start.Request, options?: TransportRequestOptions): TransportRequestPromise<Rollups_Start.Response>;
     start (params: Rollups_Start.Request, callback: callbackFn<Rollups_Start.Response>): TransportRequestCallback;
     start (params: Rollups_Start.Request, options: TransportRequestOptions, callback: callbackFn<Rollups_Start.Response>): TransportRequestCallback;
 
-    stop (params: Rollups_Stop.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Rollups_Stop.Response>>;
+    stop (params: Rollups_Stop.Request, options?: TransportRequestOptions): TransportRequestPromise<Rollups_Stop.Response>;
     stop (params: Rollups_Stop.Request, callback: callbackFn<Rollups_Stop.Response>): TransportRequestCallback;
     stop (params: Rollups_Stop.Request, options: TransportRequestOptions, callback: callbackFn<Rollups_Stop.Response>): TransportRequestCallback;
 
   };
 
   search_pipeline: {
-    get (params?: SearchPipeline_Get.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<SearchPipeline_Get.Response>>;
+    get (params?: SearchPipeline_Get.Request, options?: TransportRequestOptions): TransportRequestPromise<SearchPipeline_Get.Response>;
     get (callback: callbackFn<SearchPipeline_Get.Response>): TransportRequestCallback;
     get (params: SearchPipeline_Get.Request, callback: callbackFn<SearchPipeline_Get.Response>): TransportRequestCallback;
     get (params: SearchPipeline_Get.Request, options: TransportRequestOptions, callback: callbackFn<SearchPipeline_Get.Response>): TransportRequestCallback;
 
-    delete (params: SearchPipeline_Delete.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<SearchPipeline_Delete.Response>>;
+    delete (params: SearchPipeline_Delete.Request, options?: TransportRequestOptions): TransportRequestPromise<SearchPipeline_Delete.Response>;
     delete (params: SearchPipeline_Delete.Request, callback: callbackFn<SearchPipeline_Delete.Response>): TransportRequestCallback;
     delete (params: SearchPipeline_Delete.Request, options: TransportRequestOptions, callback: callbackFn<SearchPipeline_Delete.Response>): TransportRequestCallback;
 
-    put (params: SearchPipeline_Put.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<SearchPipeline_Put.Response>>;
+    put (params: SearchPipeline_Put.Request, options?: TransportRequestOptions): TransportRequestPromise<SearchPipeline_Put.Response>;
     put (params: SearchPipeline_Put.Request, callback: callbackFn<SearchPipeline_Put.Response>): TransportRequestCallback;
     put (params: SearchPipeline_Put.Request, options: TransportRequestOptions, callback: callbackFn<SearchPipeline_Put.Response>): TransportRequestCallback;
 
   };
 
   security: {
-    getSslinfo (params?: Security_GetSslinfo.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GetSslinfo.Response>>;
+    getSslinfo (params?: Security_GetSslinfo.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GetSslinfo.Response>;
     getSslinfo (callback: callbackFn<Security_GetSslinfo.Response>): TransportRequestCallback;
     getSslinfo (params: Security_GetSslinfo.Request, callback: callbackFn<Security_GetSslinfo.Response>): TransportRequestCallback;
     getSslinfo (params: Security_GetSslinfo.Request, options: TransportRequestOptions, callback: callbackFn<Security_GetSslinfo.Response>): TransportRequestCallback;
 
-    configUpgradeCheck (params?: Security_ConfigUpgradeCheck.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_ConfigUpgradeCheck.Response>>;
+    configUpgradeCheck (params?: Security_ConfigUpgradeCheck.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_ConfigUpgradeCheck.Response>;
     configUpgradeCheck (callback: callbackFn<Security_ConfigUpgradeCheck.Response>): TransportRequestCallback;
     configUpgradeCheck (params: Security_ConfigUpgradeCheck.Request, callback: callbackFn<Security_ConfigUpgradeCheck.Response>): TransportRequestCallback;
     configUpgradeCheck (params: Security_ConfigUpgradeCheck.Request, options: TransportRequestOptions, callback: callbackFn<Security_ConfigUpgradeCheck.Response>): TransportRequestCallback;
 
-    configUpgradePerform (params?: Security_ConfigUpgradePerform.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_ConfigUpgradePerform.Response>>;
+    configUpgradePerform (params?: Security_ConfigUpgradePerform.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_ConfigUpgradePerform.Response>;
     configUpgradePerform (callback: callbackFn<Security_ConfigUpgradePerform.Response>): TransportRequestCallback;
     configUpgradePerform (params: Security_ConfigUpgradePerform.Request, callback: callbackFn<Security_ConfigUpgradePerform.Response>): TransportRequestCallback;
     configUpgradePerform (params: Security_ConfigUpgradePerform.Request, options: TransportRequestOptions, callback: callbackFn<Security_ConfigUpgradePerform.Response>): TransportRequestCallback;
 
-    getAccountDetails (params?: Security_GetAccountDetails.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GetAccountDetails.Response>>;
+    getAccountDetails (params?: Security_GetAccountDetails.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GetAccountDetails.Response>;
     getAccountDetails (callback: callbackFn<Security_GetAccountDetails.Response>): TransportRequestCallback;
     getAccountDetails (params: Security_GetAccountDetails.Request, callback: callbackFn<Security_GetAccountDetails.Response>): TransportRequestCallback;
     getAccountDetails (params: Security_GetAccountDetails.Request, options: TransportRequestOptions, callback: callbackFn<Security_GetAccountDetails.Response>): TransportRequestCallback;
 
-    changePassword (params: Security_ChangePassword.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_ChangePassword.Response>>;
+    changePassword (params: Security_ChangePassword.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_ChangePassword.Response>;
     changePassword (params: Security_ChangePassword.Request, callback: callbackFn<Security_ChangePassword.Response>): TransportRequestCallback;
     changePassword (params: Security_ChangePassword.Request, options: TransportRequestOptions, callback: callbackFn<Security_ChangePassword.Response>): TransportRequestCallback;
 
-    getActionGroups (params?: Security_GetActionGroups.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GetActionGroups.Response>>;
+    getActionGroups (params?: Security_GetActionGroups.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GetActionGroups.Response>;
     getActionGroups (callback: callbackFn<Security_GetActionGroups.Response>): TransportRequestCallback;
     getActionGroups (params: Security_GetActionGroups.Request, callback: callbackFn<Security_GetActionGroups.Response>): TransportRequestCallback;
     getActionGroups (params: Security_GetActionGroups.Request, options: TransportRequestOptions, callback: callbackFn<Security_GetActionGroups.Response>): TransportRequestCallback;
 
-    patchActionGroups (params: Security_PatchActionGroups.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_PatchActionGroups.Response>>;
+    patchActionGroups (params: Security_PatchActionGroups.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_PatchActionGroups.Response>;
     patchActionGroups (params: Security_PatchActionGroups.Request, callback: callbackFn<Security_PatchActionGroups.Response>): TransportRequestCallback;
     patchActionGroups (params: Security_PatchActionGroups.Request, options: TransportRequestOptions, callback: callbackFn<Security_PatchActionGroups.Response>): TransportRequestCallback;
 
-    deleteActionGroup (params: Security_DeleteActionGroup.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_DeleteActionGroup.Response>>;
+    deleteActionGroup (params: Security_DeleteActionGroup.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_DeleteActionGroup.Response>;
     deleteActionGroup (params: Security_DeleteActionGroup.Request, callback: callbackFn<Security_DeleteActionGroup.Response>): TransportRequestCallback;
     deleteActionGroup (params: Security_DeleteActionGroup.Request, options: TransportRequestOptions, callback: callbackFn<Security_DeleteActionGroup.Response>): TransportRequestCallback;
 
-    getActionGroup (params: Security_GetActionGroup.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GetActionGroup.Response>>;
+    getActionGroup (params: Security_GetActionGroup.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GetActionGroup.Response>;
     getActionGroup (params: Security_GetActionGroup.Request, callback: callbackFn<Security_GetActionGroup.Response>): TransportRequestCallback;
     getActionGroup (params: Security_GetActionGroup.Request, options: TransportRequestOptions, callback: callbackFn<Security_GetActionGroup.Response>): TransportRequestCallback;
 
-    patchActionGroup (params: Security_PatchActionGroup.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_PatchActionGroup.Response>>;
+    patchActionGroup (params: Security_PatchActionGroup.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_PatchActionGroup.Response>;
     patchActionGroup (params: Security_PatchActionGroup.Request, callback: callbackFn<Security_PatchActionGroup.Response>): TransportRequestCallback;
     patchActionGroup (params: Security_PatchActionGroup.Request, options: TransportRequestOptions, callback: callbackFn<Security_PatchActionGroup.Response>): TransportRequestCallback;
 
-    createActionGroup (params: Security_CreateActionGroup.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_CreateActionGroup.Response>>;
+    createActionGroup (params: Security_CreateActionGroup.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_CreateActionGroup.Response>;
     createActionGroup (params: Security_CreateActionGroup.Request, callback: callbackFn<Security_CreateActionGroup.Response>): TransportRequestCallback;
     createActionGroup (params: Security_CreateActionGroup.Request, options: TransportRequestOptions, callback: callbackFn<Security_CreateActionGroup.Response>): TransportRequestCallback;
 
-    getAllowlist (params?: Security_GetAllowlist.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GetAllowlist.Response>>;
+    getAllowlist (params?: Security_GetAllowlist.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GetAllowlist.Response>;
     getAllowlist (callback: callbackFn<Security_GetAllowlist.Response>): TransportRequestCallback;
     getAllowlist (params: Security_GetAllowlist.Request, callback: callbackFn<Security_GetAllowlist.Response>): TransportRequestCallback;
     getAllowlist (params: Security_GetAllowlist.Request, options: TransportRequestOptions, callback: callbackFn<Security_GetAllowlist.Response>): TransportRequestCallback;
 
-    patchAllowlist (params: Security_PatchAllowlist.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_PatchAllowlist.Response>>;
+    patchAllowlist (params: Security_PatchAllowlist.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_PatchAllowlist.Response>;
     patchAllowlist (params: Security_PatchAllowlist.Request, callback: callbackFn<Security_PatchAllowlist.Response>): TransportRequestCallback;
     patchAllowlist (params: Security_PatchAllowlist.Request, options: TransportRequestOptions, callback: callbackFn<Security_PatchAllowlist.Response>): TransportRequestCallback;
 
-    createAllowlist (params: Security_CreateAllowlist.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_CreateAllowlist.Response>>;
+    createAllowlist (params: Security_CreateAllowlist.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_CreateAllowlist.Response>;
     createAllowlist (params: Security_CreateAllowlist.Request, callback: callbackFn<Security_CreateAllowlist.Response>): TransportRequestCallback;
     createAllowlist (params: Security_CreateAllowlist.Request, options: TransportRequestOptions, callback: callbackFn<Security_CreateAllowlist.Response>): TransportRequestCallback;
 
-    getAuditConfiguration (params?: Security_GetAuditConfiguration.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GetAuditConfiguration.Response>>;
+    getAuditConfiguration (params?: Security_GetAuditConfiguration.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GetAuditConfiguration.Response>;
     getAuditConfiguration (callback: callbackFn<Security_GetAuditConfiguration.Response>): TransportRequestCallback;
     getAuditConfiguration (params: Security_GetAuditConfiguration.Request, callback: callbackFn<Security_GetAuditConfiguration.Response>): TransportRequestCallback;
     getAuditConfiguration (params: Security_GetAuditConfiguration.Request, options: TransportRequestOptions, callback: callbackFn<Security_GetAuditConfiguration.Response>): TransportRequestCallback;
 
-    patchAuditConfiguration (params: Security_PatchAuditConfiguration.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_PatchAuditConfiguration.Response>>;
+    patchAuditConfiguration (params: Security_PatchAuditConfiguration.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_PatchAuditConfiguration.Response>;
     patchAuditConfiguration (params: Security_PatchAuditConfiguration.Request, callback: callbackFn<Security_PatchAuditConfiguration.Response>): TransportRequestCallback;
     patchAuditConfiguration (params: Security_PatchAuditConfiguration.Request, options: TransportRequestOptions, callback: callbackFn<Security_PatchAuditConfiguration.Response>): TransportRequestCallback;
 
-    updateAuditConfiguration (params: Security_UpdateAuditConfiguration.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_UpdateAuditConfiguration.Response>>;
+    updateAuditConfiguration (params: Security_UpdateAuditConfiguration.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_UpdateAuditConfiguration.Response>;
     updateAuditConfiguration (params: Security_UpdateAuditConfiguration.Request, callback: callbackFn<Security_UpdateAuditConfiguration.Response>): TransportRequestCallback;
     updateAuditConfiguration (params: Security_UpdateAuditConfiguration.Request, options: TransportRequestOptions, callback: callbackFn<Security_UpdateAuditConfiguration.Response>): TransportRequestCallback;
 
-    authtoken (params?: Security_Authtoken.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_Authtoken.Response>>;
+    authtoken (params?: Security_Authtoken.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_Authtoken.Response>;
     authtoken (callback: callbackFn<Security_Authtoken.Response>): TransportRequestCallback;
     authtoken (params: Security_Authtoken.Request, callback: callbackFn<Security_Authtoken.Response>): TransportRequestCallback;
     authtoken (params: Security_Authtoken.Request, options: TransportRequestOptions, callback: callbackFn<Security_Authtoken.Response>): TransportRequestCallback;
 
-    flushCache (params?: Security_FlushCache.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_FlushCache.Response>>;
+    flushCache (params?: Security_FlushCache.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_FlushCache.Response>;
     flushCache (callback: callbackFn<Security_FlushCache.Response>): TransportRequestCallback;
     flushCache (params: Security_FlushCache.Request, callback: callbackFn<Security_FlushCache.Response>): TransportRequestCallback;
     flushCache (params: Security_FlushCache.Request, options: TransportRequestOptions, callback: callbackFn<Security_FlushCache.Response>): TransportRequestCallback;
 
-    generateOboToken (params: Security_GenerateOboToken.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GenerateOboToken.Response>>;
+    generateOboToken (params: Security_GenerateOboToken.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GenerateOboToken.Response>;
     generateOboToken (params: Security_GenerateOboToken.Request, callback: callbackFn<Security_GenerateOboToken.Response>): TransportRequestCallback;
     generateOboToken (params: Security_GenerateOboToken.Request, options: TransportRequestOptions, callback: callbackFn<Security_GenerateOboToken.Response>): TransportRequestCallback;
 
-    getUsers (params?: Security_GetUsers.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GetUsers.Response>>;
+    getUsers (params?: Security_GetUsers.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GetUsers.Response>;
     getUsers (callback: callbackFn<Security_GetUsers.Response>): TransportRequestCallback;
     getUsers (params: Security_GetUsers.Request, callback: callbackFn<Security_GetUsers.Response>): TransportRequestCallback;
     getUsers (params: Security_GetUsers.Request, options: TransportRequestOptions, callback: callbackFn<Security_GetUsers.Response>): TransportRequestCallback;
 
-    patchUsers (params: Security_PatchUsers.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_PatchUsers.Response>>;
+    patchUsers (params: Security_PatchUsers.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_PatchUsers.Response>;
     patchUsers (params: Security_PatchUsers.Request, callback: callbackFn<Security_PatchUsers.Response>): TransportRequestCallback;
     patchUsers (params: Security_PatchUsers.Request, options: TransportRequestOptions, callback: callbackFn<Security_PatchUsers.Response>): TransportRequestCallback;
 
-    deleteUser (params: Security_DeleteUser.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_DeleteUser.Response>>;
+    deleteUser (params: Security_DeleteUser.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_DeleteUser.Response>;
     deleteUser (params: Security_DeleteUser.Request, callback: callbackFn<Security_DeleteUser.Response>): TransportRequestCallback;
     deleteUser (params: Security_DeleteUser.Request, options: TransportRequestOptions, callback: callbackFn<Security_DeleteUser.Response>): TransportRequestCallback;
 
-    getUser (params: Security_GetUser.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GetUser.Response>>;
+    getUser (params: Security_GetUser.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GetUser.Response>;
     getUser (params: Security_GetUser.Request, callback: callbackFn<Security_GetUser.Response>): TransportRequestCallback;
     getUser (params: Security_GetUser.Request, options: TransportRequestOptions, callback: callbackFn<Security_GetUser.Response>): TransportRequestCallback;
 
-    patchUser (params: Security_PatchUser.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_PatchUser.Response>>;
+    patchUser (params: Security_PatchUser.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_PatchUser.Response>;
     patchUser (params: Security_PatchUser.Request, callback: callbackFn<Security_PatchUser.Response>): TransportRequestCallback;
     patchUser (params: Security_PatchUser.Request, options: TransportRequestOptions, callback: callbackFn<Security_PatchUser.Response>): TransportRequestCallback;
 
-    createUser (params: Security_CreateUser.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_CreateUser.Response>>;
+    createUser (params: Security_CreateUser.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_CreateUser.Response>;
     createUser (params: Security_CreateUser.Request, callback: callbackFn<Security_CreateUser.Response>): TransportRequestCallback;
     createUser (params: Security_CreateUser.Request, options: TransportRequestOptions, callback: callbackFn<Security_CreateUser.Response>): TransportRequestCallback;
 
-    generateUserToken (params: Security_GenerateUserToken.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GenerateUserToken.Response>>;
+    generateUserToken (params: Security_GenerateUserToken.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GenerateUserToken.Response>;
     generateUserToken (params: Security_GenerateUserToken.Request, callback: callbackFn<Security_GenerateUserToken.Response>): TransportRequestCallback;
     generateUserToken (params: Security_GenerateUserToken.Request, options: TransportRequestOptions, callback: callbackFn<Security_GenerateUserToken.Response>): TransportRequestCallback;
 
-    migrate (params?: Security_Migrate.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_Migrate.Response>>;
+    migrate (params?: Security_Migrate.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_Migrate.Response>;
     migrate (callback: callbackFn<Security_Migrate.Response>): TransportRequestCallback;
     migrate (params: Security_Migrate.Request, callback: callbackFn<Security_Migrate.Response>): TransportRequestCallback;
     migrate (params: Security_Migrate.Request, options: TransportRequestOptions, callback: callbackFn<Security_Migrate.Response>): TransportRequestCallback;
 
-    getDistinguishedNames (params?: Security_GetDistinguishedNames.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GetDistinguishedNames.Response>>;
+    getDistinguishedNames (params?: Security_GetDistinguishedNames.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GetDistinguishedNames.Response>;
     getDistinguishedNames (callback: callbackFn<Security_GetDistinguishedNames.Response>): TransportRequestCallback;
     getDistinguishedNames (params: Security_GetDistinguishedNames.Request, callback: callbackFn<Security_GetDistinguishedNames.Response>): TransportRequestCallback;
     getDistinguishedNames (params: Security_GetDistinguishedNames.Request, options: TransportRequestOptions, callback: callbackFn<Security_GetDistinguishedNames.Response>): TransportRequestCallback;
 
-    patchDistinguishedNames (params: Security_PatchDistinguishedNames.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_PatchDistinguishedNames.Response>>;
+    patchDistinguishedNames (params: Security_PatchDistinguishedNames.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_PatchDistinguishedNames.Response>;
     patchDistinguishedNames (params: Security_PatchDistinguishedNames.Request, callback: callbackFn<Security_PatchDistinguishedNames.Response>): TransportRequestCallback;
     patchDistinguishedNames (params: Security_PatchDistinguishedNames.Request, options: TransportRequestOptions, callback: callbackFn<Security_PatchDistinguishedNames.Response>): TransportRequestCallback;
 
-    deleteDistinguishedName (params: Security_DeleteDistinguishedName.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_DeleteDistinguishedName.Response>>;
+    deleteDistinguishedName (params: Security_DeleteDistinguishedName.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_DeleteDistinguishedName.Response>;
     deleteDistinguishedName (params: Security_DeleteDistinguishedName.Request, callback: callbackFn<Security_DeleteDistinguishedName.Response>): TransportRequestCallback;
     deleteDistinguishedName (params: Security_DeleteDistinguishedName.Request, options: TransportRequestOptions, callback: callbackFn<Security_DeleteDistinguishedName.Response>): TransportRequestCallback;
 
-    getDistinguishedName (params: Security_GetDistinguishedName.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GetDistinguishedName.Response>>;
+    getDistinguishedName (params: Security_GetDistinguishedName.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GetDistinguishedName.Response>;
     getDistinguishedName (params: Security_GetDistinguishedName.Request, callback: callbackFn<Security_GetDistinguishedName.Response>): TransportRequestCallback;
     getDistinguishedName (params: Security_GetDistinguishedName.Request, options: TransportRequestOptions, callback: callbackFn<Security_GetDistinguishedName.Response>): TransportRequestCallback;
 
-    patchDistinguishedName (params: Security_PatchDistinguishedName.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_PatchDistinguishedName.Response>>;
+    patchDistinguishedName (params: Security_PatchDistinguishedName.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_PatchDistinguishedName.Response>;
     patchDistinguishedName (params: Security_PatchDistinguishedName.Request, callback: callbackFn<Security_PatchDistinguishedName.Response>): TransportRequestCallback;
     patchDistinguishedName (params: Security_PatchDistinguishedName.Request, options: TransportRequestOptions, callback: callbackFn<Security_PatchDistinguishedName.Response>): TransportRequestCallback;
 
-    updateDistinguishedName (params: Security_UpdateDistinguishedName.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_UpdateDistinguishedName.Response>>;
+    updateDistinguishedName (params: Security_UpdateDistinguishedName.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_UpdateDistinguishedName.Response>;
     updateDistinguishedName (params: Security_UpdateDistinguishedName.Request, callback: callbackFn<Security_UpdateDistinguishedName.Response>): TransportRequestCallback;
     updateDistinguishedName (params: Security_UpdateDistinguishedName.Request, options: TransportRequestOptions, callback: callbackFn<Security_UpdateDistinguishedName.Response>): TransportRequestCallback;
 
-    getPermissionsInfo (params?: Security_GetPermissionsInfo.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GetPermissionsInfo.Response>>;
+    getPermissionsInfo (params?: Security_GetPermissionsInfo.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GetPermissionsInfo.Response>;
     getPermissionsInfo (callback: callbackFn<Security_GetPermissionsInfo.Response>): TransportRequestCallback;
     getPermissionsInfo (params: Security_GetPermissionsInfo.Request, callback: callbackFn<Security_GetPermissionsInfo.Response>): TransportRequestCallback;
     getPermissionsInfo (params: Security_GetPermissionsInfo.Request, options: TransportRequestOptions, callback: callbackFn<Security_GetPermissionsInfo.Response>): TransportRequestCallback;
 
-    getRoles (params?: Security_GetRoles.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GetRoles.Response>>;
+    getRoles (params?: Security_GetRoles.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GetRoles.Response>;
     getRoles (callback: callbackFn<Security_GetRoles.Response>): TransportRequestCallback;
     getRoles (params: Security_GetRoles.Request, callback: callbackFn<Security_GetRoles.Response>): TransportRequestCallback;
     getRoles (params: Security_GetRoles.Request, options: TransportRequestOptions, callback: callbackFn<Security_GetRoles.Response>): TransportRequestCallback;
 
-    patchRoles (params: Security_PatchRoles.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_PatchRoles.Response>>;
+    patchRoles (params: Security_PatchRoles.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_PatchRoles.Response>;
     patchRoles (params: Security_PatchRoles.Request, callback: callbackFn<Security_PatchRoles.Response>): TransportRequestCallback;
     patchRoles (params: Security_PatchRoles.Request, options: TransportRequestOptions, callback: callbackFn<Security_PatchRoles.Response>): TransportRequestCallback;
 
-    deleteRole (params: Security_DeleteRole.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_DeleteRole.Response>>;
+    deleteRole (params: Security_DeleteRole.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_DeleteRole.Response>;
     deleteRole (params: Security_DeleteRole.Request, callback: callbackFn<Security_DeleteRole.Response>): TransportRequestCallback;
     deleteRole (params: Security_DeleteRole.Request, options: TransportRequestOptions, callback: callbackFn<Security_DeleteRole.Response>): TransportRequestCallback;
 
-    getRole (params: Security_GetRole.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GetRole.Response>>;
+    getRole (params: Security_GetRole.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GetRole.Response>;
     getRole (params: Security_GetRole.Request, callback: callbackFn<Security_GetRole.Response>): TransportRequestCallback;
     getRole (params: Security_GetRole.Request, options: TransportRequestOptions, callback: callbackFn<Security_GetRole.Response>): TransportRequestCallback;
 
-    patchRole (params: Security_PatchRole.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_PatchRole.Response>>;
+    patchRole (params: Security_PatchRole.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_PatchRole.Response>;
     patchRole (params: Security_PatchRole.Request, callback: callbackFn<Security_PatchRole.Response>): TransportRequestCallback;
     patchRole (params: Security_PatchRole.Request, options: TransportRequestOptions, callback: callbackFn<Security_PatchRole.Response>): TransportRequestCallback;
 
-    createRole (params: Security_CreateRole.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_CreateRole.Response>>;
+    createRole (params: Security_CreateRole.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_CreateRole.Response>;
     createRole (params: Security_CreateRole.Request, callback: callbackFn<Security_CreateRole.Response>): TransportRequestCallback;
     createRole (params: Security_CreateRole.Request, options: TransportRequestOptions, callback: callbackFn<Security_CreateRole.Response>): TransportRequestCallback;
 
-    getRoleMappings (params?: Security_GetRoleMappings.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GetRoleMappings.Response>>;
+    getRoleMappings (params?: Security_GetRoleMappings.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GetRoleMappings.Response>;
     getRoleMappings (callback: callbackFn<Security_GetRoleMappings.Response>): TransportRequestCallback;
     getRoleMappings (params: Security_GetRoleMappings.Request, callback: callbackFn<Security_GetRoleMappings.Response>): TransportRequestCallback;
     getRoleMappings (params: Security_GetRoleMappings.Request, options: TransportRequestOptions, callback: callbackFn<Security_GetRoleMappings.Response>): TransportRequestCallback;
 
-    patchRoleMappings (params: Security_PatchRoleMappings.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_PatchRoleMappings.Response>>;
+    patchRoleMappings (params: Security_PatchRoleMappings.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_PatchRoleMappings.Response>;
     patchRoleMappings (params: Security_PatchRoleMappings.Request, callback: callbackFn<Security_PatchRoleMappings.Response>): TransportRequestCallback;
     patchRoleMappings (params: Security_PatchRoleMappings.Request, options: TransportRequestOptions, callback: callbackFn<Security_PatchRoleMappings.Response>): TransportRequestCallback;
 
-    deleteRoleMapping (params: Security_DeleteRoleMapping.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_DeleteRoleMapping.Response>>;
+    deleteRoleMapping (params: Security_DeleteRoleMapping.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_DeleteRoleMapping.Response>;
     deleteRoleMapping (params: Security_DeleteRoleMapping.Request, callback: callbackFn<Security_DeleteRoleMapping.Response>): TransportRequestCallback;
     deleteRoleMapping (params: Security_DeleteRoleMapping.Request, options: TransportRequestOptions, callback: callbackFn<Security_DeleteRoleMapping.Response>): TransportRequestCallback;
 
-    getRoleMapping (params: Security_GetRoleMapping.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GetRoleMapping.Response>>;
+    getRoleMapping (params: Security_GetRoleMapping.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GetRoleMapping.Response>;
     getRoleMapping (params: Security_GetRoleMapping.Request, callback: callbackFn<Security_GetRoleMapping.Response>): TransportRequestCallback;
     getRoleMapping (params: Security_GetRoleMapping.Request, options: TransportRequestOptions, callback: callbackFn<Security_GetRoleMapping.Response>): TransportRequestCallback;
 
-    patchRoleMapping (params: Security_PatchRoleMapping.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_PatchRoleMapping.Response>>;
+    patchRoleMapping (params: Security_PatchRoleMapping.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_PatchRoleMapping.Response>;
     patchRoleMapping (params: Security_PatchRoleMapping.Request, callback: callbackFn<Security_PatchRoleMapping.Response>): TransportRequestCallback;
     patchRoleMapping (params: Security_PatchRoleMapping.Request, options: TransportRequestOptions, callback: callbackFn<Security_PatchRoleMapping.Response>): TransportRequestCallback;
 
-    createRoleMapping (params: Security_CreateRoleMapping.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_CreateRoleMapping.Response>>;
+    createRoleMapping (params: Security_CreateRoleMapping.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_CreateRoleMapping.Response>;
     createRoleMapping (params: Security_CreateRoleMapping.Request, callback: callbackFn<Security_CreateRoleMapping.Response>): TransportRequestCallback;
     createRoleMapping (params: Security_CreateRoleMapping.Request, options: TransportRequestOptions, callback: callbackFn<Security_CreateRoleMapping.Response>): TransportRequestCallback;
 
-    getConfiguration (params?: Security_GetConfiguration.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GetConfiguration.Response>>;
+    getConfiguration (params?: Security_GetConfiguration.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GetConfiguration.Response>;
     getConfiguration (callback: callbackFn<Security_GetConfiguration.Response>): TransportRequestCallback;
     getConfiguration (params: Security_GetConfiguration.Request, callback: callbackFn<Security_GetConfiguration.Response>): TransportRequestCallback;
     getConfiguration (params: Security_GetConfiguration.Request, options: TransportRequestOptions, callback: callbackFn<Security_GetConfiguration.Response>): TransportRequestCallback;
 
-    patchConfiguration (params: Security_PatchConfiguration.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_PatchConfiguration.Response>>;
+    patchConfiguration (params: Security_PatchConfiguration.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_PatchConfiguration.Response>;
     patchConfiguration (params: Security_PatchConfiguration.Request, callback: callbackFn<Security_PatchConfiguration.Response>): TransportRequestCallback;
     patchConfiguration (params: Security_PatchConfiguration.Request, options: TransportRequestOptions, callback: callbackFn<Security_PatchConfiguration.Response>): TransportRequestCallback;
 
-    updateConfiguration (params: Security_UpdateConfiguration.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_UpdateConfiguration.Response>>;
+    updateConfiguration (params: Security_UpdateConfiguration.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_UpdateConfiguration.Response>;
     updateConfiguration (params: Security_UpdateConfiguration.Request, callback: callbackFn<Security_UpdateConfiguration.Response>): TransportRequestCallback;
     updateConfiguration (params: Security_UpdateConfiguration.Request, options: TransportRequestOptions, callback: callbackFn<Security_UpdateConfiguration.Response>): TransportRequestCallback;
 
-    getCertificates (params?: Security_GetCertificates.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GetCertificates.Response>>;
+    getCertificates (params?: Security_GetCertificates.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GetCertificates.Response>;
     getCertificates (callback: callbackFn<Security_GetCertificates.Response>): TransportRequestCallback;
     getCertificates (params: Security_GetCertificates.Request, callback: callbackFn<Security_GetCertificates.Response>): TransportRequestCallback;
     getCertificates (params: Security_GetCertificates.Request, options: TransportRequestOptions, callback: callbackFn<Security_GetCertificates.Response>): TransportRequestCallback;
 
-    reloadHttpCertificates (params?: Security_ReloadHttpCertificates.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_ReloadHttpCertificates.Response>>;
+    reloadHttpCertificates (params?: Security_ReloadHttpCertificates.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_ReloadHttpCertificates.Response>;
     reloadHttpCertificates (callback: callbackFn<Security_ReloadHttpCertificates.Response>): TransportRequestCallback;
     reloadHttpCertificates (params: Security_ReloadHttpCertificates.Request, callback: callbackFn<Security_ReloadHttpCertificates.Response>): TransportRequestCallback;
     reloadHttpCertificates (params: Security_ReloadHttpCertificates.Request, options: TransportRequestOptions, callback: callbackFn<Security_ReloadHttpCertificates.Response>): TransportRequestCallback;
 
-    reloadTransportCertificates (params?: Security_ReloadTransportCertificates.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_ReloadTransportCertificates.Response>>;
+    reloadTransportCertificates (params?: Security_ReloadTransportCertificates.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_ReloadTransportCertificates.Response>;
     reloadTransportCertificates (callback: callbackFn<Security_ReloadTransportCertificates.Response>): TransportRequestCallback;
     reloadTransportCertificates (params: Security_ReloadTransportCertificates.Request, callback: callbackFn<Security_ReloadTransportCertificates.Response>): TransportRequestCallback;
     reloadTransportCertificates (params: Security_ReloadTransportCertificates.Request, options: TransportRequestOptions, callback: callbackFn<Security_ReloadTransportCertificates.Response>): TransportRequestCallback;
 
-    getTenancyConfig (params?: Security_GetTenancyConfig.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GetTenancyConfig.Response>>;
+    getTenancyConfig (params?: Security_GetTenancyConfig.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GetTenancyConfig.Response>;
     getTenancyConfig (callback: callbackFn<Security_GetTenancyConfig.Response>): TransportRequestCallback;
     getTenancyConfig (params: Security_GetTenancyConfig.Request, callback: callbackFn<Security_GetTenancyConfig.Response>): TransportRequestCallback;
     getTenancyConfig (params: Security_GetTenancyConfig.Request, options: TransportRequestOptions, callback: callbackFn<Security_GetTenancyConfig.Response>): TransportRequestCallback;
 
-    createUpdateTenancyConfig (params: Security_CreateUpdateTenancyConfig.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_CreateUpdateTenancyConfig.Response>>;
+    createUpdateTenancyConfig (params: Security_CreateUpdateTenancyConfig.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_CreateUpdateTenancyConfig.Response>;
     createUpdateTenancyConfig (params: Security_CreateUpdateTenancyConfig.Request, callback: callbackFn<Security_CreateUpdateTenancyConfig.Response>): TransportRequestCallback;
     createUpdateTenancyConfig (params: Security_CreateUpdateTenancyConfig.Request, options: TransportRequestOptions, callback: callbackFn<Security_CreateUpdateTenancyConfig.Response>): TransportRequestCallback;
 
-    getTenants (params?: Security_GetTenants.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GetTenants.Response>>;
+    getTenants (params?: Security_GetTenants.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GetTenants.Response>;
     getTenants (callback: callbackFn<Security_GetTenants.Response>): TransportRequestCallback;
     getTenants (params: Security_GetTenants.Request, callback: callbackFn<Security_GetTenants.Response>): TransportRequestCallback;
     getTenants (params: Security_GetTenants.Request, options: TransportRequestOptions, callback: callbackFn<Security_GetTenants.Response>): TransportRequestCallback;
 
-    patchTenants (params: Security_PatchTenants.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_PatchTenants.Response>>;
+    patchTenants (params: Security_PatchTenants.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_PatchTenants.Response>;
     patchTenants (params: Security_PatchTenants.Request, callback: callbackFn<Security_PatchTenants.Response>): TransportRequestCallback;
     patchTenants (params: Security_PatchTenants.Request, options: TransportRequestOptions, callback: callbackFn<Security_PatchTenants.Response>): TransportRequestCallback;
 
-    deleteTenant (params: Security_DeleteTenant.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_DeleteTenant.Response>>;
+    deleteTenant (params: Security_DeleteTenant.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_DeleteTenant.Response>;
     deleteTenant (params: Security_DeleteTenant.Request, callback: callbackFn<Security_DeleteTenant.Response>): TransportRequestCallback;
     deleteTenant (params: Security_DeleteTenant.Request, options: TransportRequestOptions, callback: callbackFn<Security_DeleteTenant.Response>): TransportRequestCallback;
 
-    getTenant (params: Security_GetTenant.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GetTenant.Response>>;
+    getTenant (params: Security_GetTenant.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GetTenant.Response>;
     getTenant (params: Security_GetTenant.Request, callback: callbackFn<Security_GetTenant.Response>): TransportRequestCallback;
     getTenant (params: Security_GetTenant.Request, options: TransportRequestOptions, callback: callbackFn<Security_GetTenant.Response>): TransportRequestCallback;
 
-    patchTenant (params: Security_PatchTenant.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_PatchTenant.Response>>;
+    patchTenant (params: Security_PatchTenant.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_PatchTenant.Response>;
     patchTenant (params: Security_PatchTenant.Request, callback: callbackFn<Security_PatchTenant.Response>): TransportRequestCallback;
     patchTenant (params: Security_PatchTenant.Request, options: TransportRequestOptions, callback: callbackFn<Security_PatchTenant.Response>): TransportRequestCallback;
 
-    createTenant (params: Security_CreateTenant.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_CreateTenant.Response>>;
+    createTenant (params: Security_CreateTenant.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_CreateTenant.Response>;
     createTenant (params: Security_CreateTenant.Request, callback: callbackFn<Security_CreateTenant.Response>): TransportRequestCallback;
     createTenant (params: Security_CreateTenant.Request, options: TransportRequestOptions, callback: callbackFn<Security_CreateTenant.Response>): TransportRequestCallback;
 
-    getUsersLegacy (params?: Security_GetUsersLegacy.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GetUsersLegacy.Response>>;
+    getUsersLegacy (params?: Security_GetUsersLegacy.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GetUsersLegacy.Response>;
     getUsersLegacy (callback: callbackFn<Security_GetUsersLegacy.Response>): TransportRequestCallback;
     getUsersLegacy (params: Security_GetUsersLegacy.Request, callback: callbackFn<Security_GetUsersLegacy.Response>): TransportRequestCallback;
     getUsersLegacy (params: Security_GetUsersLegacy.Request, options: TransportRequestOptions, callback: callbackFn<Security_GetUsersLegacy.Response>): TransportRequestCallback;
 
-    deleteUserLegacy (params: Security_DeleteUserLegacy.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_DeleteUserLegacy.Response>>;
+    deleteUserLegacy (params: Security_DeleteUserLegacy.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_DeleteUserLegacy.Response>;
     deleteUserLegacy (params: Security_DeleteUserLegacy.Request, callback: callbackFn<Security_DeleteUserLegacy.Response>): TransportRequestCallback;
     deleteUserLegacy (params: Security_DeleteUserLegacy.Request, options: TransportRequestOptions, callback: callbackFn<Security_DeleteUserLegacy.Response>): TransportRequestCallback;
 
-    getUserLegacy (params: Security_GetUserLegacy.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GetUserLegacy.Response>>;
+    getUserLegacy (params: Security_GetUserLegacy.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GetUserLegacy.Response>;
     getUserLegacy (params: Security_GetUserLegacy.Request, callback: callbackFn<Security_GetUserLegacy.Response>): TransportRequestCallback;
     getUserLegacy (params: Security_GetUserLegacy.Request, options: TransportRequestOptions, callback: callbackFn<Security_GetUserLegacy.Response>): TransportRequestCallback;
 
-    createUserLegacy (params: Security_CreateUserLegacy.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_CreateUserLegacy.Response>>;
+    createUserLegacy (params: Security_CreateUserLegacy.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_CreateUserLegacy.Response>;
     createUserLegacy (params: Security_CreateUserLegacy.Request, callback: callbackFn<Security_CreateUserLegacy.Response>): TransportRequestCallback;
     createUserLegacy (params: Security_CreateUserLegacy.Request, options: TransportRequestOptions, callback: callbackFn<Security_CreateUserLegacy.Response>): TransportRequestCallback;
 
-    generateUserTokenLegacy (params: Security_GenerateUserTokenLegacy.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GenerateUserTokenLegacy.Response>>;
+    generateUserTokenLegacy (params: Security_GenerateUserTokenLegacy.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GenerateUserTokenLegacy.Response>;
     generateUserTokenLegacy (params: Security_GenerateUserTokenLegacy.Request, callback: callbackFn<Security_GenerateUserTokenLegacy.Response>): TransportRequestCallback;
     generateUserTokenLegacy (params: Security_GenerateUserTokenLegacy.Request, options: TransportRequestOptions, callback: callbackFn<Security_GenerateUserTokenLegacy.Response>): TransportRequestCallback;
 
-    validate (params?: Security_Validate.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_Validate.Response>>;
+    validate (params?: Security_Validate.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_Validate.Response>;
     validate (callback: callbackFn<Security_Validate.Response>): TransportRequestCallback;
     validate (params: Security_Validate.Request, callback: callbackFn<Security_Validate.Response>): TransportRequestCallback;
     validate (params: Security_Validate.Request, options: TransportRequestOptions, callback: callbackFn<Security_Validate.Response>): TransportRequestCallback;
 
-    authinfo (params?: Security_Authinfo.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_Authinfo.Response>>;
+    authinfo (params?: Security_Authinfo.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_Authinfo.Response>;
     authinfo (callback: callbackFn<Security_Authinfo.Response>): TransportRequestCallback;
     authinfo (params: Security_Authinfo.Request, callback: callbackFn<Security_Authinfo.Response>): TransportRequestCallback;
     authinfo (params: Security_Authinfo.Request, options: TransportRequestOptions, callback: callbackFn<Security_Authinfo.Response>): TransportRequestCallback;
 
-    getDashboardsInfo (params?: Security_GetDashboardsInfo.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_GetDashboardsInfo.Response>>;
+    getDashboardsInfo (params?: Security_GetDashboardsInfo.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_GetDashboardsInfo.Response>;
     getDashboardsInfo (callback: callbackFn<Security_GetDashboardsInfo.Response>): TransportRequestCallback;
     getDashboardsInfo (params: Security_GetDashboardsInfo.Request, callback: callbackFn<Security_GetDashboardsInfo.Response>): TransportRequestCallback;
     getDashboardsInfo (params: Security_GetDashboardsInfo.Request, options: TransportRequestOptions, callback: callbackFn<Security_GetDashboardsInfo.Response>): TransportRequestCallback;
 
-    postDashboardsInfo (params?: Security_PostDashboardsInfo.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_PostDashboardsInfo.Response>>;
+    postDashboardsInfo (params?: Security_PostDashboardsInfo.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_PostDashboardsInfo.Response>;
     postDashboardsInfo (callback: callbackFn<Security_PostDashboardsInfo.Response>): TransportRequestCallback;
     postDashboardsInfo (params: Security_PostDashboardsInfo.Request, callback: callbackFn<Security_PostDashboardsInfo.Response>): TransportRequestCallback;
     postDashboardsInfo (params: Security_PostDashboardsInfo.Request, options: TransportRequestOptions, callback: callbackFn<Security_PostDashboardsInfo.Response>): TransportRequestCallback;
 
-    health (params?: Security_Health.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_Health.Response>>;
+    health (params?: Security_Health.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_Health.Response>;
     health (callback: callbackFn<Security_Health.Response>): TransportRequestCallback;
     health (params: Security_Health.Request, callback: callbackFn<Security_Health.Response>): TransportRequestCallback;
     health (params: Security_Health.Request, options: TransportRequestOptions, callback: callbackFn<Security_Health.Response>): TransportRequestCallback;
 
-    tenantInfo (params?: Security_TenantInfo.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_TenantInfo.Response>>;
+    tenantInfo (params?: Security_TenantInfo.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_TenantInfo.Response>;
     tenantInfo (callback: callbackFn<Security_TenantInfo.Response>): TransportRequestCallback;
     tenantInfo (params: Security_TenantInfo.Request, callback: callbackFn<Security_TenantInfo.Response>): TransportRequestCallback;
     tenantInfo (params: Security_TenantInfo.Request, options: TransportRequestOptions, callback: callbackFn<Security_TenantInfo.Response>): TransportRequestCallback;
 
-    whoAmI (params?: Security_WhoAmI.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_WhoAmI.Response>>;
+    whoAmI (params?: Security_WhoAmI.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_WhoAmI.Response>;
     whoAmI (callback: callbackFn<Security_WhoAmI.Response>): TransportRequestCallback;
     whoAmI (params: Security_WhoAmI.Request, callback: callbackFn<Security_WhoAmI.Response>): TransportRequestCallback;
     whoAmI (params: Security_WhoAmI.Request, options: TransportRequestOptions, callback: callbackFn<Security_WhoAmI.Response>): TransportRequestCallback;
 
-    whoAmIProtected (params?: Security_WhoAmIProtected.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Security_WhoAmIProtected.Response>>;
+    whoAmIProtected (params?: Security_WhoAmIProtected.Request, options?: TransportRequestOptions): TransportRequestPromise<Security_WhoAmIProtected.Response>;
     whoAmIProtected (callback: callbackFn<Security_WhoAmIProtected.Response>): TransportRequestCallback;
     whoAmIProtected (params: Security_WhoAmIProtected.Request, callback: callbackFn<Security_WhoAmIProtected.Response>): TransportRequestCallback;
     whoAmIProtected (params: Security_WhoAmIProtected.Request, options: TransportRequestOptions, callback: callbackFn<Security_WhoAmIProtected.Response>): TransportRequestCallback;
@@ -1360,131 +1358,131 @@ declare class Client {
   };
 
   snapshot: {
-    getRepository (params?: Snapshot_GetRepository.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Snapshot_GetRepository.Response>>;
+    getRepository (params?: Snapshot_GetRepository.Request, options?: TransportRequestOptions): TransportRequestPromise<Snapshot_GetRepository.Response>;
     getRepository (callback: callbackFn<Snapshot_GetRepository.Response>): TransportRequestCallback;
     getRepository (params: Snapshot_GetRepository.Request, callback: callbackFn<Snapshot_GetRepository.Response>): TransportRequestCallback;
     getRepository (params: Snapshot_GetRepository.Request, options: TransportRequestOptions, callback: callbackFn<Snapshot_GetRepository.Response>): TransportRequestCallback;
 
-    status (params?: Snapshot_Status.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Snapshot_Status.Response>>;
+    status (params?: Snapshot_Status.Request, options?: TransportRequestOptions): TransportRequestPromise<Snapshot_Status.Response>;
     status (callback: callbackFn<Snapshot_Status.Response>): TransportRequestCallback;
     status (params: Snapshot_Status.Request, callback: callbackFn<Snapshot_Status.Response>): TransportRequestCallback;
     status (params: Snapshot_Status.Request, options: TransportRequestOptions, callback: callbackFn<Snapshot_Status.Response>): TransportRequestCallback;
 
-    deleteRepository (params: Snapshot_DeleteRepository.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Snapshot_DeleteRepository.Response>>;
+    deleteRepository (params: Snapshot_DeleteRepository.Request, options?: TransportRequestOptions): TransportRequestPromise<Snapshot_DeleteRepository.Response>;
     deleteRepository (params: Snapshot_DeleteRepository.Request, callback: callbackFn<Snapshot_DeleteRepository.Response>): TransportRequestCallback;
     deleteRepository (params: Snapshot_DeleteRepository.Request, options: TransportRequestOptions, callback: callbackFn<Snapshot_DeleteRepository.Response>): TransportRequestCallback;
 
-    createRepository (params: Snapshot_CreateRepository.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Snapshot_CreateRepository.Response>>;
+    createRepository (params: Snapshot_CreateRepository.Request, options?: TransportRequestOptions): TransportRequestPromise<Snapshot_CreateRepository.Response>;
     createRepository (params: Snapshot_CreateRepository.Request, callback: callbackFn<Snapshot_CreateRepository.Response>): TransportRequestCallback;
     createRepository (params: Snapshot_CreateRepository.Request, options: TransportRequestOptions, callback: callbackFn<Snapshot_CreateRepository.Response>): TransportRequestCallback;
 
-    cleanupRepository (params: Snapshot_CleanupRepository.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Snapshot_CleanupRepository.Response>>;
+    cleanupRepository (params: Snapshot_CleanupRepository.Request, options?: TransportRequestOptions): TransportRequestPromise<Snapshot_CleanupRepository.Response>;
     cleanupRepository (params: Snapshot_CleanupRepository.Request, callback: callbackFn<Snapshot_CleanupRepository.Response>): TransportRequestCallback;
     cleanupRepository (params: Snapshot_CleanupRepository.Request, options: TransportRequestOptions, callback: callbackFn<Snapshot_CleanupRepository.Response>): TransportRequestCallback;
 
-    verifyRepository (params: Snapshot_VerifyRepository.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Snapshot_VerifyRepository.Response>>;
+    verifyRepository (params: Snapshot_VerifyRepository.Request, options?: TransportRequestOptions): TransportRequestPromise<Snapshot_VerifyRepository.Response>;
     verifyRepository (params: Snapshot_VerifyRepository.Request, callback: callbackFn<Snapshot_VerifyRepository.Response>): TransportRequestCallback;
     verifyRepository (params: Snapshot_VerifyRepository.Request, options: TransportRequestOptions, callback: callbackFn<Snapshot_VerifyRepository.Response>): TransportRequestCallback;
 
-    delete (params: Snapshot_Delete.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Snapshot_Delete.Response>>;
+    delete (params: Snapshot_Delete.Request, options?: TransportRequestOptions): TransportRequestPromise<Snapshot_Delete.Response>;
     delete (params: Snapshot_Delete.Request, callback: callbackFn<Snapshot_Delete.Response>): TransportRequestCallback;
     delete (params: Snapshot_Delete.Request, options: TransportRequestOptions, callback: callbackFn<Snapshot_Delete.Response>): TransportRequestCallback;
 
-    get (params: Snapshot_Get.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Snapshot_Get.Response>>;
+    get (params: Snapshot_Get.Request, options?: TransportRequestOptions): TransportRequestPromise<Snapshot_Get.Response>;
     get (params: Snapshot_Get.Request, callback: callbackFn<Snapshot_Get.Response>): TransportRequestCallback;
     get (params: Snapshot_Get.Request, options: TransportRequestOptions, callback: callbackFn<Snapshot_Get.Response>): TransportRequestCallback;
 
-    create (params: Snapshot_Create.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Snapshot_Create.Response>>;
+    create (params: Snapshot_Create.Request, options?: TransportRequestOptions): TransportRequestPromise<Snapshot_Create.Response>;
     create (params: Snapshot_Create.Request, callback: callbackFn<Snapshot_Create.Response>): TransportRequestCallback;
     create (params: Snapshot_Create.Request, options: TransportRequestOptions, callback: callbackFn<Snapshot_Create.Response>): TransportRequestCallback;
 
-    clone (params: Snapshot_Clone.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Snapshot_Clone.Response>>;
+    clone (params: Snapshot_Clone.Request, options?: TransportRequestOptions): TransportRequestPromise<Snapshot_Clone.Response>;
     clone (params: Snapshot_Clone.Request, callback: callbackFn<Snapshot_Clone.Response>): TransportRequestCallback;
     clone (params: Snapshot_Clone.Request, options: TransportRequestOptions, callback: callbackFn<Snapshot_Clone.Response>): TransportRequestCallback;
 
-    restore (params: Snapshot_Restore.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Snapshot_Restore.Response>>;
+    restore (params: Snapshot_Restore.Request, options?: TransportRequestOptions): TransportRequestPromise<Snapshot_Restore.Response>;
     restore (params: Snapshot_Restore.Request, callback: callbackFn<Snapshot_Restore.Response>): TransportRequestCallback;
     restore (params: Snapshot_Restore.Request, options: TransportRequestOptions, callback: callbackFn<Snapshot_Restore.Response>): TransportRequestCallback;
 
   };
 
   sql: {
-    settings (params: Sql_Settings.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Sql_Settings.Response>>;
+    settings (params: Sql_Settings.Request, options?: TransportRequestOptions): TransportRequestPromise<Sql_Settings.Response>;
     settings (params: Sql_Settings.Request, callback: callbackFn<Sql_Settings.Response>): TransportRequestCallback;
     settings (params: Sql_Settings.Request, options: TransportRequestOptions, callback: callbackFn<Sql_Settings.Response>): TransportRequestCallback;
 
-    query (params: Sql_Query.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Sql_Query.Response>>;
+    query (params: Sql_Query.Request, options?: TransportRequestOptions): TransportRequestPromise<Sql_Query.Response>;
     query (params: Sql_Query.Request, callback: callbackFn<Sql_Query.Response>): TransportRequestCallback;
     query (params: Sql_Query.Request, options: TransportRequestOptions, callback: callbackFn<Sql_Query.Response>): TransportRequestCallback;
 
-    explain (params: Sql_Explain.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Sql_Explain.Response>>;
+    explain (params: Sql_Explain.Request, options?: TransportRequestOptions): TransportRequestPromise<Sql_Explain.Response>;
     explain (params: Sql_Explain.Request, callback: callbackFn<Sql_Explain.Response>): TransportRequestCallback;
     explain (params: Sql_Explain.Request, options: TransportRequestOptions, callback: callbackFn<Sql_Explain.Response>): TransportRequestCallback;
 
-    close (params: Sql_Close.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Sql_Close.Response>>;
+    close (params: Sql_Close.Request, options?: TransportRequestOptions): TransportRequestPromise<Sql_Close.Response>;
     close (params: Sql_Close.Request, callback: callbackFn<Sql_Close.Response>): TransportRequestCallback;
     close (params: Sql_Close.Request, options: TransportRequestOptions, callback: callbackFn<Sql_Close.Response>): TransportRequestCallback;
 
-    getStats (params?: Sql_GetStats.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Sql_GetStats.Response>>;
+    getStats (params?: Sql_GetStats.Request, options?: TransportRequestOptions): TransportRequestPromise<Sql_GetStats.Response>;
     getStats (callback: callbackFn<Sql_GetStats.Response>): TransportRequestCallback;
     getStats (params: Sql_GetStats.Request, callback: callbackFn<Sql_GetStats.Response>): TransportRequestCallback;
     getStats (params: Sql_GetStats.Request, options: TransportRequestOptions, callback: callbackFn<Sql_GetStats.Response>): TransportRequestCallback;
 
-    postStats (params: Sql_PostStats.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Sql_PostStats.Response>>;
+    postStats (params: Sql_PostStats.Request, options?: TransportRequestOptions): TransportRequestPromise<Sql_PostStats.Response>;
     postStats (params: Sql_PostStats.Request, callback: callbackFn<Sql_PostStats.Response>): TransportRequestCallback;
     postStats (params: Sql_PostStats.Request, options: TransportRequestOptions, callback: callbackFn<Sql_PostStats.Response>): TransportRequestCallback;
 
   };
 
   tasks: {
-    list (params?: Tasks_List.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Tasks_List.Response>>;
+    list (params?: Tasks_List.Request, options?: TransportRequestOptions): TransportRequestPromise<Tasks_List.Response>;
     list (callback: callbackFn<Tasks_List.Response>): TransportRequestCallback;
     list (params: Tasks_List.Request, callback: callbackFn<Tasks_List.Response>): TransportRequestCallback;
     list (params: Tasks_List.Request, options: TransportRequestOptions, callback: callbackFn<Tasks_List.Response>): TransportRequestCallback;
 
-    cancel (params?: Tasks_Cancel.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Tasks_Cancel.Response>>;
+    cancel (params?: Tasks_Cancel.Request, options?: TransportRequestOptions): TransportRequestPromise<Tasks_Cancel.Response>;
     cancel (callback: callbackFn<Tasks_Cancel.Response>): TransportRequestCallback;
     cancel (params: Tasks_Cancel.Request, callback: callbackFn<Tasks_Cancel.Response>): TransportRequestCallback;
     cancel (params: Tasks_Cancel.Request, options: TransportRequestOptions, callback: callbackFn<Tasks_Cancel.Response>): TransportRequestCallback;
 
-    get (params: Tasks_Get.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Tasks_Get.Response>>;
+    get (params: Tasks_Get.Request, options?: TransportRequestOptions): TransportRequestPromise<Tasks_Get.Response>;
     get (params: Tasks_Get.Request, callback: callbackFn<Tasks_Get.Response>): TransportRequestCallback;
     get (params: Tasks_Get.Request, options: TransportRequestOptions, callback: callbackFn<Tasks_Get.Response>): TransportRequestCallback;
 
   };
 
   transforms: {
-    search (params?: Transforms_Search.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Transforms_Search.Response>>;
+    search (params?: Transforms_Search.Request, options?: TransportRequestOptions): TransportRequestPromise<Transforms_Search.Response>;
     search (callback: callbackFn<Transforms_Search.Response>): TransportRequestCallback;
     search (params: Transforms_Search.Request, callback: callbackFn<Transforms_Search.Response>): TransportRequestCallback;
     search (params: Transforms_Search.Request, options: TransportRequestOptions, callback: callbackFn<Transforms_Search.Response>): TransportRequestCallback;
 
-    preview (params?: Transforms_Preview.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Transforms_Preview.Response>>;
+    preview (params?: Transforms_Preview.Request, options?: TransportRequestOptions): TransportRequestPromise<Transforms_Preview.Response>;
     preview (callback: callbackFn<Transforms_Preview.Response>): TransportRequestCallback;
     preview (params: Transforms_Preview.Request, callback: callbackFn<Transforms_Preview.Response>): TransportRequestCallback;
     preview (params: Transforms_Preview.Request, options: TransportRequestOptions, callback: callbackFn<Transforms_Preview.Response>): TransportRequestCallback;
 
-    delete (params: Transforms_Delete.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Transforms_Delete.Response>>;
+    delete (params: Transforms_Delete.Request, options?: TransportRequestOptions): TransportRequestPromise<Transforms_Delete.Response>;
     delete (params: Transforms_Delete.Request, callback: callbackFn<Transforms_Delete.Response>): TransportRequestCallback;
     delete (params: Transforms_Delete.Request, options: TransportRequestOptions, callback: callbackFn<Transforms_Delete.Response>): TransportRequestCallback;
 
-    get (params: Transforms_Get.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Transforms_Get.Response>>;
+    get (params: Transforms_Get.Request, options?: TransportRequestOptions): TransportRequestPromise<Transforms_Get.Response>;
     get (params: Transforms_Get.Request, callback: callbackFn<Transforms_Get.Response>): TransportRequestCallback;
     get (params: Transforms_Get.Request, options: TransportRequestOptions, callback: callbackFn<Transforms_Get.Response>): TransportRequestCallback;
 
-    put (params: Transforms_Put.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Transforms_Put.Response>>;
+    put (params: Transforms_Put.Request, options?: TransportRequestOptions): TransportRequestPromise<Transforms_Put.Response>;
     put (params: Transforms_Put.Request, callback: callbackFn<Transforms_Put.Response>): TransportRequestCallback;
     put (params: Transforms_Put.Request, options: TransportRequestOptions, callback: callbackFn<Transforms_Put.Response>): TransportRequestCallback;
 
-    explain (params: Transforms_Explain.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Transforms_Explain.Response>>;
+    explain (params: Transforms_Explain.Request, options?: TransportRequestOptions): TransportRequestPromise<Transforms_Explain.Response>;
     explain (params: Transforms_Explain.Request, callback: callbackFn<Transforms_Explain.Response>): TransportRequestCallback;
     explain (params: Transforms_Explain.Request, options: TransportRequestOptions, callback: callbackFn<Transforms_Explain.Response>): TransportRequestCallback;
 
-    start (params: Transforms_Start.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Transforms_Start.Response>>;
+    start (params: Transforms_Start.Request, options?: TransportRequestOptions): TransportRequestPromise<Transforms_Start.Response>;
     start (params: Transforms_Start.Request, callback: callbackFn<Transforms_Start.Response>): TransportRequestCallback;
     start (params: Transforms_Start.Request, options: TransportRequestOptions, callback: callbackFn<Transforms_Start.Response>): TransportRequestCallback;
 
-    stop (params: Transforms_Stop.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Transforms_Stop.Response>>;
+    stop (params: Transforms_Stop.Request, options?: TransportRequestOptions): TransportRequestPromise<Transforms_Stop.Response>;
     stop (params: Transforms_Stop.Request, callback: callbackFn<Transforms_Stop.Response>): TransportRequestCallback;
     stop (params: Transforms_Stop.Request, options: TransportRequestOptions, callback: callbackFn<Transforms_Stop.Response>): TransportRequestCallback;
 
@@ -1492,225 +1490,225 @@ declare class Client {
 
 
   http: {
-    connect (params: HttpRequest, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<HttpResponse>>;
-    connect (params: HttpRequest, callback: callbackFn<HttpResponse>): TransportRequestCallback;
-    connect (params: HttpRequest, options: TransportRequestOptions, callback: callbackFn<HttpResponse>): TransportRequestCallback;
+    connect (params: HttpRequest, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse>;
+    connect (params: HttpRequest, callback: callbackFn<ApiResponse>): TransportRequestCallback;
+    connect (params: HttpRequest, options: TransportRequestOptions, callback: callbackFn<ApiResponse>): TransportRequestCallback;
 
-    delete (params: HttpRequest, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<HttpResponse>>;
-    delete (params: HttpRequest, callback: callbackFn<HttpResponse>): TransportRequestCallback;
-    delete (params: HttpRequest, options: TransportRequestOptions, callback: callbackFn<HttpResponse>): TransportRequestCallback;
+    delete (params: HttpRequest, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse>;
+    delete (params: HttpRequest, callback: callbackFn<ApiResponse>): TransportRequestCallback;
+    delete (params: HttpRequest, options: TransportRequestOptions, callback: callbackFn<ApiResponse>): TransportRequestCallback;
 
-    get (params: HttpRequest, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<HttpResponse>>;
-    get (params: HttpRequest, callback: callbackFn<HttpResponse>): TransportRequestCallback;
-    get (params: HttpRequest, options: TransportRequestOptions, callback: callbackFn<HttpResponse>): TransportRequestCallback;
+    get (params: HttpRequest, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse>;
+    get (params: HttpRequest, callback: callbackFn<ApiResponse>): TransportRequestCallback;
+    get (params: HttpRequest, options: TransportRequestOptions, callback: callbackFn<ApiResponse>): TransportRequestCallback;
 
-    head (params: HttpRequest, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<HttpResponse>>;
-    head (params: HttpRequest, callback: callbackFn<HttpResponse>): TransportRequestCallback;
-    head (params: HttpRequest, options: TransportRequestOptions, callback: callbackFn<HttpResponse>): TransportRequestCallback;
+    head (params: HttpRequest, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse>;
+    head (params: HttpRequest, callback: callbackFn<ApiResponse>): TransportRequestCallback;
+    head (params: HttpRequest, options: TransportRequestOptions, callback: callbackFn<ApiResponse>): TransportRequestCallback;
 
-    options (params: HttpRequest, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<HttpResponse>>;
-    options (params: HttpRequest, callback: callbackFn<HttpResponse>): TransportRequestCallback;
-    options (params: HttpRequest, options: TransportRequestOptions, callback: callbackFn<HttpResponse>): TransportRequestCallback;
+    options (params: HttpRequest, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse>;
+    options (params: HttpRequest, callback: callbackFn<ApiResponse>): TransportRequestCallback;
+    options (params: HttpRequest, options: TransportRequestOptions, callback: callbackFn<ApiResponse>): TransportRequestCallback;
 
-    patch (params: HttpRequest, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<HttpResponse>>;
-    patch (params: HttpRequest, callback: callbackFn<HttpResponse>): TransportRequestCallback;
-    patch (params: HttpRequest, options: TransportRequestOptions, callback: callbackFn<HttpResponse>): TransportRequestCallback;
+    patch (params: HttpRequest, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse>;
+    patch (params: HttpRequest, callback: callbackFn<ApiResponse>): TransportRequestCallback;
+    patch (params: HttpRequest, options: TransportRequestOptions, callback: callbackFn<ApiResponse>): TransportRequestCallback;
 
-    post (params: HttpRequest, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<HttpResponse>>;
-    post (params: HttpRequest, callback: callbackFn<HttpResponse>): TransportRequestCallback;
-    post (params: HttpRequest, options: TransportRequestOptions, callback: callbackFn<HttpResponse>): TransportRequestCallback;
+    post (params: HttpRequest, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse>;
+    post (params: HttpRequest, callback: callbackFn<ApiResponse>): TransportRequestCallback;
+    post (params: HttpRequest, options: TransportRequestOptions, callback: callbackFn<ApiResponse>): TransportRequestCallback;
 
-    put (params: HttpRequest, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<HttpResponse>>;
-    put (params: HttpRequest, callback: callbackFn<HttpResponse>): TransportRequestCallback;
-    put (params: HttpRequest, options: TransportRequestOptions, callback: callbackFn<HttpResponse>): TransportRequestCallback;
+    put (params: HttpRequest, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse>;
+    put (params: HttpRequest, callback: callbackFn<ApiResponse>): TransportRequestCallback;
+    put (params: HttpRequest, options: TransportRequestOptions, callback: callbackFn<ApiResponse>): TransportRequestCallback;
 
-    trace (params: HttpRequest, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<HttpResponse>>;
-    trace (params: HttpRequest, callback: callbackFn<HttpResponse>): TransportRequestCallback;
-    trace (params: HttpRequest, options: TransportRequestOptions, callback: callbackFn<HttpResponse>): TransportRequestCallback;
+    trace (params: HttpRequest, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse>;
+    trace (params: HttpRequest, callback: callbackFn<ApiResponse>): TransportRequestCallback;
+    trace (params: HttpRequest, options: TransportRequestOptions, callback: callbackFn<ApiResponse>): TransportRequestCallback;
 
   };
 
-  info (params?: Info.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Info.Response>>;
+  info (params?: Info.Request, options?: TransportRequestOptions): TransportRequestPromise<Info.Response>;
   info (callback: callbackFn<Info.Response>): TransportRequestCallback;
   info (params: Info.Request, callback: callbackFn<Info.Response>): TransportRequestCallback;
   info (params: Info.Request, options: TransportRequestOptions, callback: callbackFn<Info.Response>): TransportRequestCallback;
 
-  ping (params?: Ping.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Ping.Response>>;
+  ping (params?: Ping.Request, options?: TransportRequestOptions): TransportRequestPromise<Ping.Response>;
   ping (callback: callbackFn<Ping.Response>): TransportRequestCallback;
   ping (params: Ping.Request, callback: callbackFn<Ping.Response>): TransportRequestCallback;
   ping (params: Ping.Request, options: TransportRequestOptions, callback: callbackFn<Ping.Response>): TransportRequestCallback;
 
-  bulk (params: Bulk.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Bulk.Response>>;
+  bulk (params: Bulk.Request, options?: TransportRequestOptions): TransportRequestPromise<Bulk.Response>;
   bulk (params: Bulk.Request, callback: callbackFn<Bulk.Response>): TransportRequestCallback;
   bulk (params: Bulk.Request, options: TransportRequestOptions, callback: callbackFn<Bulk.Response>): TransportRequestCallback;
 
-  count (params?: Count.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Count.Response>>;
+  count (params?: Count.Request, options?: TransportRequestOptions): TransportRequestPromise<Count.Response>;
   count (callback: callbackFn<Count.Response>): TransportRequestCallback;
   count (params: Count.Request, callback: callbackFn<Count.Response>): TransportRequestCallback;
   count (params: Count.Request, options: TransportRequestOptions, callback: callbackFn<Count.Response>): TransportRequestCallback;
 
-  deleteByQueryRethrottle (params: DeleteByQueryRethrottle.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<DeleteByQueryRethrottle.Response>>;
+  deleteByQueryRethrottle (params: DeleteByQueryRethrottle.Request, options?: TransportRequestOptions): TransportRequestPromise<DeleteByQueryRethrottle.Response>;
   deleteByQueryRethrottle (params: DeleteByQueryRethrottle.Request, callback: callbackFn<DeleteByQueryRethrottle.Response>): TransportRequestCallback;
   deleteByQueryRethrottle (params: DeleteByQueryRethrottle.Request, options: TransportRequestOptions, callback: callbackFn<DeleteByQueryRethrottle.Response>): TransportRequestCallback;
 
-  fieldCaps (params?: FieldCaps.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<FieldCaps.Response>>;
+  fieldCaps (params?: FieldCaps.Request, options?: TransportRequestOptions): TransportRequestPromise<FieldCaps.Response>;
   fieldCaps (callback: callbackFn<FieldCaps.Response>): TransportRequestCallback;
   fieldCaps (params: FieldCaps.Request, callback: callbackFn<FieldCaps.Response>): TransportRequestCallback;
   fieldCaps (params: FieldCaps.Request, options: TransportRequestOptions, callback: callbackFn<FieldCaps.Response>): TransportRequestCallback;
 
-  mget (params: Mget.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Mget.Response>>;
+  mget (params: Mget.Request, options?: TransportRequestOptions): TransportRequestPromise<Mget.Response>;
   mget (params: Mget.Request, callback: callbackFn<Mget.Response>): TransportRequestCallback;
   mget (params: Mget.Request, options: TransportRequestOptions, callback: callbackFn<Mget.Response>): TransportRequestCallback;
 
-  msearch (params: Msearch.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Msearch.Response>>;
+  msearch (params: Msearch.Request, options?: TransportRequestOptions): TransportRequestPromise<Msearch.Response>;
   msearch (params: Msearch.Request, callback: callbackFn<Msearch.Response>): TransportRequestCallback;
   msearch (params: Msearch.Request, options: TransportRequestOptions, callback: callbackFn<Msearch.Response>): TransportRequestCallback;
 
-  msearchTemplate (params: MsearchTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<MsearchTemplate.Response>>;
+  msearchTemplate (params: MsearchTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<MsearchTemplate.Response>;
   msearchTemplate (params: MsearchTemplate.Request, callback: callbackFn<MsearchTemplate.Response>): TransportRequestCallback;
   msearchTemplate (params: MsearchTemplate.Request, options: TransportRequestOptions, callback: callbackFn<MsearchTemplate.Response>): TransportRequestCallback;
 
-  mtermvectors (params?: Mtermvectors.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Mtermvectors.Response>>;
+  mtermvectors (params?: Mtermvectors.Request, options?: TransportRequestOptions): TransportRequestPromise<Mtermvectors.Response>;
   mtermvectors (callback: callbackFn<Mtermvectors.Response>): TransportRequestCallback;
   mtermvectors (params: Mtermvectors.Request, callback: callbackFn<Mtermvectors.Response>): TransportRequestCallback;
   mtermvectors (params: Mtermvectors.Request, options: TransportRequestOptions, callback: callbackFn<Mtermvectors.Response>): TransportRequestCallback;
 
-  rankEval (params: RankEval.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<RankEval.Response>>;
+  rankEval (params: RankEval.Request, options?: TransportRequestOptions): TransportRequestPromise<RankEval.Response>;
   rankEval (params: RankEval.Request, callback: callbackFn<RankEval.Response>): TransportRequestCallback;
   rankEval (params: RankEval.Request, options: TransportRequestOptions, callback: callbackFn<RankEval.Response>): TransportRequestCallback;
 
-  reindex (params: Reindex.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Reindex.Response>>;
+  reindex (params: Reindex.Request, options?: TransportRequestOptions): TransportRequestPromise<Reindex.Response>;
   reindex (params: Reindex.Request, callback: callbackFn<Reindex.Response>): TransportRequestCallback;
   reindex (params: Reindex.Request, options: TransportRequestOptions, callback: callbackFn<Reindex.Response>): TransportRequestCallback;
 
-  reindexRethrottle (params: ReindexRethrottle.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<ReindexRethrottle.Response>>;
+  reindexRethrottle (params: ReindexRethrottle.Request, options?: TransportRequestOptions): TransportRequestPromise<ReindexRethrottle.Response>;
   reindexRethrottle (params: ReindexRethrottle.Request, callback: callbackFn<ReindexRethrottle.Response>): TransportRequestCallback;
   reindexRethrottle (params: ReindexRethrottle.Request, options: TransportRequestOptions, callback: callbackFn<ReindexRethrottle.Response>): TransportRequestCallback;
 
-  renderSearchTemplate (params?: RenderSearchTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<RenderSearchTemplate.Response>>;
+  renderSearchTemplate (params?: RenderSearchTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<RenderSearchTemplate.Response>;
   renderSearchTemplate (callback: callbackFn<RenderSearchTemplate.Response>): TransportRequestCallback;
   renderSearchTemplate (params: RenderSearchTemplate.Request, callback: callbackFn<RenderSearchTemplate.Response>): TransportRequestCallback;
   renderSearchTemplate (params: RenderSearchTemplate.Request, options: TransportRequestOptions, callback: callbackFn<RenderSearchTemplate.Response>): TransportRequestCallback;
 
-  getScriptContext (params?: GetScriptContext.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<GetScriptContext.Response>>;
+  getScriptContext (params?: GetScriptContext.Request, options?: TransportRequestOptions): TransportRequestPromise<GetScriptContext.Response>;
   getScriptContext (callback: callbackFn<GetScriptContext.Response>): TransportRequestCallback;
   getScriptContext (params: GetScriptContext.Request, callback: callbackFn<GetScriptContext.Response>): TransportRequestCallback;
   getScriptContext (params: GetScriptContext.Request, options: TransportRequestOptions, callback: callbackFn<GetScriptContext.Response>): TransportRequestCallback;
 
-  getScriptLanguages (params?: GetScriptLanguages.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<GetScriptLanguages.Response>>;
+  getScriptLanguages (params?: GetScriptLanguages.Request, options?: TransportRequestOptions): TransportRequestPromise<GetScriptLanguages.Response>;
   getScriptLanguages (callback: callbackFn<GetScriptLanguages.Response>): TransportRequestCallback;
   getScriptLanguages (params: GetScriptLanguages.Request, callback: callbackFn<GetScriptLanguages.Response>): TransportRequestCallback;
   getScriptLanguages (params: GetScriptLanguages.Request, options: TransportRequestOptions, callback: callbackFn<GetScriptLanguages.Response>): TransportRequestCallback;
 
-  deleteScript (params: DeleteScript.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<DeleteScript.Response>>;
+  deleteScript (params: DeleteScript.Request, options?: TransportRequestOptions): TransportRequestPromise<DeleteScript.Response>;
   deleteScript (params: DeleteScript.Request, callback: callbackFn<DeleteScript.Response>): TransportRequestCallback;
   deleteScript (params: DeleteScript.Request, options: TransportRequestOptions, callback: callbackFn<DeleteScript.Response>): TransportRequestCallback;
 
-  getScript (params: GetScript.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<GetScript.Response>>;
+  getScript (params: GetScript.Request, options?: TransportRequestOptions): TransportRequestPromise<GetScript.Response>;
   getScript (params: GetScript.Request, callback: callbackFn<GetScript.Response>): TransportRequestCallback;
   getScript (params: GetScript.Request, options: TransportRequestOptions, callback: callbackFn<GetScript.Response>): TransportRequestCallback;
 
-  putScript (params: PutScript.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<PutScript.Response>>;
+  putScript (params: PutScript.Request, options?: TransportRequestOptions): TransportRequestPromise<PutScript.Response>;
   putScript (params: PutScript.Request, callback: callbackFn<PutScript.Response>): TransportRequestCallback;
   putScript (params: PutScript.Request, options: TransportRequestOptions, callback: callbackFn<PutScript.Response>): TransportRequestCallback;
 
-  scriptsPainlessExecute (params?: ScriptsPainlessExecute.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<ScriptsPainlessExecute.Response>>;
+  scriptsPainlessExecute (params?: ScriptsPainlessExecute.Request, options?: TransportRequestOptions): TransportRequestPromise<ScriptsPainlessExecute.Response>;
   scriptsPainlessExecute (callback: callbackFn<ScriptsPainlessExecute.Response>): TransportRequestCallback;
   scriptsPainlessExecute (params: ScriptsPainlessExecute.Request, callback: callbackFn<ScriptsPainlessExecute.Response>): TransportRequestCallback;
   scriptsPainlessExecute (params: ScriptsPainlessExecute.Request, options: TransportRequestOptions, callback: callbackFn<ScriptsPainlessExecute.Response>): TransportRequestCallback;
 
-  search (params?: Search.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Search.Response>>;
+  search (params?: Search.Request, options?: TransportRequestOptions): TransportRequestPromise<Search.Response>;
   search (callback: callbackFn<Search.Response>): TransportRequestCallback;
   search (params: Search.Request, callback: callbackFn<Search.Response>): TransportRequestCallback;
   search (params: Search.Request, options: TransportRequestOptions, callback: callbackFn<Search.Response>): TransportRequestCallback;
 
-  searchShards (params?: SearchShards.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<SearchShards.Response>>;
+  searchShards (params?: SearchShards.Request, options?: TransportRequestOptions): TransportRequestPromise<SearchShards.Response>;
   searchShards (callback: callbackFn<SearchShards.Response>): TransportRequestCallback;
   searchShards (params: SearchShards.Request, callback: callbackFn<SearchShards.Response>): TransportRequestCallback;
   searchShards (params: SearchShards.Request, options: TransportRequestOptions, callback: callbackFn<SearchShards.Response>): TransportRequestCallback;
 
-  deletePit (params?: DeletePit.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<DeletePit.Response>>;
+  deletePit (params?: DeletePit.Request, options?: TransportRequestOptions): TransportRequestPromise<DeletePit.Response>;
   deletePit (callback: callbackFn<DeletePit.Response>): TransportRequestCallback;
   deletePit (params: DeletePit.Request, callback: callbackFn<DeletePit.Response>): TransportRequestCallback;
   deletePit (params: DeletePit.Request, options: TransportRequestOptions, callback: callbackFn<DeletePit.Response>): TransportRequestCallback;
 
-  deleteAllPits (params?: DeleteAllPits.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<DeleteAllPits.Response>>;
+  deleteAllPits (params?: DeleteAllPits.Request, options?: TransportRequestOptions): TransportRequestPromise<DeleteAllPits.Response>;
   deleteAllPits (callback: callbackFn<DeleteAllPits.Response>): TransportRequestCallback;
   deleteAllPits (params: DeleteAllPits.Request, callback: callbackFn<DeleteAllPits.Response>): TransportRequestCallback;
   deleteAllPits (params: DeleteAllPits.Request, options: TransportRequestOptions, callback: callbackFn<DeleteAllPits.Response>): TransportRequestCallback;
 
-  getAllPits (params?: GetAllPits.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<GetAllPits.Response>>;
+  getAllPits (params?: GetAllPits.Request, options?: TransportRequestOptions): TransportRequestPromise<GetAllPits.Response>;
   getAllPits (callback: callbackFn<GetAllPits.Response>): TransportRequestCallback;
   getAllPits (params: GetAllPits.Request, callback: callbackFn<GetAllPits.Response>): TransportRequestCallback;
   getAllPits (params: GetAllPits.Request, options: TransportRequestOptions, callback: callbackFn<GetAllPits.Response>): TransportRequestCallback;
 
-  clearScroll (params?: ClearScroll.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<ClearScroll.Response>>;
+  clearScroll (params?: ClearScroll.Request, options?: TransportRequestOptions): TransportRequestPromise<ClearScroll.Response>;
   clearScroll (callback: callbackFn<ClearScroll.Response>): TransportRequestCallback;
   clearScroll (params: ClearScroll.Request, callback: callbackFn<ClearScroll.Response>): TransportRequestCallback;
   clearScroll (params: ClearScroll.Request, options: TransportRequestOptions, callback: callbackFn<ClearScroll.Response>): TransportRequestCallback;
 
-  scroll (params?: Scroll.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Scroll.Response>>;
+  scroll (params?: Scroll.Request, options?: TransportRequestOptions): TransportRequestPromise<Scroll.Response>;
   scroll (callback: callbackFn<Scroll.Response>): TransportRequestCallback;
   scroll (params: Scroll.Request, callback: callbackFn<Scroll.Response>): TransportRequestCallback;
   scroll (params: Scroll.Request, options: TransportRequestOptions, callback: callbackFn<Scroll.Response>): TransportRequestCallback;
 
-  searchTemplate (params: SearchTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<SearchTemplate.Response>>;
+  searchTemplate (params: SearchTemplate.Request, options?: TransportRequestOptions): TransportRequestPromise<SearchTemplate.Response>;
   searchTemplate (params: SearchTemplate.Request, callback: callbackFn<SearchTemplate.Response>): TransportRequestCallback;
   searchTemplate (params: SearchTemplate.Request, options: TransportRequestOptions, callback: callbackFn<SearchTemplate.Response>): TransportRequestCallback;
 
-  updateByQueryRethrottle (params: UpdateByQueryRethrottle.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<UpdateByQueryRethrottle.Response>>;
+  updateByQueryRethrottle (params: UpdateByQueryRethrottle.Request, options?: TransportRequestOptions): TransportRequestPromise<UpdateByQueryRethrottle.Response>;
   updateByQueryRethrottle (params: UpdateByQueryRethrottle.Request, callback: callbackFn<UpdateByQueryRethrottle.Response>): TransportRequestCallback;
   updateByQueryRethrottle (params: UpdateByQueryRethrottle.Request, options: TransportRequestOptions, callback: callbackFn<UpdateByQueryRethrottle.Response>): TransportRequestCallback;
 
-  create (params: Create.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Create.Response>>;
+  create (params: Create.Request, options?: TransportRequestOptions): TransportRequestPromise<Create.Response>;
   create (params: Create.Request, callback: callbackFn<Create.Response>): TransportRequestCallback;
   create (params: Create.Request, options: TransportRequestOptions, callback: callbackFn<Create.Response>): TransportRequestCallback;
 
-  deleteByQuery (params: DeleteByQuery.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<DeleteByQuery.Response>>;
+  deleteByQuery (params: DeleteByQuery.Request, options?: TransportRequestOptions): TransportRequestPromise<DeleteByQuery.Response>;
   deleteByQuery (params: DeleteByQuery.Request, callback: callbackFn<DeleteByQuery.Response>): TransportRequestCallback;
   deleteByQuery (params: DeleteByQuery.Request, options: TransportRequestOptions, callback: callbackFn<DeleteByQuery.Response>): TransportRequestCallback;
 
-  index (params: Index.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Index.Response>>;
+  index (params: Index.Request, options?: TransportRequestOptions): TransportRequestPromise<Index.Response>;
   index (params: Index.Request, callback: callbackFn<Index.Response>): TransportRequestCallback;
   index (params: Index.Request, options: TransportRequestOptions, callback: callbackFn<Index.Response>): TransportRequestCallback;
 
-  delete (params: Delete.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Delete.Response>>;
+  delete (params: Delete.Request, options?: TransportRequestOptions): TransportRequestPromise<Delete.Response>;
   delete (params: Delete.Request, callback: callbackFn<Delete.Response>): TransportRequestCallback;
   delete (params: Delete.Request, options: TransportRequestOptions, callback: callbackFn<Delete.Response>): TransportRequestCallback;
 
-  get (params: Get.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Get.Response>>;
+  get (params: Get.Request, options?: TransportRequestOptions): TransportRequestPromise<Get.Response>;
   get (params: Get.Request, callback: callbackFn<Get.Response>): TransportRequestCallback;
   get (params: Get.Request, options: TransportRequestOptions, callback: callbackFn<Get.Response>): TransportRequestCallback;
 
-  exists (params: Exists.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Exists.Response>>;
+  exists (params: Exists.Request, options?: TransportRequestOptions): TransportRequestPromise<Exists.Response>;
   exists (params: Exists.Request, callback: callbackFn<Exists.Response>): TransportRequestCallback;
   exists (params: Exists.Request, options: TransportRequestOptions, callback: callbackFn<Exists.Response>): TransportRequestCallback;
 
-  explain (params: Explain.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Explain.Response>>;
+  explain (params: Explain.Request, options?: TransportRequestOptions): TransportRequestPromise<Explain.Response>;
   explain (params: Explain.Request, callback: callbackFn<Explain.Response>): TransportRequestCallback;
   explain (params: Explain.Request, options: TransportRequestOptions, callback: callbackFn<Explain.Response>): TransportRequestCallback;
 
-  createPit (params: CreatePit.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<CreatePit.Response>>;
+  createPit (params: CreatePit.Request, options?: TransportRequestOptions): TransportRequestPromise<CreatePit.Response>;
   createPit (params: CreatePit.Request, callback: callbackFn<CreatePit.Response>): TransportRequestCallback;
   createPit (params: CreatePit.Request, options: TransportRequestOptions, callback: callbackFn<CreatePit.Response>): TransportRequestCallback;
 
-  getSource (params: GetSource.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<GetSource.Response>>;
+  getSource (params: GetSource.Request, options?: TransportRequestOptions): TransportRequestPromise<GetSource.Response>;
   getSource (params: GetSource.Request, callback: callbackFn<GetSource.Response>): TransportRequestCallback;
   getSource (params: GetSource.Request, options: TransportRequestOptions, callback: callbackFn<GetSource.Response>): TransportRequestCallback;
 
-  existsSource (params: ExistsSource.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<ExistsSource.Response>>;
+  existsSource (params: ExistsSource.Request, options?: TransportRequestOptions): TransportRequestPromise<ExistsSource.Response>;
   existsSource (params: ExistsSource.Request, callback: callbackFn<ExistsSource.Response>): TransportRequestCallback;
   existsSource (params: ExistsSource.Request, options: TransportRequestOptions, callback: callbackFn<ExistsSource.Response>): TransportRequestCallback;
 
-  termvectors (params: Termvectors.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Termvectors.Response>>;
+  termvectors (params: Termvectors.Request, options?: TransportRequestOptions): TransportRequestPromise<Termvectors.Response>;
   termvectors (params: Termvectors.Request, callback: callbackFn<Termvectors.Response>): TransportRequestCallback;
   termvectors (params: Termvectors.Request, options: TransportRequestOptions, callback: callbackFn<Termvectors.Response>): TransportRequestCallback;
 
-  updateByQuery (params: UpdateByQuery.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<UpdateByQuery.Response>>;
+  updateByQuery (params: UpdateByQuery.Request, options?: TransportRequestOptions): TransportRequestPromise<UpdateByQuery.Response>;
   updateByQuery (params: UpdateByQuery.Request, callback: callbackFn<UpdateByQuery.Response>): TransportRequestCallback;
   updateByQuery (params: UpdateByQuery.Request, options: TransportRequestOptions, callback: callbackFn<UpdateByQuery.Response>): TransportRequestCallback;
 
-  update (params: Update.Request, options?: TransportRequestOptions): TransportRequestPromise<ApiResponse<Update.Response>>;
+  update (params: Update.Request, options?: TransportRequestOptions): TransportRequestPromise<Update.Response>;
   update (params: Update.Request, callback: callbackFn<Update.Response>): TransportRequestCallback;
   update (params: Update.Request, options: TransportRequestOptions, callback: callbackFn<Update.Response>): TransportRequestCallback;
 
diff --git a/types/functions/bulk.d.ts b/types/functions/bulk.d.ts
index 1e93db885..73062472c 100644
--- a/types/functions/bulk.d.ts
+++ b/types/functions/bulk.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Core_Search from '../components/_core.search'
 import * as Common from '../components/_common'
@@ -33,7 +34,7 @@ export interface Request extends Global.Params {
   wait_for_active_shards?: Common.WaitForActiveShards;
 }
 
-export interface Response {
+export interface ResponseBody {
   errors: boolean;
   ingest_took?: number;
   items: Record<string, Core_Bulk.ResponseItem>[];
@@ -42,3 +43,6 @@ export interface Response {
 
 export type RequestBody = Core_Bulk.OperationContainer | Core_Bulk.UpdateAction | Record<string, any>[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cat.aliases.d.ts b/types/functions/cat.aliases.d.ts
index aba32b419..0af4e2153 100644
--- a/types/functions/cat.aliases.d.ts
+++ b/types/functions/cat.aliases.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cat_Aliases from '../components/cat.aliases'
@@ -28,5 +29,8 @@ export interface Request extends Global.Params {
   v?: boolean;
 }
 
-export type Response = Cat_Aliases.AliasesRecord[]
+export type ResponseBody = Cat_Aliases.AliasesRecord[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cat.all_pit_segments.d.ts b/types/functions/cat.all_pit_segments.d.ts
index c3b83a13a..bfdfbc9f4 100644
--- a/types/functions/cat.all_pit_segments.d.ts
+++ b/types/functions/cat.all_pit_segments.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cat_Common from '../components/cat._common'
@@ -26,5 +27,8 @@ export interface Request extends Global.Params {
   v?: boolean;
 }
 
-export type Response = Cat_Common.CatPitSegmentsRecord[]
+export type ResponseBody = Cat_Common.CatPitSegmentsRecord[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cat.allocation.d.ts b/types/functions/cat.allocation.d.ts
index 7a514f16b..151a58018 100644
--- a/types/functions/cat.allocation.d.ts
+++ b/types/functions/cat.allocation.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cat_Allocation from '../components/cat.allocation'
@@ -30,5 +31,8 @@ export interface Request extends Global.Params {
   v?: boolean;
 }
 
-export type Response = Cat_Allocation.AllocationRecord[]
+export type ResponseBody = Cat_Allocation.AllocationRecord[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cat.cluster_manager.d.ts b/types/functions/cat.cluster_manager.d.ts
index 5aa0f6721..75aeda177 100644
--- a/types/functions/cat.cluster_manager.d.ts
+++ b/types/functions/cat.cluster_manager.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cat_ClusterManager from '../components/cat.cluster_manager'
@@ -28,5 +29,8 @@ export interface Request extends Global.Params {
   v?: boolean;
 }
 
-export type Response = Cat_ClusterManager.ClusterManagerRecord[]
+export type ResponseBody = Cat_ClusterManager.ClusterManagerRecord[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cat.count.d.ts b/types/functions/cat.count.d.ts
index bb8e6ddba..8d09c68fe 100644
--- a/types/functions/cat.count.d.ts
+++ b/types/functions/cat.count.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cat_Count from '../components/cat.count'
@@ -26,5 +27,8 @@ export interface Request extends Global.Params {
   v?: boolean;
 }
 
-export type Response = Cat_Count.CountRecord[]
+export type ResponseBody = Cat_Count.CountRecord[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cat.fielddata.d.ts b/types/functions/cat.fielddata.d.ts
index 2c3afefef..5d2aee1f3 100644
--- a/types/functions/cat.fielddata.d.ts
+++ b/types/functions/cat.fielddata.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cat_Fielddata from '../components/cat.fielddata'
@@ -27,5 +28,8 @@ export interface Request extends Global.Params {
   v?: boolean;
 }
 
-export type Response = Cat_Fielddata.FielddataRecord[]
+export type ResponseBody = Cat_Fielddata.FielddataRecord[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cat.health.d.ts b/types/functions/cat.health.d.ts
index 539461fcc..e7d3403e1 100644
--- a/types/functions/cat.health.d.ts
+++ b/types/functions/cat.health.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cat_Health from '../components/cat.health'
@@ -27,5 +28,8 @@ export interface Request extends Global.Params {
   v?: boolean;
 }
 
-export type Response = Cat_Health.HealthRecord[]
+export type ResponseBody = Cat_Health.HealthRecord[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cat.help.d.ts b/types/functions/cat.help.d.ts
index 45fa043f0..899b3c078 100644
--- a/types/functions/cat.help.d.ts
+++ b/types/functions/cat.help.d.ts
@@ -13,9 +13,13 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cat.indices.d.ts b/types/functions/cat.indices.d.ts
index ba520444f..844e74044 100644
--- a/types/functions/cat.indices.d.ts
+++ b/types/functions/cat.indices.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cat_Indices from '../components/cat.indices'
@@ -35,5 +36,8 @@ export interface Request extends Global.Params {
   v?: boolean;
 }
 
-export type Response = Cat_Indices.IndicesRecord[]
+export type ResponseBody = Cat_Indices.IndicesRecord[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cat.master.d.ts b/types/functions/cat.master.d.ts
index 3cf14c1ca..6351d1cc5 100644
--- a/types/functions/cat.master.d.ts
+++ b/types/functions/cat.master.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cat_Master from '../components/cat.master'
@@ -28,5 +29,8 @@ export interface Request extends Global.Params {
   v?: boolean;
 }
 
-export type Response = Cat_Master.MasterRecord[]
+export type ResponseBody = Cat_Master.MasterRecord[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cat.nodeattrs.d.ts b/types/functions/cat.nodeattrs.d.ts
index fc1f1c064..4c78312d9 100644
--- a/types/functions/cat.nodeattrs.d.ts
+++ b/types/functions/cat.nodeattrs.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cat_Nodeattrs from '../components/cat.nodeattrs'
@@ -28,5 +29,8 @@ export interface Request extends Global.Params {
   v?: boolean;
 }
 
-export type Response = Cat_Nodeattrs.NodeAttributesRecord[]
+export type ResponseBody = Cat_Nodeattrs.NodeAttributesRecord[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cat.nodes.d.ts b/types/functions/cat.nodes.d.ts
index a00807844..ce5a2d72d 100644
--- a/types/functions/cat.nodes.d.ts
+++ b/types/functions/cat.nodes.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cat_Nodes from '../components/cat.nodes'
@@ -31,5 +32,8 @@ export interface Request extends Global.Params {
   v?: boolean;
 }
 
-export type Response = Cat_Nodes.NodesRecord[]
+export type ResponseBody = Cat_Nodes.NodesRecord[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cat.pending_tasks.d.ts b/types/functions/cat.pending_tasks.d.ts
index eb939f57d..c35b379d9 100644
--- a/types/functions/cat.pending_tasks.d.ts
+++ b/types/functions/cat.pending_tasks.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cat_PendingTasks from '../components/cat.pending_tasks'
@@ -29,5 +30,8 @@ export interface Request extends Global.Params {
   v?: boolean;
 }
 
-export type Response = Cat_PendingTasks.PendingTasksRecord[]
+export type ResponseBody = Cat_PendingTasks.PendingTasksRecord[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cat.pit_segments.d.ts b/types/functions/cat.pit_segments.d.ts
index 9ea8aee19..e26ab7883 100644
--- a/types/functions/cat.pit_segments.d.ts
+++ b/types/functions/cat.pit_segments.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cat_Common from '../components/cat._common'
@@ -27,9 +28,12 @@ export interface Request extends Global.Params {
   v?: boolean;
 }
 
-export type Response = Cat_Common.CatPitSegmentsRecord[]
+export type ResponseBody = Cat_Common.CatPitSegmentsRecord[]
 
 export interface RequestBody {
   pit_id: string[];
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cat.plugins.d.ts b/types/functions/cat.plugins.d.ts
index ee9ee2137..41a65d719 100644
--- a/types/functions/cat.plugins.d.ts
+++ b/types/functions/cat.plugins.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cat_Plugins from '../components/cat.plugins'
@@ -28,5 +29,8 @@ export interface Request extends Global.Params {
   v?: boolean;
 }
 
-export type Response = Cat_Plugins.PluginsRecord[]
+export type ResponseBody = Cat_Plugins.PluginsRecord[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cat.recovery.d.ts b/types/functions/cat.recovery.d.ts
index 7c0cc4ca0..3bb180380 100644
--- a/types/functions/cat.recovery.d.ts
+++ b/types/functions/cat.recovery.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cat_Recovery from '../components/cat.recovery'
@@ -30,5 +31,8 @@ export interface Request extends Global.Params {
   v?: boolean;
 }
 
-export type Response = Cat_Recovery.RecoveryRecord[]
+export type ResponseBody = Cat_Recovery.RecoveryRecord[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cat.repositories.d.ts b/types/functions/cat.repositories.d.ts
index eb0db6864..0ed12d569 100644
--- a/types/functions/cat.repositories.d.ts
+++ b/types/functions/cat.repositories.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cat_Repositories from '../components/cat.repositories'
@@ -28,5 +29,8 @@ export interface Request extends Global.Params {
   v?: boolean;
 }
 
-export type Response = Cat_Repositories.RepositoriesRecord[]
+export type ResponseBody = Cat_Repositories.RepositoriesRecord[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cat.segment_replication.d.ts b/types/functions/cat.segment_replication.d.ts
index e1f4b65b1..4f9a19307 100644
--- a/types/functions/cat.segment_replication.d.ts
+++ b/types/functions/cat.segment_replication.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cat_Common from '../components/cat._common'
@@ -37,5 +38,8 @@ export interface Request extends Global.Params {
   v?: boolean;
 }
 
-export type Response = Cat_Common.CatSegmentReplicationRecord[]
+export type ResponseBody = Cat_Common.CatSegmentReplicationRecord[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cat.segments.d.ts b/types/functions/cat.segments.d.ts
index 4c6eb838d..25a3effcd 100644
--- a/types/functions/cat.segments.d.ts
+++ b/types/functions/cat.segments.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cat_Segments from '../components/cat.segments'
@@ -29,5 +30,8 @@ export interface Request extends Global.Params {
   v?: boolean;
 }
 
-export type Response = Cat_Segments.SegmentsRecord[]
+export type ResponseBody = Cat_Segments.SegmentsRecord[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cat.shards.d.ts b/types/functions/cat.shards.d.ts
index cc55c2017..f8bcbe01a 100644
--- a/types/functions/cat.shards.d.ts
+++ b/types/functions/cat.shards.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cat_Shards from '../components/cat.shards'
@@ -31,5 +32,8 @@ export interface Request extends Global.Params {
   v?: boolean;
 }
 
-export type Response = Cat_Shards.ShardsRecord[]
+export type ResponseBody = Cat_Shards.ShardsRecord[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cat.snapshots.d.ts b/types/functions/cat.snapshots.d.ts
index 71bd9e894..7fe8fb4e8 100644
--- a/types/functions/cat.snapshots.d.ts
+++ b/types/functions/cat.snapshots.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cat_Snapshots from '../components/cat.snapshots'
@@ -30,5 +31,8 @@ export interface Request extends Global.Params {
   v?: boolean;
 }
 
-export type Response = Cat_Snapshots.SnapshotsRecord[]
+export type ResponseBody = Cat_Snapshots.SnapshotsRecord[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cat.tasks.d.ts b/types/functions/cat.tasks.d.ts
index 239551bd5..02eb3760c 100644
--- a/types/functions/cat.tasks.d.ts
+++ b/types/functions/cat.tasks.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cat_Tasks from '../components/cat.tasks'
@@ -30,5 +31,8 @@ export interface Request extends Global.Params {
   v?: boolean;
 }
 
-export type Response = Cat_Tasks.TasksRecord[]
+export type ResponseBody = Cat_Tasks.TasksRecord[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cat.templates.d.ts b/types/functions/cat.templates.d.ts
index 5b85cfa7c..43d35e98b 100644
--- a/types/functions/cat.templates.d.ts
+++ b/types/functions/cat.templates.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cat_Templates from '../components/cat.templates'
@@ -29,5 +30,8 @@ export interface Request extends Global.Params {
   v?: boolean;
 }
 
-export type Response = Cat_Templates.TemplatesRecord[]
+export type ResponseBody = Cat_Templates.TemplatesRecord[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cat.thread_pool.d.ts b/types/functions/cat.thread_pool.d.ts
index d3a96f1fa..d9693b4b1 100644
--- a/types/functions/cat.thread_pool.d.ts
+++ b/types/functions/cat.thread_pool.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cat_ThreadPool from '../components/cat.thread_pool'
@@ -30,5 +31,8 @@ export interface Request extends Global.Params {
   v?: boolean;
 }
 
-export type Response = Cat_ThreadPool.ThreadPoolRecord[]
+export type ResponseBody = Cat_ThreadPool.ThreadPoolRecord[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/clear_scroll.d.ts b/types/functions/clear_scroll.d.ts
index f9223c3e3..c214d5fdc 100644
--- a/types/functions/clear_scroll.d.ts
+++ b/types/functions/clear_scroll.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -21,7 +22,7 @@ export interface Request extends Global.Params {
   scroll_id?: Common.ScrollIds;
 }
 
-export interface Response {
+export interface ResponseBody {
   num_freed: number;
   succeeded: boolean;
 }
@@ -30,3 +31,6 @@ export interface RequestBody {
   scroll_id?: Common.ScrollIds;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cluster.allocation_explain.d.ts b/types/functions/cluster.allocation_explain.d.ts
index 89e1d9076..d7ba88581 100644
--- a/types/functions/cluster.allocation_explain.d.ts
+++ b/types/functions/cluster.allocation_explain.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cluster_AllocationExplain from '../components/cluster.allocation_explain'
@@ -23,7 +24,7 @@ export interface Request extends Global.Params {
   include_yes_decisions?: boolean;
 }
 
-export interface Response {
+export interface ResponseBody {
   allocate_explanation?: string;
   allocation_delay?: Common.Duration;
   allocation_delay_in_millis?: Common.DurationValueUnitMillis;
@@ -58,3 +59,6 @@ export interface RequestBody {
   shard?: number;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cluster.delete_component_template.d.ts b/types/functions/cluster.delete_component_template.d.ts
index 5002842c1..e6bb70e35 100644
--- a/types/functions/cluster.delete_component_template.d.ts
+++ b/types/functions/cluster.delete_component_template.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -23,5 +24,8 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export type Response = Common.AcknowledgedResponseBase
+export type ResponseBody = Common.AcknowledgedResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cluster.delete_decommission_awareness.d.ts b/types/functions/cluster.delete_decommission_awareness.d.ts
index 45fa043f0..899b3c078 100644
--- a/types/functions/cluster.delete_decommission_awareness.d.ts
+++ b/types/functions/cluster.delete_decommission_awareness.d.ts
@@ -13,9 +13,13 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cluster.delete_voting_config_exclusions.d.ts b/types/functions/cluster.delete_voting_config_exclusions.d.ts
index 2f8752f73..440f5b7da 100644
--- a/types/functions/cluster.delete_voting_config_exclusions.d.ts
+++ b/types/functions/cluster.delete_voting_config_exclusions.d.ts
@@ -13,11 +13,15 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 
 export interface Request extends Global.Params {
   wait_for_removal?: boolean;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cluster.delete_weighted_routing.d.ts b/types/functions/cluster.delete_weighted_routing.d.ts
index 45fa043f0..899b3c078 100644
--- a/types/functions/cluster.delete_weighted_routing.d.ts
+++ b/types/functions/cluster.delete_weighted_routing.d.ts
@@ -13,9 +13,13 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cluster.exists_component_template.d.ts b/types/functions/cluster.exists_component_template.d.ts
index 394f00e43..fa8c0b522 100644
--- a/types/functions/cluster.exists_component_template.d.ts
+++ b/types/functions/cluster.exists_component_template.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -23,5 +24,8 @@ export interface Request extends Global.Params {
   name: Common.Name;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cluster.get_component_template.d.ts b/types/functions/cluster.get_component_template.d.ts
index 8990fd4de..d9d6c7c83 100644
--- a/types/functions/cluster.get_component_template.d.ts
+++ b/types/functions/cluster.get_component_template.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cluster_Common from '../components/cluster._common'
@@ -24,7 +25,10 @@ export interface Request extends Global.Params {
   name?: Common.Name;
 }
 
-export interface Response {
+export interface ResponseBody {
   component_templates: Cluster_Common.ComponentTemplate[];
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cluster.get_decommission_awareness.d.ts b/types/functions/cluster.get_decommission_awareness.d.ts
index 820f33a7a..4c94fbaca 100644
--- a/types/functions/cluster.get_decommission_awareness.d.ts
+++ b/types/functions/cluster.get_decommission_awareness.d.ts
@@ -13,11 +13,15 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 
 export interface Request extends Global.Params {
   awareness_attribute_name: string;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cluster.get_settings.d.ts b/types/functions/cluster.get_settings.d.ts
index 2d1b8bcc7..0cca5c7cb 100644
--- a/types/functions/cluster.get_settings.d.ts
+++ b/types/functions/cluster.get_settings.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -24,9 +25,12 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export interface Response {
+export interface ResponseBody {
   defaults?: Record<string, Record<string, any>>;
   persistent: Record<string, Record<string, any>>;
   transient: Record<string, Record<string, any>>;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cluster.get_weighted_routing.d.ts b/types/functions/cluster.get_weighted_routing.d.ts
index 5a871a16f..6ab3fdf89 100644
--- a/types/functions/cluster.get_weighted_routing.d.ts
+++ b/types/functions/cluster.get_weighted_routing.d.ts
@@ -13,11 +13,15 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 
 export interface Request extends Global.Params {
   attribute: string;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cluster.health.d.ts b/types/functions/cluster.health.d.ts
index 638661d49..682b6644c 100644
--- a/types/functions/cluster.health.d.ts
+++ b/types/functions/cluster.health.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cluster_Health from '../components/cluster.health'
@@ -34,5 +35,8 @@ export interface Request extends Global.Params {
   wait_for_status?: Common.HealthStatus;
 }
 
-export type Response = Cluster_Health.HealthResponseBody
+export type ResponseBody = Cluster_Health.HealthResponseBody
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cluster.pending_tasks.d.ts b/types/functions/cluster.pending_tasks.d.ts
index c798ee6f2..f74c9837b 100644
--- a/types/functions/cluster.pending_tasks.d.ts
+++ b/types/functions/cluster.pending_tasks.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cluster_PendingTasks from '../components/cluster.pending_tasks'
@@ -23,7 +24,10 @@ export interface Request extends Global.Params {
   master_timeout?: Common.Duration;
 }
 
-export interface Response {
+export interface ResponseBody {
   tasks: Cluster_PendingTasks.PendingTask[];
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cluster.post_voting_config_exclusions.d.ts b/types/functions/cluster.post_voting_config_exclusions.d.ts
index 200672f5b..93207e0f6 100644
--- a/types/functions/cluster.post_voting_config_exclusions.d.ts
+++ b/types/functions/cluster.post_voting_config_exclusions.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -22,5 +23,8 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cluster.put_component_template.d.ts b/types/functions/cluster.put_component_template.d.ts
index 30e7499cc..745bf2627 100644
--- a/types/functions/cluster.put_component_template.d.ts
+++ b/types/functions/cluster.put_component_template.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_Common from '../components/indices._common'
@@ -26,7 +27,7 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export type Response = Common.AcknowledgedResponseBase
+export type ResponseBody = Common.AcknowledgedResponseBase
 
 export interface RequestBody {
   _meta?: Common.Metadata;
@@ -35,3 +36,6 @@ export interface RequestBody {
   version?: Common.VersionNumber;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cluster.put_decommission_awareness.d.ts b/types/functions/cluster.put_decommission_awareness.d.ts
index bf23e07f8..5f30689d0 100644
--- a/types/functions/cluster.put_decommission_awareness.d.ts
+++ b/types/functions/cluster.put_decommission_awareness.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 
 export interface Request extends Global.Params {
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   awareness_attribute_value: string;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cluster.put_settings.d.ts b/types/functions/cluster.put_settings.d.ts
index c2d5765bd..0d69cd37b 100644
--- a/types/functions/cluster.put_settings.d.ts
+++ b/types/functions/cluster.put_settings.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -24,7 +25,7 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export interface Response {
+export interface ResponseBody {
   acknowledged: boolean;
   persistent: {
 };
@@ -39,3 +40,6 @@ export interface RequestBody {
 };
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cluster.put_weighted_routing.d.ts b/types/functions/cluster.put_weighted_routing.d.ts
index 5a871a16f..6ab3fdf89 100644
--- a/types/functions/cluster.put_weighted_routing.d.ts
+++ b/types/functions/cluster.put_weighted_routing.d.ts
@@ -13,11 +13,15 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 
 export interface Request extends Global.Params {
   attribute: string;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cluster.remote_info.d.ts b/types/functions/cluster.remote_info.d.ts
index a4eb5ceae..c4a076d34 100644
--- a/types/functions/cluster.remote_info.d.ts
+++ b/types/functions/cluster.remote_info.d.ts
@@ -13,10 +13,14 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Cluster_RemoteInfo from '../components/cluster.remote_info'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Record<string, Cluster_RemoteInfo.ClusterRemoteInfo>
+export type ResponseBody = Record<string, Cluster_RemoteInfo.ClusterRemoteInfo>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cluster.reroute.d.ts b/types/functions/cluster.reroute.d.ts
index 3977a0481..de75a52e8 100644
--- a/types/functions/cluster.reroute.d.ts
+++ b/types/functions/cluster.reroute.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cluster_Reroute from '../components/cluster.reroute'
@@ -28,7 +29,7 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export interface Response {
+export interface ResponseBody {
   acknowledged: boolean;
   explanations?: Cluster_Reroute.RerouteExplanation[];
   state?: Record<string, any>;
@@ -38,3 +39,6 @@ export interface RequestBody {
   commands?: Cluster_Reroute.Command[];
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cluster.state.d.ts b/types/functions/cluster.state.d.ts
index 2e8ffbe0c..282adc477 100644
--- a/types/functions/cluster.state.d.ts
+++ b/types/functions/cluster.state.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cluster_State from '../components/cluster.state'
@@ -31,5 +32,8 @@ export interface Request extends Global.Params {
   wait_for_timeout?: Common.Duration;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/cluster.stats.d.ts b/types/functions/cluster.stats.d.ts
index b4fe6ec50..a6e085e56 100644
--- a/types/functions/cluster.stats.d.ts
+++ b/types/functions/cluster.stats.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Cluster_Stats from '../components/cluster.stats'
@@ -23,5 +24,8 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export type Response = Cluster_Stats.StatsResponseBase
+export type ResponseBody = Cluster_Stats.StatsResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/count.d.ts b/types/functions/count.d.ts
index 579051b9b..11665866f 100644
--- a/types/functions/count.d.ts
+++ b/types/functions/count.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common_QueryDsl from '../components/_common.query_dsl'
 import * as Common from '../components/_common'
@@ -36,7 +37,7 @@ export interface Request extends Global.Params {
   terminate_after?: number;
 }
 
-export interface Response {
+export interface ResponseBody {
   _shards: Common.ShardStatistics;
   count: number;
 }
@@ -45,3 +46,6 @@ export interface RequestBody {
   query?: Common_QueryDsl.QueryContainer;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/create.d.ts b/types/functions/create.d.ts
index 418c830e8..2fab9cd48 100644
--- a/types/functions/create.d.ts
+++ b/types/functions/create.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -29,7 +30,10 @@ export interface Request extends Global.Params {
   wait_for_active_shards?: Common.WaitForActiveShards;
 }
 
-export type Response = Common.WriteResponseBase
+export type ResponseBody = Common.WriteResponseBase
 
 export type RequestBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/create_pit.d.ts b/types/functions/create_pit.d.ts
index 6e9031df5..afa786ea3 100644
--- a/types/functions/create_pit.d.ts
+++ b/types/functions/create_pit.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Core_Common from '../components/_core._common'
@@ -26,9 +27,12 @@ export interface Request extends Global.Params {
   routing?: string[];
 }
 
-export interface Response {
+export interface ResponseBody {
   _shards?: Core_Common.ShardStatistics;
   creation_time?: number;
   pit_id?: string;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/dangling_indices.delete_dangling_index.d.ts b/types/functions/dangling_indices.delete_dangling_index.d.ts
index 36b72002d..9d1aed69a 100644
--- a/types/functions/dangling_indices.delete_dangling_index.d.ts
+++ b/types/functions/dangling_indices.delete_dangling_index.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -24,5 +25,8 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export type Response = Common.AcknowledgedResponseBase
+export type ResponseBody = Common.AcknowledgedResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/dangling_indices.import_dangling_index.d.ts b/types/functions/dangling_indices.import_dangling_index.d.ts
index 36b72002d..9d1aed69a 100644
--- a/types/functions/dangling_indices.import_dangling_index.d.ts
+++ b/types/functions/dangling_indices.import_dangling_index.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -24,5 +25,8 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export type Response = Common.AcknowledgedResponseBase
+export type ResponseBody = Common.AcknowledgedResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/dangling_indices.list_dangling_indices.d.ts b/types/functions/dangling_indices.list_dangling_indices.d.ts
index 8ecde52a3..3b325fd90 100644
--- a/types/functions/dangling_indices.list_dangling_indices.d.ts
+++ b/types/functions/dangling_indices.list_dangling_indices.d.ts
@@ -13,15 +13,19 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as DanglingIndices_ListDanglingIndices from '../components/dangling_indices.list_dangling_indices'
 
 export type Request = Global.Params & Record<string, any>
 
-export interface Response {
+export interface ResponseBody {
   _nodes?: Common.NodeStatistics;
   cluster_name?: Common.Name;
   dangling_indices: DanglingIndices_ListDanglingIndices.DanglingIndex[];
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/delete.d.ts b/types/functions/delete.d.ts
index 0942fa2c5..f3a10361b 100644
--- a/types/functions/delete.d.ts
+++ b/types/functions/delete.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -29,5 +30,8 @@ export interface Request extends Global.Params {
   wait_for_active_shards?: Common.WaitForActiveShards;
 }
 
-export type Response = Common.WriteResponseBase
+export type ResponseBody = Common.WriteResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/delete_all_pits.d.ts b/types/functions/delete_all_pits.d.ts
index 22bd2398c..3775abd84 100644
--- a/types/functions/delete_all_pits.d.ts
+++ b/types/functions/delete_all_pits.d.ts
@@ -13,12 +13,16 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Core_Common from '../components/_core._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export interface Response {
+export interface ResponseBody {
   pits?: Core_Common.PitsDetailsDeleteAll[];
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/delete_by_query.d.ts b/types/functions/delete_by_query.d.ts
index 7c51a4862..a5c3f5711 100644
--- a/types/functions/delete_by_query.d.ts
+++ b/types/functions/delete_by_query.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Common_QueryDsl from '../components/_common.query_dsl'
@@ -55,7 +56,7 @@ export interface Request extends Global.Params {
   wait_for_completion?: boolean;
 }
 
-export interface Response {
+export interface ResponseBody {
   batches?: number;
   deleted?: number;
   failures?: Common.BulkIndexByScrollFailure[];
@@ -80,3 +81,6 @@ export interface RequestBody {
   slice?: Common.SlicedScroll;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/delete_by_query_rethrottle.d.ts b/types/functions/delete_by_query_rethrottle.d.ts
index 9539c5d87..e6dca9bcd 100644
--- a/types/functions/delete_by_query_rethrottle.d.ts
+++ b/types/functions/delete_by_query_rethrottle.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Tasks_Common from '../components/tasks._common'
@@ -22,5 +23,8 @@ export interface Request extends Global.Params {
   task_id: Common.TaskId;
 }
 
-export type Response = Tasks_Common.TaskListResponseBase
+export type ResponseBody = Tasks_Common.TaskListResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/delete_pit.d.ts b/types/functions/delete_pit.d.ts
index efd00e420..9874eefb5 100644
--- a/types/functions/delete_pit.d.ts
+++ b/types/functions/delete_pit.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Core_Common from '../components/_core._common'
 
@@ -20,7 +21,7 @@ export interface Request extends Global.Params {
   body?: RequestBody;
 }
 
-export interface Response {
+export interface ResponseBody {
   pits?: Core_Common.DeletedPit[];
 }
 
@@ -28,3 +29,6 @@ export interface RequestBody {
   pit_id: string[];
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/delete_script.d.ts b/types/functions/delete_script.d.ts
index 04476db26..c0970ac1c 100644
--- a/types/functions/delete_script.d.ts
+++ b/types/functions/delete_script.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -23,5 +24,8 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export type Response = Common.AcknowledgedResponseBase
+export type ResponseBody = Common.AcknowledgedResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/exists.d.ts b/types/functions/exists.d.ts
index c88d34495..9989592fb 100644
--- a/types/functions/exists.d.ts
+++ b/types/functions/exists.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Core_Search from '../components/_core.search'
 import * as Common from '../components/_common'
@@ -32,5 +33,8 @@ export interface Request extends Global.Params {
   version_type?: Common.VersionType;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/exists_source.d.ts b/types/functions/exists_source.d.ts
index e7a5b68e6..1fc34c2c0 100644
--- a/types/functions/exists_source.d.ts
+++ b/types/functions/exists_source.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Core_Search from '../components/_core.search'
 import * as Common from '../components/_common'
@@ -31,5 +32,8 @@ export interface Request extends Global.Params {
   version_type?: Common.VersionType;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/explain.d.ts b/types/functions/explain.d.ts
index 8b6356ba0..eb1c221bb 100644
--- a/types/functions/explain.d.ts
+++ b/types/functions/explain.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Core_Search from '../components/_core.search'
 import * as Common from '../components/_common'
@@ -37,7 +38,7 @@ export interface Request extends Global.Params {
   stored_fields?: Common.Fields;
 }
 
-export interface Response {
+export interface ResponseBody {
   _id: Common.Id;
   _index: Common.IndexName;
   explanation?: Core_Explain.ExplanationDetail;
@@ -49,3 +50,6 @@ export interface RequestBody {
   query?: Common_QueryDsl.QueryContainer;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/field_caps.d.ts b/types/functions/field_caps.d.ts
index 995a71f33..044c577dc 100644
--- a/types/functions/field_caps.d.ts
+++ b/types/functions/field_caps.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Core_FieldCaps from '../components/_core.field_caps'
@@ -29,7 +30,7 @@ export interface Request extends Global.Params {
   index?: Common.Indices;
 }
 
-export interface Response {
+export interface ResponseBody {
   fields: Record<string, Record<string, Core_FieldCaps.FieldCapability>>;
   indices: Common.Indices;
 }
@@ -40,3 +41,6 @@ export interface RequestBody {
   runtime_mappings?: Common_Mapping.RuntimeFields;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/get.d.ts b/types/functions/get.d.ts
index 0844cbec8..8f47d4660 100644
--- a/types/functions/get.d.ts
+++ b/types/functions/get.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Core_Search from '../components/_core.search'
 import * as Common from '../components/_common'
@@ -33,5 +34,8 @@ export interface Request extends Global.Params {
   version_type?: Common.VersionType;
 }
 
-export type Response = Core_Get.GetResult
+export type ResponseBody = Core_Get.GetResult
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/get_all_pits.d.ts b/types/functions/get_all_pits.d.ts
index 2f7454f5e..ce1d945ec 100644
--- a/types/functions/get_all_pits.d.ts
+++ b/types/functions/get_all_pits.d.ts
@@ -13,12 +13,16 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Core_Common from '../components/_core._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export interface Response {
+export interface ResponseBody {
   pits?: Core_Common.PitDetail[];
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/get_script.d.ts b/types/functions/get_script.d.ts
index 502734228..46dddecf8 100644
--- a/types/functions/get_script.d.ts
+++ b/types/functions/get_script.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -22,9 +23,12 @@ export interface Request extends Global.Params {
   master_timeout?: Common.Duration;
 }
 
-export interface Response {
+export interface ResponseBody {
   _id: Common.Id;
   found: boolean;
   script?: Common.StoredScript;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/get_script_context.d.ts b/types/functions/get_script_context.d.ts
index 74af86e51..57c9ee665 100644
--- a/types/functions/get_script_context.d.ts
+++ b/types/functions/get_script_context.d.ts
@@ -13,12 +13,16 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Core_GetScriptContext from '../components/_core.get_script_context'
 
 export type Request = Global.Params & Record<string, any>
 
-export interface Response {
+export interface ResponseBody {
   contexts: Core_GetScriptContext.Context[];
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/get_script_languages.d.ts b/types/functions/get_script_languages.d.ts
index 158ff4e78..9d9cf372a 100644
--- a/types/functions/get_script_languages.d.ts
+++ b/types/functions/get_script_languages.d.ts
@@ -13,13 +13,17 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Core_GetScriptLanguages from '../components/_core.get_script_languages'
 
 export type Request = Global.Params & Record<string, any>
 
-export interface Response {
+export interface ResponseBody {
   language_contexts: Core_GetScriptLanguages.LanguageContext[];
   types_allowed: string[];
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/get_source.d.ts b/types/functions/get_source.d.ts
index e7a5b68e6..1fc34c2c0 100644
--- a/types/functions/get_source.d.ts
+++ b/types/functions/get_source.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Core_Search from '../components/_core.search'
 import * as Common from '../components/_common'
@@ -31,5 +32,8 @@ export interface Request extends Global.Params {
   version_type?: Common.VersionType;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/index.d.ts b/types/functions/index.d.ts
index 93b61f155..836b35bd4 100644
--- a/types/functions/index.d.ts
+++ b/types/functions/index.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -33,7 +34,10 @@ export interface Request extends Global.Params {
   wait_for_active_shards?: Common.WaitForActiveShards;
 }
 
-export type Response = Common.WriteResponseBase
+export type ResponseBody = Common.WriteResponseBase
 
 export type RequestBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.add_block.d.ts b/types/functions/indices.add_block.d.ts
index 456430dc9..010f73b32 100644
--- a/types/functions/indices.add_block.d.ts
+++ b/types/functions/indices.add_block.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Indices_AddBlock from '../components/indices.add_block'
 import * as Common from '../components/_common'
@@ -28,9 +29,12 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export interface Response {
+export interface ResponseBody {
   acknowledged: boolean;
   indices: Indices_AddBlock.IndicesBlockStatus[];
   shards_acknowledged: boolean;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.analyze.d.ts b/types/functions/indices.analyze.d.ts
index 7bd07211e..cc99c6634 100644
--- a/types/functions/indices.analyze.d.ts
+++ b/types/functions/indices.analyze.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_Analyze from '../components/indices.analyze'
@@ -23,7 +24,7 @@ export interface Request extends Global.Params {
   index?: Common.IndexName;
 }
 
-export interface Response {
+export interface ResponseBody {
   detail?: Indices_Analyze.AnalyzeDetail;
   tokens?: Indices_Analyze.AnalyzeToken[];
 }
@@ -40,3 +41,6 @@ export interface RequestBody {
   tokenizer?: Common_Analysis.Tokenizer;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.clear_cache.d.ts b/types/functions/indices.clear_cache.d.ts
index 97b66ecf2..0a2b6c07e 100644
--- a/types/functions/indices.clear_cache.d.ts
+++ b/types/functions/indices.clear_cache.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -28,5 +29,8 @@ export interface Request extends Global.Params {
   request?: boolean;
 }
 
-export type Response = Common.ShardsOperationResponseBase
+export type ResponseBody = Common.ShardsOperationResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.clone.d.ts b/types/functions/indices.clone.d.ts
index 32670842f..26e1752ff 100644
--- a/types/functions/indices.clone.d.ts
+++ b/types/functions/indices.clone.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_Common from '../components/indices._common'
@@ -29,7 +30,7 @@ export interface Request extends Global.Params {
   wait_for_completion?: boolean;
 }
 
-export interface Response {
+export interface ResponseBody {
   acknowledged: boolean;
   index: Common.IndexName;
   shards_acknowledged: boolean;
@@ -40,3 +41,6 @@ export interface RequestBody {
   settings?: Record<string, Record<string, any>>;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.close.d.ts b/types/functions/indices.close.d.ts
index 02da8f40c..358a4ba65 100644
--- a/types/functions/indices.close.d.ts
+++ b/types/functions/indices.close.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_Close from '../components/indices.close'
@@ -28,9 +29,12 @@ export interface Request extends Global.Params {
   wait_for_active_shards?: Common.WaitForActiveShards;
 }
 
-export interface Response {
+export interface ResponseBody {
   acknowledged: boolean;
   indices: Record<string, Indices_Close.CloseIndexResult>;
   shards_acknowledged: boolean;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.create.d.ts b/types/functions/indices.create.d.ts
index a9181c2f5..26a48a248 100644
--- a/types/functions/indices.create.d.ts
+++ b/types/functions/indices.create.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_Common from '../components/indices._common'
@@ -27,7 +28,7 @@ export interface Request extends Global.Params {
   wait_for_active_shards?: Common.WaitForActiveShards;
 }
 
-export interface Response {
+export interface ResponseBody {
   acknowledged: boolean;
   index: Common.IndexName;
   shards_acknowledged: boolean;
@@ -39,3 +40,6 @@ export interface RequestBody {
   settings?: Indices_Common.IndexSettings;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.create_data_stream.d.ts b/types/functions/indices.create_data_stream.d.ts
index 5d14ae766..8c2c4b986 100644
--- a/types/functions/indices.create_data_stream.d.ts
+++ b/types/functions/indices.create_data_stream.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -21,7 +22,10 @@ export interface Request extends Global.Params {
   name: Common.DataStreamName;
 }
 
-export type Response = Common.AcknowledgedResponseBase
+export type ResponseBody = Common.AcknowledgedResponseBase
 
 export type RequestBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.data_streams_stats.d.ts b/types/functions/indices.data_streams_stats.d.ts
index b3318e223..0e3bc7157 100644
--- a/types/functions/indices.data_streams_stats.d.ts
+++ b/types/functions/indices.data_streams_stats.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_DataStreamsStats from '../components/indices.data_streams_stats'
@@ -21,7 +22,7 @@ export interface Request extends Global.Params {
   name?: Common.Indices;
 }
 
-export interface Response {
+export interface ResponseBody {
   _shards: Common.ShardStatistics;
   backing_indices: number;
   data_stream_count: number;
@@ -30,3 +31,6 @@ export interface Response {
   total_store_sizes?: Common.ByteSize;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.delete.d.ts b/types/functions/indices.delete.d.ts
index d1a13f3f3..80e79f30e 100644
--- a/types/functions/indices.delete.d.ts
+++ b/types/functions/indices.delete.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -26,5 +27,8 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export type Response = Common.IndicesResponseBase
+export type ResponseBody = Common.IndicesResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.delete_alias.d.ts b/types/functions/indices.delete_alias.d.ts
index b38d175f8..21908471d 100644
--- a/types/functions/indices.delete_alias.d.ts
+++ b/types/functions/indices.delete_alias.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -24,5 +25,8 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export type Response = Common.AcknowledgedResponseBase
+export type ResponseBody = Common.AcknowledgedResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.delete_data_stream.d.ts b/types/functions/indices.delete_data_stream.d.ts
index d6d5f8e4e..1efa4d20a 100644
--- a/types/functions/indices.delete_data_stream.d.ts
+++ b/types/functions/indices.delete_data_stream.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   name: Common.DataStreamNames;
 }
 
-export type Response = Common.AcknowledgedResponseBase
+export type ResponseBody = Common.AcknowledgedResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.delete_index_template.d.ts b/types/functions/indices.delete_index_template.d.ts
index 5002842c1..e6bb70e35 100644
--- a/types/functions/indices.delete_index_template.d.ts
+++ b/types/functions/indices.delete_index_template.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -23,5 +24,8 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export type Response = Common.AcknowledgedResponseBase
+export type ResponseBody = Common.AcknowledgedResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.delete_template.d.ts b/types/functions/indices.delete_template.d.ts
index 5002842c1..e6bb70e35 100644
--- a/types/functions/indices.delete_template.d.ts
+++ b/types/functions/indices.delete_template.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -23,5 +24,8 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export type Response = Common.AcknowledgedResponseBase
+export type ResponseBody = Common.AcknowledgedResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.exists.d.ts b/types/functions/indices.exists.d.ts
index e7f384677..d888d5820 100644
--- a/types/functions/indices.exists.d.ts
+++ b/types/functions/indices.exists.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -27,5 +28,8 @@ export interface Request extends Global.Params {
   local?: boolean;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.exists_alias.d.ts b/types/functions/indices.exists_alias.d.ts
index 33e606837..320d09862 100644
--- a/types/functions/indices.exists_alias.d.ts
+++ b/types/functions/indices.exists_alias.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -25,5 +26,8 @@ export interface Request extends Global.Params {
   name: Common.Names;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.exists_index_template.d.ts b/types/functions/indices.exists_index_template.d.ts
index 2b3fbb30d..0d942c434 100644
--- a/types/functions/indices.exists_index_template.d.ts
+++ b/types/functions/indices.exists_index_template.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -24,5 +25,8 @@ export interface Request extends Global.Params {
   name: Common.Name;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.exists_template.d.ts b/types/functions/indices.exists_template.d.ts
index e0c906f85..8ecf9ecc8 100644
--- a/types/functions/indices.exists_template.d.ts
+++ b/types/functions/indices.exists_template.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -24,5 +25,8 @@ export interface Request extends Global.Params {
   name: Common.Names;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.flush.d.ts b/types/functions/indices.flush.d.ts
index fa8dac484..af3f88002 100644
--- a/types/functions/indices.flush.d.ts
+++ b/types/functions/indices.flush.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -25,5 +26,8 @@ export interface Request extends Global.Params {
   wait_if_ongoing?: boolean;
 }
 
-export type Response = Common.ShardsOperationResponseBase
+export type ResponseBody = Common.ShardsOperationResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.forcemerge.d.ts b/types/functions/indices.forcemerge.d.ts
index 762735726..20580c731 100644
--- a/types/functions/indices.forcemerge.d.ts
+++ b/types/functions/indices.forcemerge.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -28,7 +29,10 @@ export interface Request extends Global.Params {
   wait_for_completion?: boolean;
 }
 
-export interface Response extends Common.ShardsOperationResponseBase {
+export interface ResponseBody extends Common.ShardsOperationResponseBase {
   task?: string;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.get.d.ts b/types/functions/indices.get.d.ts
index d53a6fc09..48877fb44 100644
--- a/types/functions/indices.get.d.ts
+++ b/types/functions/indices.get.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_Common from '../components/indices._common'
@@ -29,5 +30,8 @@ export interface Request extends Global.Params {
   master_timeout?: Common.Duration;
 }
 
-export type Response = Record<string, Indices_Common.IndexState>
+export type ResponseBody = Record<string, Indices_Common.IndexState>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.get_alias.d.ts b/types/functions/indices.get_alias.d.ts
index 7e5db9624..fb81e91db 100644
--- a/types/functions/indices.get_alias.d.ts
+++ b/types/functions/indices.get_alias.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_GetAlias from '../components/indices.get_alias'
@@ -26,5 +27,8 @@ export interface Request extends Global.Params {
   name?: Common.Names;
 }
 
-export type Response = Record<string, Indices_GetAlias.IndexAliases>
+export type ResponseBody = Record<string, Indices_GetAlias.IndexAliases>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.get_data_stream.d.ts b/types/functions/indices.get_data_stream.d.ts
index 4a1a5eda7..0b39382df 100644
--- a/types/functions/indices.get_data_stream.d.ts
+++ b/types/functions/indices.get_data_stream.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_Common from '../components/indices._common'
@@ -21,7 +22,10 @@ export interface Request extends Global.Params {
   name?: Common.DataStreamNames;
 }
 
-export interface Response {
+export interface ResponseBody {
   data_streams: Indices_Common.DataStream[];
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.get_field_mapping.d.ts b/types/functions/indices.get_field_mapping.d.ts
index 569a8228a..3e09ea49b 100644
--- a/types/functions/indices.get_field_mapping.d.ts
+++ b/types/functions/indices.get_field_mapping.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_GetFieldMapping from '../components/indices.get_field_mapping'
@@ -27,5 +28,8 @@ export interface Request extends Global.Params {
   local?: boolean;
 }
 
-export type Response = Record<string, Indices_GetFieldMapping.TypeFieldMappings>
+export type ResponseBody = Record<string, Indices_GetFieldMapping.TypeFieldMappings>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.get_index_template.d.ts b/types/functions/indices.get_index_template.d.ts
index aa86f50ed..fae71174e 100644
--- a/types/functions/indices.get_index_template.d.ts
+++ b/types/functions/indices.get_index_template.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_GetIndexTemplate from '../components/indices.get_index_template'
@@ -25,7 +26,10 @@ export interface Request extends Global.Params {
   name?: Common.Name;
 }
 
-export interface Response {
+export interface ResponseBody {
   index_templates: Indices_GetIndexTemplate.IndexTemplateItem[];
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.get_mapping.d.ts b/types/functions/indices.get_mapping.d.ts
index dc400ee33..1b7651a42 100644
--- a/types/functions/indices.get_mapping.d.ts
+++ b/types/functions/indices.get_mapping.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_GetMapping from '../components/indices.get_mapping'
@@ -27,5 +28,8 @@ export interface Request extends Global.Params {
   master_timeout?: Common.Duration;
 }
 
-export type Response = Record<string, Indices_GetMapping.IndexMappingRecord>
+export type ResponseBody = Record<string, Indices_GetMapping.IndexMappingRecord>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.get_settings.d.ts b/types/functions/indices.get_settings.d.ts
index 4f4287a86..c181f2f8d 100644
--- a/types/functions/indices.get_settings.d.ts
+++ b/types/functions/indices.get_settings.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_Common from '../components/indices._common'
@@ -30,5 +31,8 @@ export interface Request extends Global.Params {
   name?: Common.Names;
 }
 
-export type Response = Record<string, Indices_Common.IndexState>
+export type ResponseBody = Record<string, Indices_Common.IndexState>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.get_template.d.ts b/types/functions/indices.get_template.d.ts
index 1eef88688..447b63a59 100644
--- a/types/functions/indices.get_template.d.ts
+++ b/types/functions/indices.get_template.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_Common from '../components/indices._common'
@@ -25,5 +26,8 @@ export interface Request extends Global.Params {
   name?: Common.Names;
 }
 
-export type Response = Record<string, Indices_Common.TemplateMapping>
+export type ResponseBody = Record<string, Indices_Common.TemplateMapping>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.get_upgrade.d.ts b/types/functions/indices.get_upgrade.d.ts
index 5d4cd9455..c0fde9103 100644
--- a/types/functions/indices.get_upgrade.d.ts
+++ b/types/functions/indices.get_upgrade.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -23,5 +24,8 @@ export interface Request extends Global.Params {
   index?: string[];
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.open.d.ts b/types/functions/indices.open.d.ts
index 7f2cc6a05..cd62b6afb 100644
--- a/types/functions/indices.open.d.ts
+++ b/types/functions/indices.open.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -29,10 +30,13 @@ export interface Request extends Global.Params {
   wait_for_completion?: boolean;
 }
 
-export type Response = {
+export type ResponseBody = {
   task?: Common.TaskId;
 } | {
   acknowledged: boolean;
   shards_acknowledged: boolean;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.put_alias.d.ts b/types/functions/indices.put_alias.d.ts
index 716c6a115..6d8b09dac 100644
--- a/types/functions/indices.put_alias.d.ts
+++ b/types/functions/indices.put_alias.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Common_QueryDsl from '../components/_common.query_dsl'
@@ -26,7 +27,7 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export type Response = Common.AcknowledgedResponseBase
+export type ResponseBody = Common.AcknowledgedResponseBase
 
 export interface RequestBody {
   alias?: string;
@@ -39,3 +40,6 @@ export interface RequestBody {
   search_routing?: Common.Routing;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.put_index_template.d.ts b/types/functions/indices.put_index_template.d.ts
index 9c70046f9..06a0e5484 100644
--- a/types/functions/indices.put_index_template.d.ts
+++ b/types/functions/indices.put_index_template.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_Common from '../components/indices._common'
@@ -27,7 +28,7 @@ export interface Request extends Global.Params {
   name: Common.Name;
 }
 
-export type Response = Common.AcknowledgedResponseBase
+export type ResponseBody = Common.AcknowledgedResponseBase
 
 export interface RequestBody {
   _meta?: Common.Metadata;
@@ -39,3 +40,6 @@ export interface RequestBody {
   version?: Common.VersionNumber;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.put_mapping.d.ts b/types/functions/indices.put_mapping.d.ts
index 44da51966..3f69cd6d4 100644
--- a/types/functions/indices.put_mapping.d.ts
+++ b/types/functions/indices.put_mapping.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Common_Mapping from '../components/_common.mapping'
@@ -29,7 +30,7 @@ export interface Request extends Global.Params {
   write_index_only?: boolean;
 }
 
-export type Response = Common.IndicesResponseBase
+export type ResponseBody = Common.IndicesResponseBase
 
 export interface RequestBody {
   _field_names?: Common_Mapping.FieldNamesField;
@@ -45,3 +46,6 @@ export interface RequestBody {
   runtime?: Common_Mapping.RuntimeFields;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.put_settings.d.ts b/types/functions/indices.put_settings.d.ts
index c4ba0e823..2f9b0cd81 100644
--- a/types/functions/indices.put_settings.d.ts
+++ b/types/functions/indices.put_settings.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Indices_Common from '../components/indices._common'
 import * as Common from '../components/_common'
@@ -30,5 +31,8 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export type Response = Common.AcknowledgedResponseBase
+export type ResponseBody = Common.AcknowledgedResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.put_template.d.ts b/types/functions/indices.put_template.d.ts
index d0504a1b7..87190df35 100644
--- a/types/functions/indices.put_template.d.ts
+++ b/types/functions/indices.put_template.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_Common from '../components/indices._common'
@@ -27,7 +28,7 @@ export interface Request extends Global.Params {
   order?: number;
 }
 
-export type Response = Common.AcknowledgedResponseBase
+export type ResponseBody = Common.AcknowledgedResponseBase
 
 export interface RequestBody {
   aliases?: Record<string, Indices_Common.Alias>;
@@ -38,3 +39,6 @@ export interface RequestBody {
   version?: Common.VersionNumber;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.recovery.d.ts b/types/functions/indices.recovery.d.ts
index 201013265..0650b4c57 100644
--- a/types/functions/indices.recovery.d.ts
+++ b/types/functions/indices.recovery.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_Recovery from '../components/indices.recovery'
@@ -23,5 +24,8 @@ export interface Request extends Global.Params {
   index?: Common.Indices;
 }
 
-export type Response = Record<string, Indices_Recovery.RecoveryStatus>
+export type ResponseBody = Record<string, Indices_Recovery.RecoveryStatus>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.refresh.d.ts b/types/functions/indices.refresh.d.ts
index 751871c4a..e2b00f70b 100644
--- a/types/functions/indices.refresh.d.ts
+++ b/types/functions/indices.refresh.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -23,5 +24,8 @@ export interface Request extends Global.Params {
   index?: Common.Indices;
 }
 
-export type Response = Common.ShardsOperationResponseBase
+export type ResponseBody = Common.ShardsOperationResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.resolve_index.d.ts b/types/functions/indices.resolve_index.d.ts
index 6452a6d7b..6d130954b 100644
--- a/types/functions/indices.resolve_index.d.ts
+++ b/types/functions/indices.resolve_index.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_ResolveIndex from '../components/indices.resolve_index'
@@ -22,9 +23,12 @@ export interface Request extends Global.Params {
   name: Common.Names;
 }
 
-export interface Response {
+export interface ResponseBody {
   aliases: Indices_ResolveIndex.ResolveIndexAliasItem[];
   data_streams: Indices_ResolveIndex.ResolveIndexDataStreamsItem[];
   indices: Indices_ResolveIndex.ResolveIndexItem[];
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.rollover.d.ts b/types/functions/indices.rollover.d.ts
index 47d458f2a..482b25661 100644
--- a/types/functions/indices.rollover.d.ts
+++ b/types/functions/indices.rollover.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_Common from '../components/indices._common'
@@ -30,7 +31,7 @@ export interface Request extends Global.Params {
   wait_for_active_shards?: Common.WaitForActiveShards;
 }
 
-export interface Response {
+export interface ResponseBody {
   acknowledged: boolean;
   conditions: Record<string, boolean>;
   dry_run: boolean;
@@ -47,3 +48,6 @@ export interface RequestBody {
   settings?: Record<string, Record<string, any>>;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.segments.d.ts b/types/functions/indices.segments.d.ts
index f58c86b44..5b1f0b246 100644
--- a/types/functions/indices.segments.d.ts
+++ b/types/functions/indices.segments.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_Segments from '../components/indices.segments'
@@ -25,8 +26,11 @@ export interface Request extends Global.Params {
   verbose?: boolean;
 }
 
-export interface Response {
+export interface ResponseBody {
   _shards: Common.ShardStatistics;
   indices: Record<string, Indices_Segments.IndexSegment>;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.shard_stores.d.ts b/types/functions/indices.shard_stores.d.ts
index e142b5eff..9d3e24b24 100644
--- a/types/functions/indices.shard_stores.d.ts
+++ b/types/functions/indices.shard_stores.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_ShardStores from '../components/indices.shard_stores'
@@ -25,7 +26,10 @@ export interface Request extends Global.Params {
   status?: Indices_ShardStores.ShardStoreStatus | Indices_ShardStores.ShardStoreStatus[];
 }
 
-export interface Response {
+export interface ResponseBody {
   indices: Record<string, Indices_ShardStores.IndicesShardStores>;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.shrink.d.ts b/types/functions/indices.shrink.d.ts
index 4a5e75b2c..8fba74025 100644
--- a/types/functions/indices.shrink.d.ts
+++ b/types/functions/indices.shrink.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_Common from '../components/indices._common'
@@ -30,7 +31,7 @@ export interface Request extends Global.Params {
   wait_for_completion?: boolean;
 }
 
-export interface Response {
+export interface ResponseBody {
   acknowledged: boolean;
   index: Common.IndexName;
   shards_acknowledged: boolean;
@@ -41,3 +42,6 @@ export interface RequestBody {
   settings?: Record<string, Record<string, any>>;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.simulate_index_template.d.ts b/types/functions/indices.simulate_index_template.d.ts
index b9356f40a..d4a131756 100644
--- a/types/functions/indices.simulate_index_template.d.ts
+++ b/types/functions/indices.simulate_index_template.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_Common from '../components/indices._common'
@@ -27,7 +28,7 @@ export interface Request extends Global.Params {
   name: Common.Name;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
 export interface RequestBody {
   _meta?: Common.Metadata;
@@ -40,3 +41,6 @@ export interface RequestBody {
   version?: Common.VersionNumber;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.simulate_template.d.ts b/types/functions/indices.simulate_template.d.ts
index c61138559..7fa12e5ed 100644
--- a/types/functions/indices.simulate_template.d.ts
+++ b/types/functions/indices.simulate_template.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Indices_Common from '../components/indices._common'
 import * as Common from '../components/_common'
@@ -27,8 +28,11 @@ export interface Request extends Global.Params {
   name?: Common.Name;
 }
 
-export interface Response {
+export interface ResponseBody {
   overlapping?: Indices_SimulateTemplate.Overlapping[];
   template: Indices_SimulateTemplate.Template;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.split.d.ts b/types/functions/indices.split.d.ts
index 4d9e3a38a..46f395a9c 100644
--- a/types/functions/indices.split.d.ts
+++ b/types/functions/indices.split.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_Common from '../components/indices._common'
@@ -30,7 +31,7 @@ export interface Request extends Global.Params {
   wait_for_completion?: boolean;
 }
 
-export interface Response {
+export interface ResponseBody {
   acknowledged: boolean;
   index: Common.IndexName;
   shards_acknowledged: boolean;
@@ -42,3 +43,6 @@ export interface RequestBody {
 };
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.stats.d.ts b/types/functions/indices.stats.d.ts
index 9d0003175..6b5a0795b 100644
--- a/types/functions/indices.stats.d.ts
+++ b/types/functions/indices.stats.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_Stats from '../components/indices.stats'
@@ -31,9 +32,12 @@ export interface Request extends Global.Params {
   metric?: Common.Metrics;
 }
 
-export interface Response {
+export interface ResponseBody {
   _all: Indices_Stats.IndicesStats;
   _shards: Common.ShardStatistics;
   indices?: Record<string, Indices_Stats.IndicesStats>;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.update_aliases.d.ts b/types/functions/indices.update_aliases.d.ts
index dc1679c43..7c7d5e5e8 100644
--- a/types/functions/indices.update_aliases.d.ts
+++ b/types/functions/indices.update_aliases.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Indices_UpdateAliases from '../components/indices.update_aliases'
@@ -24,9 +25,12 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export type Response = Common.AcknowledgedResponseBase
+export type ResponseBody = Common.AcknowledgedResponseBase
 
 export interface RequestBody {
   actions?: Indices_UpdateAliases.Action[];
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.upgrade.d.ts b/types/functions/indices.upgrade.d.ts
index e5302436e..eb9128fbc 100644
--- a/types/functions/indices.upgrade.d.ts
+++ b/types/functions/indices.upgrade.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -25,5 +26,8 @@ export interface Request extends Global.Params {
   wait_for_completion?: boolean;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/indices.validate_query.d.ts b/types/functions/indices.validate_query.d.ts
index 9001b3a03..64e019b71 100644
--- a/types/functions/indices.validate_query.d.ts
+++ b/types/functions/indices.validate_query.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common_QueryDsl from '../components/_common.query_dsl'
 import * as Common from '../components/_common'
@@ -35,7 +36,7 @@ export interface Request extends Global.Params {
   rewrite?: boolean;
 }
 
-export interface Response {
+export interface ResponseBody {
   _shards?: Common.ShardStatistics;
   error?: string;
   explanations?: Indices_ValidateQuery.IndicesValidationExplanation[];
@@ -46,3 +47,6 @@ export interface RequestBody {
   query?: Common_QueryDsl.QueryContainer;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/info.d.ts b/types/functions/info.d.ts
index ac1bf5816..69ff0d08b 100644
--- a/types/functions/info.d.ts
+++ b/types/functions/info.d.ts
@@ -13,12 +13,13 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
 export type Request = Global.Params & Record<string, any>
 
-export interface Response {
+export interface ResponseBody {
   cluster_name: Common.Name;
   cluster_uuid: Common.Uuid;
   name: Common.Name;
@@ -26,3 +27,6 @@ export interface Response {
   version: Common.OpenSearchVersionInfo;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/ingest.delete_pipeline.d.ts b/types/functions/ingest.delete_pipeline.d.ts
index 04476db26..c0970ac1c 100644
--- a/types/functions/ingest.delete_pipeline.d.ts
+++ b/types/functions/ingest.delete_pipeline.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -23,5 +24,8 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export type Response = Common.AcknowledgedResponseBase
+export type ResponseBody = Common.AcknowledgedResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/ingest.get_pipeline.d.ts b/types/functions/ingest.get_pipeline.d.ts
index dd0cac0fd..c78cc4be4 100644
--- a/types/functions/ingest.get_pipeline.d.ts
+++ b/types/functions/ingest.get_pipeline.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Ingest_Common from '../components/ingest._common'
@@ -23,5 +24,8 @@ export interface Request extends Global.Params {
   master_timeout?: Common.Duration;
 }
 
-export type Response = Record<string, Ingest_Common.Pipeline>
+export type ResponseBody = Record<string, Ingest_Common.Pipeline>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/ingest.processor_grok.d.ts b/types/functions/ingest.processor_grok.d.ts
index 0b68bba68..f9a197ae5 100644
--- a/types/functions/ingest.processor_grok.d.ts
+++ b/types/functions/ingest.processor_grok.d.ts
@@ -13,11 +13,15 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 
 export type Request = Global.Params & Record<string, any>
 
-export interface Response {
+export interface ResponseBody {
   patterns: Record<string, string>;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/ingest.put_pipeline.d.ts b/types/functions/ingest.put_pipeline.d.ts
index f119053df..656fce8da 100644
--- a/types/functions/ingest.put_pipeline.d.ts
+++ b/types/functions/ingest.put_pipeline.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Ingest_Common from '../components/ingest._common'
@@ -25,7 +26,7 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export type Response = Common.AcknowledgedResponseBase
+export type ResponseBody = Common.AcknowledgedResponseBase
 
 export interface RequestBody {
   _meta?: Common.Metadata;
@@ -35,3 +36,6 @@ export interface RequestBody {
   version?: Common.VersionNumber;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/ingest.simulate.d.ts b/types/functions/ingest.simulate.d.ts
index 2e09b0294..88eac50a5 100644
--- a/types/functions/ingest.simulate.d.ts
+++ b/types/functions/ingest.simulate.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Ingest_Simulate from '../components/ingest.simulate'
@@ -24,7 +25,7 @@ export interface Request extends Global.Params {
   verbose?: boolean;
 }
 
-export interface Response {
+export interface ResponseBody {
   docs: Ingest_Simulate.PipelineSimulation[];
 }
 
@@ -33,3 +34,6 @@ export interface RequestBody {
   pipeline?: Ingest_Common.Pipeline;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/knn.delete_model.d.ts b/types/functions/knn.delete_model.d.ts
index c15d1564d..5a73d7203 100644
--- a/types/functions/knn.delete_model.d.ts
+++ b/types/functions/knn.delete_model.d.ts
@@ -13,11 +13,15 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 
 export interface Request extends Global.Params {
   model_id: string;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/knn.get_model.d.ts b/types/functions/knn.get_model.d.ts
index c15d1564d..5a73d7203 100644
--- a/types/functions/knn.get_model.d.ts
+++ b/types/functions/knn.get_model.d.ts
@@ -13,11 +13,15 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 
 export interface Request extends Global.Params {
   model_id: string;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/knn.search_models.d.ts b/types/functions/knn.search_models.d.ts
index df2a4170d..fbb4659b6 100644
--- a/types/functions/knn.search_models.d.ts
+++ b/types/functions/knn.search_models.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Knn_Common from '../components/knn._common'
 import * as Common from '../components/_common'
@@ -63,7 +64,10 @@ export interface Request extends Global.Params {
   version?: boolean;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
 export type RequestBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/knn.stats.d.ts b/types/functions/knn.stats.d.ts
index 85d18e136..9cd92f8cd 100644
--- a/types/functions/knn.stats.d.ts
+++ b/types/functions/knn.stats.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -22,5 +23,8 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/knn.train_model.d.ts b/types/functions/knn.train_model.d.ts
index 3975de93e..ab8b735b7 100644
--- a/types/functions/knn.train_model.d.ts
+++ b/types/functions/knn.train_model.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 
 export interface Request extends Global.Params {
@@ -21,7 +22,7 @@ export interface Request extends Global.Params {
   preference?: string;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
 export interface RequestBody {
   description?: string;
@@ -33,3 +34,6 @@ export interface RequestBody {
   training_index: string;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/knn.warmup.d.ts b/types/functions/knn.warmup.d.ts
index fac9b02ef..9523023f9 100644
--- a/types/functions/knn.warmup.d.ts
+++ b/types/functions/knn.warmup.d.ts
@@ -13,11 +13,15 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 
 export interface Request extends Global.Params {
   index: string[];
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/mget.d.ts b/types/functions/mget.d.ts
index b890e5e8c..96a1c7e1d 100644
--- a/types/functions/mget.d.ts
+++ b/types/functions/mget.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Core_Search from '../components/_core.search'
 import * as Common from '../components/_common'
@@ -31,7 +32,7 @@ export interface Request extends Global.Params {
   stored_fields?: Common.Fields;
 }
 
-export interface Response {
+export interface ResponseBody {
   docs: Core_Mget.ResponseItem[];
 }
 
@@ -40,3 +41,6 @@ export interface RequestBody {
   ids?: Common.Ids;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/ml.delete_model.d.ts b/types/functions/ml.delete_model.d.ts
index 137661de7..ea144be44 100644
--- a/types/functions/ml.delete_model.d.ts
+++ b/types/functions/ml.delete_model.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Ml_Common from '../components/ml._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   model_id: string;
 }
 
-export type Response = Ml_Common.ModelGroup
+export type ResponseBody = Ml_Common.ModelGroup
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/ml.delete_model_group.d.ts b/types/functions/ml.delete_model_group.d.ts
index 1d4cba2db..30f19408b 100644
--- a/types/functions/ml.delete_model_group.d.ts
+++ b/types/functions/ml.delete_model_group.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Ml_Common from '../components/ml._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   model_group_id: string;
 }
 
-export type Response = Ml_Common.ModelGroup
+export type ResponseBody = Ml_Common.ModelGroup
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/ml.get_model_group.d.ts b/types/functions/ml.get_model_group.d.ts
index 1d4cba2db..30f19408b 100644
--- a/types/functions/ml.get_model_group.d.ts
+++ b/types/functions/ml.get_model_group.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Ml_Common from '../components/ml._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   model_group_id: string;
 }
 
-export type Response = Ml_Common.ModelGroup
+export type ResponseBody = Ml_Common.ModelGroup
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/ml.get_task.d.ts b/types/functions/ml.get_task.d.ts
index 70ddcc840..2ca695d10 100644
--- a/types/functions/ml.get_task.d.ts
+++ b/types/functions/ml.get_task.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Ml_Common from '../components/ml._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   task_id: string;
 }
 
-export type Response = Ml_Common.Task
+export type ResponseBody = Ml_Common.Task
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/ml.register_model.d.ts b/types/functions/ml.register_model.d.ts
index d95d2dea7..ca762eef7 100644
--- a/types/functions/ml.register_model.d.ts
+++ b/types/functions/ml.register_model.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Ml_Common from '../components/ml._common'
 
@@ -20,7 +21,7 @@ export interface Request extends Global.Params {
   body?: RequestBody;
 }
 
-export type Response = Ml_Common.Task
+export type ResponseBody = Ml_Common.Task
 
 export interface RequestBody {
   description?: string;
@@ -30,3 +31,6 @@ export interface RequestBody {
   version: string;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/ml.register_model_group.d.ts b/types/functions/ml.register_model_group.d.ts
index bd51d3149..a449e3f5d 100644
--- a/types/functions/ml.register_model_group.d.ts
+++ b/types/functions/ml.register_model_group.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Ml_Common from '../components/ml._common'
 
@@ -20,7 +21,7 @@ export interface Request extends Global.Params {
   body?: RequestBody;
 }
 
-export type Response = Ml_Common.ModelGroupRegistration
+export type ResponseBody = Ml_Common.ModelGroupRegistration
 
 export interface RequestBody {
   access_mode?: 'private' | 'public' | 'restricted';
@@ -30,3 +31,6 @@ export interface RequestBody {
   name: string;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/ml.search_models.d.ts b/types/functions/ml.search_models.d.ts
index c76b07041..7682f4e90 100644
--- a/types/functions/ml.search_models.d.ts
+++ b/types/functions/ml.search_models.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Ml_Common from '../components/ml._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   body?: Ml_Common.SearchModelsQuery;
 }
 
-export type Response = Ml_Common.SearchModelsResponse
+export type ResponseBody = Ml_Common.SearchModelsResponse
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/msearch.d.ts b/types/functions/msearch.d.ts
index e17266a7b..636ab00b4 100644
--- a/types/functions/msearch.d.ts
+++ b/types/functions/msearch.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Core_Msearch from '../components/_core.msearch'
@@ -29,7 +30,10 @@ export interface Request extends Global.Params {
   typed_keys?: boolean;
 }
 
-export type Response = Core_Msearch.MultiSearchResult
+export type ResponseBody = Core_Msearch.MultiSearchResult
 
 export type RequestBody = Core_Msearch.RequestItem[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/msearch_template.d.ts b/types/functions/msearch_template.d.ts
index bd8cca7d3..bad797a3f 100644
--- a/types/functions/msearch_template.d.ts
+++ b/types/functions/msearch_template.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Core_Msearch from '../components/_core.msearch'
@@ -28,7 +29,10 @@ export interface Request extends Global.Params {
   typed_keys?: boolean;
 }
 
-export type Response = Core_Msearch.MultiSearchResult
+export type ResponseBody = Core_Msearch.MultiSearchResult
 
 export type RequestBody = Core_MsearchTemplate.RequestItem[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/mtermvectors.d.ts b/types/functions/mtermvectors.d.ts
index 206345da0..90eb79ac1 100644
--- a/types/functions/mtermvectors.d.ts
+++ b/types/functions/mtermvectors.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Core_Mtermvectors from '../components/_core.mtermvectors'
@@ -34,7 +35,7 @@ export interface Request extends Global.Params {
   version_type?: Common.VersionType;
 }
 
-export interface Response {
+export interface ResponseBody {
   docs: Core_Mtermvectors.TermVectorsResult[];
 }
 
@@ -43,3 +44,6 @@ export interface RequestBody {
   ids?: Common.Id[];
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/nodes.hot_threads.d.ts b/types/functions/nodes.hot_threads.d.ts
index a67c413a4..2c3617db3 100644
--- a/types/functions/nodes.hot_threads.d.ts
+++ b/types/functions/nodes.hot_threads.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Nodes_Common from '../components/nodes._common'
@@ -27,5 +28,8 @@ export interface Request extends Global.Params {
   type?: Nodes_Common.SampleType;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/nodes.info.d.ts b/types/functions/nodes.info.d.ts
index cb3058803..ea2d0fd30 100644
--- a/types/functions/nodes.info.d.ts
+++ b/types/functions/nodes.info.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Nodes_Info from '../components/nodes.info'
 import * as Common from '../components/_common'
@@ -24,5 +25,8 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export type Response = Nodes_Info.ResponseBase
+export type ResponseBody = Nodes_Info.ResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/nodes.reload_secure_settings.d.ts b/types/functions/nodes.reload_secure_settings.d.ts
index 3244b60b4..110c4bc18 100644
--- a/types/functions/nodes.reload_secure_settings.d.ts
+++ b/types/functions/nodes.reload_secure_settings.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Nodes_ReloadSecureSettings from '../components/nodes.reload_secure_settings'
@@ -23,9 +24,12 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export type Response = Nodes_ReloadSecureSettings.ResponseBase
+export type ResponseBody = Nodes_ReloadSecureSettings.ResponseBase
 
 export interface RequestBody {
   secure_settings_password?: Common.Password;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/nodes.stats.d.ts b/types/functions/nodes.stats.d.ts
index fefc87aac..d487e3b4f 100644
--- a/types/functions/nodes.stats.d.ts
+++ b/types/functions/nodes.stats.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Nodes_Stats from '../components/nodes.stats'
@@ -31,5 +32,8 @@ export interface Request extends Global.Params {
   types?: string[];
 }
 
-export type Response = Nodes_Stats.ResponseBase
+export type ResponseBody = Nodes_Stats.ResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/nodes.usage.d.ts b/types/functions/nodes.usage.d.ts
index d5a5a94b0..1e317e07e 100644
--- a/types/functions/nodes.usage.d.ts
+++ b/types/functions/nodes.usage.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Nodes_Usage from '../components/nodes.usage'
 import * as Common from '../components/_common'
@@ -23,5 +24,8 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export type Response = Nodes_Usage.ResponseBase
+export type ResponseBody = Nodes_Usage.ResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/notifications.create_config.d.ts b/types/functions/notifications.create_config.d.ts
index 3ff1086de..995c029b9 100644
--- a/types/functions/notifications.create_config.d.ts
+++ b/types/functions/notifications.create_config.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Notifications_Common from '../components/notifications._common'
 
@@ -20,7 +21,10 @@ export interface Request extends Global.Params {
   body: Notifications_Common.NotificationsConfig;
 }
 
-export interface Response {
+export interface ResponseBody {
   config_id?: string;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/notifications.delete_config.d.ts b/types/functions/notifications.delete_config.d.ts
index f6014f2e4..ac2aafe49 100644
--- a/types/functions/notifications.delete_config.d.ts
+++ b/types/functions/notifications.delete_config.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Notifications_Common from '../components/notifications._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   config_id: string;
 }
 
-export type Response = Notifications_Common.DeleteConfigsResponse
+export type ResponseBody = Notifications_Common.DeleteConfigsResponse
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/notifications.delete_configs.d.ts b/types/functions/notifications.delete_configs.d.ts
index 46d6e3ae9..1352f03ab 100644
--- a/types/functions/notifications.delete_configs.d.ts
+++ b/types/functions/notifications.delete_configs.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Notifications_Common from '../components/notifications._common'
 
@@ -21,5 +22,8 @@ export interface Request extends Global.Params {
   config_id_list?: string;
 }
 
-export type Response = Notifications_Common.DeleteConfigsResponse
+export type ResponseBody = Notifications_Common.DeleteConfigsResponse
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/notifications.get_config.d.ts b/types/functions/notifications.get_config.d.ts
index 7ec5680ac..eff4fdcb8 100644
--- a/types/functions/notifications.get_config.d.ts
+++ b/types/functions/notifications.get_config.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Notifications_Common from '../components/notifications._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   config_id: string;
 }
 
-export type Response = Notifications_Common.GetConfigsResponse
+export type ResponseBody = Notifications_Common.GetConfigsResponse
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/notifications.get_configs.d.ts b/types/functions/notifications.get_configs.d.ts
index 827356766..dd6e6492b 100644
--- a/types/functions/notifications.get_configs.d.ts
+++ b/types/functions/notifications.get_configs.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Notifications_Common from '../components/notifications._common'
 
@@ -58,7 +59,7 @@ export interface Request extends Global.Params {
   'webhook.url.keyword'?: string;
 }
 
-export type Response = Notifications_Common.GetConfigsResponse
+export type ResponseBody = Notifications_Common.GetConfigsResponse
 
 export interface RequestBody {
   config_id_list?: string[];
@@ -68,3 +69,6 @@ export interface RequestBody {
   sort_order?: string;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/notifications.list_channels.d.ts b/types/functions/notifications.list_channels.d.ts
index 21b916fdc..19cc59dac 100644
--- a/types/functions/notifications.list_channels.d.ts
+++ b/types/functions/notifications.list_channels.d.ts
@@ -13,15 +13,19 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Notifications_Common from '../components/notifications._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export interface Response {
+export interface ResponseBody {
   channel_list?: Notifications_Common.NotificationChannel[];
   start_index?: number;
   total_hit_relation?: Notifications_Common.TotalHitRelation;
   total_hits?: number;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/notifications.list_features.d.ts b/types/functions/notifications.list_features.d.ts
index 24c3168fb..e2ef8b6df 100644
--- a/types/functions/notifications.list_features.d.ts
+++ b/types/functions/notifications.list_features.d.ts
@@ -13,13 +13,17 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Notifications_Common from '../components/notifications._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export interface Response {
+export interface ResponseBody {
   allowed_config_type_list?: Notifications_Common.NotificationConfigType[];
   plugin_features?: Notifications_Common.NotificationsPluginFeaturesMap;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/notifications.send_test.d.ts b/types/functions/notifications.send_test.d.ts
index 3925baaf2..3da365a6e 100644
--- a/types/functions/notifications.send_test.d.ts
+++ b/types/functions/notifications.send_test.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Notifications_Common from '../components/notifications._common'
 
@@ -20,8 +21,11 @@ export interface Request extends Global.Params {
   config_id: string;
 }
 
-export interface Response {
+export interface ResponseBody {
   event_source?: Notifications_Common.EventSource;
   status_list?: Notifications_Common.EventStatus[];
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/notifications.update_config.d.ts b/types/functions/notifications.update_config.d.ts
index eff30b63a..4a9394e2b 100644
--- a/types/functions/notifications.update_config.d.ts
+++ b/types/functions/notifications.update_config.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Notifications_Common from '../components/notifications._common'
 
@@ -21,7 +22,10 @@ export interface Request extends Global.Params {
   config_id: string;
 }
 
-export interface Response {
+export interface ResponseBody {
   config_id?: string;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/ping.d.ts b/types/functions/ping.d.ts
index 45fa043f0..899b3c078 100644
--- a/types/functions/ping.d.ts
+++ b/types/functions/ping.d.ts
@@ -13,9 +13,13 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/ppl.explain.d.ts b/types/functions/ppl.explain.d.ts
index b895e4e40..e4445af1c 100644
--- a/types/functions/ppl.explain.d.ts
+++ b/types/functions/ppl.explain.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Sql_Common from '../components/sql._common'
 
@@ -22,5 +23,8 @@ export interface Request extends Global.Params {
   sanitize?: boolean;
 }
 
-export type Response = Sql_Common.ExplainResponse
+export type ResponseBody = Sql_Common.ExplainResponse
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/ppl.get_stats.d.ts b/types/functions/ppl.get_stats.d.ts
index 6d61188f5..ce8297fba 100644
--- a/types/functions/ppl.get_stats.d.ts
+++ b/types/functions/ppl.get_stats.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 
 export interface Request extends Global.Params {
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   sanitize?: boolean;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/ppl.post_stats.d.ts b/types/functions/ppl.post_stats.d.ts
index 9eca752b6..b6c9f2d75 100644
--- a/types/functions/ppl.post_stats.d.ts
+++ b/types/functions/ppl.post_stats.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Sql_Common from '../components/sql._common'
 
@@ -22,5 +23,8 @@ export interface Request extends Global.Params {
   sanitize?: boolean;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/ppl.query.d.ts b/types/functions/ppl.query.d.ts
index 881a2da61..22db1a9aa 100644
--- a/types/functions/ppl.query.d.ts
+++ b/types/functions/ppl.query.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Sql_Common from '../components/sql._common'
 
@@ -22,5 +23,8 @@ export interface Request extends Global.Params {
   sanitize?: boolean;
 }
 
-export type Response = Sql_Common.QueryResponse
+export type ResponseBody = Sql_Common.QueryResponse
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/put_script.d.ts b/types/functions/put_script.d.ts
index c08386777..31a9c577f 100644
--- a/types/functions/put_script.d.ts
+++ b/types/functions/put_script.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -25,9 +26,12 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export type Response = Common.AcknowledgedResponseBase
+export type ResponseBody = Common.AcknowledgedResponseBase
 
 export interface RequestBody {
   script: Common.StoredScript;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/rank_eval.d.ts b/types/functions/rank_eval.d.ts
index 7b78bc394..d39bcfa73 100644
--- a/types/functions/rank_eval.d.ts
+++ b/types/functions/rank_eval.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Core_RankEval from '../components/_core.rank_eval'
@@ -26,7 +27,7 @@ export interface Request extends Global.Params {
   search_type?: string;
 }
 
-export interface Response {
+export interface ResponseBody {
   details: Record<string, Core_RankEval.RankEvalMetricDetail>;
   failures: Record<string, Record<string, any>>;
   metric_score: number;
@@ -37,3 +38,6 @@ export interface RequestBody {
   requests: Core_RankEval.RankEvalRequestItem[];
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/reindex.d.ts b/types/functions/reindex.d.ts
index 20d43e4c7..710a7b018 100644
--- a/types/functions/reindex.d.ts
+++ b/types/functions/reindex.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Core_Reindex from '../components/_core.reindex'
@@ -29,7 +30,7 @@ export interface Request extends Global.Params {
   wait_for_completion?: boolean;
 }
 
-export interface Response {
+export interface ResponseBody {
   batches?: number;
   created?: number;
   deleted?: number;
@@ -57,3 +58,6 @@ export interface RequestBody {
   source: Core_Reindex.Source;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/reindex_rethrottle.d.ts b/types/functions/reindex_rethrottle.d.ts
index 12ea8a0f7..9c13ac7e7 100644
--- a/types/functions/reindex_rethrottle.d.ts
+++ b/types/functions/reindex_rethrottle.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Core_ReindexRethrottle from '../components/_core.reindex_rethrottle'
@@ -22,7 +23,10 @@ export interface Request extends Global.Params {
   task_id: Common.Id;
 }
 
-export interface Response {
+export interface ResponseBody {
   nodes: Record<string, Core_ReindexRethrottle.ReindexNode>;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/remote_store.restore.d.ts b/types/functions/remote_store.restore.d.ts
index 0d06228b9..335de9ad2 100644
--- a/types/functions/remote_store.restore.d.ts
+++ b/types/functions/remote_store.restore.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as RemoteStore_Common from '../components/remote_store._common'
@@ -23,7 +24,7 @@ export interface Request extends Global.Params {
   wait_for_completion?: boolean;
 }
 
-export interface Response {
+export interface ResponseBody {
   accepted?: boolean;
   remote_store?: RemoteStore_Common.RemoteStoreRestoreInfo;
 }
@@ -32,3 +33,6 @@ export interface RequestBody {
   indices: string[];
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/render_search_template.d.ts b/types/functions/render_search_template.d.ts
index f79acf9a2..f6009f00c 100644
--- a/types/functions/render_search_template.d.ts
+++ b/types/functions/render_search_template.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -21,7 +22,7 @@ export interface Request extends Global.Params {
   id?: Common.Id;
 }
 
-export interface Response {
+export interface ResponseBody {
   template_output: Record<string, Record<string, any>>;
 }
 
@@ -31,3 +32,6 @@ export interface RequestBody {
   source?: string;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/rollups.delete.d.ts b/types/functions/rollups.delete.d.ts
index 19b8a0a4b..b031235f0 100644
--- a/types/functions/rollups.delete.d.ts
+++ b/types/functions/rollups.delete.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   id: Common.Id;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/rollups.explain.d.ts b/types/functions/rollups.explain.d.ts
index abdc14bd2..6db7465c7 100644
--- a/types/functions/rollups.explain.d.ts
+++ b/types/functions/rollups.explain.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Rollups_Common from '../components/rollups._common'
@@ -21,5 +22,8 @@ export interface Request extends Global.Params {
   id: Common.Id;
 }
 
-export type Response = Rollups_Common.ExplainEntities
+export type ResponseBody = Rollups_Common.ExplainEntities
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/rollups.get.d.ts b/types/functions/rollups.get.d.ts
index e255cd27e..ac1c21c44 100644
--- a/types/functions/rollups.get.d.ts
+++ b/types/functions/rollups.get.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Rollups_Common from '../components/rollups._common'
@@ -21,5 +22,8 @@ export interface Request extends Global.Params {
   id: Common.Id;
 }
 
-export type Response = Rollups_Common.RollupEntity
+export type ResponseBody = Rollups_Common.RollupEntity
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/rollups.put.d.ts b/types/functions/rollups.put.d.ts
index 1347582ad..35007abad 100644
--- a/types/functions/rollups.put.d.ts
+++ b/types/functions/rollups.put.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Rollups_Common from '../components/rollups._common'
 import * as Common from '../components/_common'
@@ -24,5 +25,8 @@ export interface Request extends Global.Params {
   if_seq_no?: Common.SequenceNumber;
 }
 
-export type Response = Rollups_Common.RollupEntity
+export type ResponseBody = Rollups_Common.RollupEntity
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/rollups.start.d.ts b/types/functions/rollups.start.d.ts
index 19b8a0a4b..b031235f0 100644
--- a/types/functions/rollups.start.d.ts
+++ b/types/functions/rollups.start.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   id: Common.Id;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/rollups.stop.d.ts b/types/functions/rollups.stop.d.ts
index 19b8a0a4b..b031235f0 100644
--- a/types/functions/rollups.stop.d.ts
+++ b/types/functions/rollups.stop.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   id: Common.Id;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/scripts_painless_execute.d.ts b/types/functions/scripts_painless_execute.d.ts
index 560e1885a..432c85f0f 100644
--- a/types/functions/scripts_painless_execute.d.ts
+++ b/types/functions/scripts_painless_execute.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Core_ScriptsPainlessExecute from '../components/_core.scripts_painless_execute'
 import * as Common from '../components/_common'
@@ -21,7 +22,7 @@ export interface Request extends Global.Params {
   body?: RequestBody;
 }
 
-export interface Response {
+export interface ResponseBody {
   result: Record<string, any>;
 }
 
@@ -31,3 +32,6 @@ export interface RequestBody {
   script?: Common.InlineScript;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/scroll.d.ts b/types/functions/scroll.d.ts
index 39e2c8253..508862181 100644
--- a/types/functions/scroll.d.ts
+++ b/types/functions/scroll.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Core_Search from '../components/_core.search'
@@ -24,10 +25,13 @@ export interface Request extends Global.Params {
   scroll_id?: Common.ScrollId;
 }
 
-export type Response = Core_Search.ResponseBody
+export type ResponseBody = Core_Search.ResponseBody
 
 export interface RequestBody {
   scroll?: Common.Duration;
   scroll_id: Common.ScrollId;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/search.d.ts b/types/functions/search.d.ts
index 3fc33f8c2..9cf4ea11d 100644
--- a/types/functions/search.d.ts
+++ b/types/functions/search.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Core_Search from '../components/_core.search'
 import * as Common from '../components/_common'
@@ -71,7 +72,7 @@ export interface Request extends Global.Params {
   version?: boolean;
 }
 
-export type Response = Core_Search.ResponseBody
+export type ResponseBody = Core_Search.ResponseBody
 
 export interface RequestBody {
   _source?: Core_Search.SourceConfig;
@@ -109,3 +110,6 @@ export interface RequestBody {
   version?: boolean;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/search_pipeline.delete.d.ts b/types/functions/search_pipeline.delete.d.ts
index c493200e7..bb6ccb831 100644
--- a/types/functions/search_pipeline.delete.d.ts
+++ b/types/functions/search_pipeline.delete.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -22,7 +23,10 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export interface Response {
+export interface ResponseBody {
   acknowledged?: boolean;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/search_pipeline.get.d.ts b/types/functions/search_pipeline.get.d.ts
index 3f78d020a..0a6d353c3 100644
--- a/types/functions/search_pipeline.get.d.ts
+++ b/types/functions/search_pipeline.get.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as SearchPipeline_Common from '../components/search_pipeline._common'
@@ -22,5 +23,8 @@ export interface Request extends Global.Params {
   id?: string;
 }
 
-export type Response = SearchPipeline_Common.SearchPipelineMap
+export type ResponseBody = SearchPipeline_Common.SearchPipelineMap
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/search_pipeline.put.d.ts b/types/functions/search_pipeline.put.d.ts
index 5c014c133..6b1fcd65f 100644
--- a/types/functions/search_pipeline.put.d.ts
+++ b/types/functions/search_pipeline.put.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as SearchPipeline_Common from '../components/search_pipeline._common'
 import * as Common from '../components/_common'
@@ -24,7 +25,10 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export interface Response {
+export interface ResponseBody {
   acknowledged?: boolean;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/search_shards.d.ts b/types/functions/search_shards.d.ts
index f8c03460a..e0bdb84db 100644
--- a/types/functions/search_shards.d.ts
+++ b/types/functions/search_shards.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Core_SearchShards from '../components/_core.search_shards'
@@ -27,9 +28,12 @@ export interface Request extends Global.Params {
   routing?: Common.Routing;
 }
 
-export interface Response {
+export interface ResponseBody {
   indices: Record<string, Core_SearchShards.ShardStoreIndex>;
   nodes: Record<string, Common.NodeAttributes>;
   shards: Common.NodeShard[][];
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/search_template.d.ts b/types/functions/search_template.d.ts
index e3ffb740a..d86cf5430 100644
--- a/types/functions/search_template.d.ts
+++ b/types/functions/search_template.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Common_Aggregations from '../components/_common.aggregations'
@@ -36,7 +37,7 @@ export interface Request extends Global.Params {
   typed_keys?: boolean;
 }
 
-export interface Response {
+export interface ResponseBody {
   _clusters?: Common.ClusterStatistics;
   _scroll_id?: Common.ScrollId;
   _shards: Common.ShardStatistics;
@@ -61,3 +62,6 @@ export interface RequestBody {
   source?: string;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.authinfo.d.ts b/types/functions/security.authinfo.d.ts
index e45a9d8ce..eccf539eb 100644
--- a/types/functions/security.authinfo.d.ts
+++ b/types/functions/security.authinfo.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -21,5 +22,8 @@ export interface Request extends Global.Params {
   verbose?: boolean;
 }
 
-export type Response = Security_Common.AuthInfo
+export type ResponseBody = Security_Common.AuthInfo
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.authtoken.d.ts b/types/functions/security.authtoken.d.ts
index e84a8583d..47d3f1b24 100644
--- a/types/functions/security.authtoken.d.ts
+++ b/types/functions/security.authtoken.d.ts
@@ -13,10 +13,14 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.change_password.d.ts b/types/functions/security.change_password.d.ts
index 8d0690fa8..2919e7600 100644
--- a/types/functions/security.change_password.d.ts
+++ b/types/functions/security.change_password.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   body: Security_Common.ChangePasswordRequestContent;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.config_upgrade_check.d.ts b/types/functions/security.config_upgrade_check.d.ts
index 3d9ca529b..3a78e03aa 100644
--- a/types/functions/security.config_upgrade_check.d.ts
+++ b/types/functions/security.config_upgrade_check.d.ts
@@ -13,10 +13,14 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Security_Common.UpgradeCheck
+export type ResponseBody = Security_Common.UpgradeCheck
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.config_upgrade_perform.d.ts b/types/functions/security.config_upgrade_perform.d.ts
index 6286d096d..a9438726d 100644
--- a/types/functions/security.config_upgrade_perform.d.ts
+++ b/types/functions/security.config_upgrade_perform.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   body?: Security_Common.ConfigUpgradePayload;
 }
 
-export type Response = Security_Common.UpgradePerform
+export type ResponseBody = Security_Common.UpgradePerform
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.create_action_group.d.ts b/types/functions/security.create_action_group.d.ts
index 7be771562..a36c7ac09 100644
--- a/types/functions/security.create_action_group.d.ts
+++ b/types/functions/security.create_action_group.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -21,5 +22,8 @@ export interface Request extends Global.Params {
   body: Security_Common.ActionGroup;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.create_allowlist.d.ts b/types/functions/security.create_allowlist.d.ts
index d274049f9..5d2ca48de 100644
--- a/types/functions/security.create_allowlist.d.ts
+++ b/types/functions/security.create_allowlist.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   body: Security_Common.AllowListConfig;
 }
 
-export type Response = Security_Common.AllowListConfig
+export type ResponseBody = Security_Common.AllowListConfig
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.create_role.d.ts b/types/functions/security.create_role.d.ts
index a40e040b9..4d04f4966 100644
--- a/types/functions/security.create_role.d.ts
+++ b/types/functions/security.create_role.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -21,5 +22,8 @@ export interface Request extends Global.Params {
   role: string;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.create_role_mapping.d.ts b/types/functions/security.create_role_mapping.d.ts
index f1e81abe8..25d618534 100644
--- a/types/functions/security.create_role_mapping.d.ts
+++ b/types/functions/security.create_role_mapping.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -21,5 +22,8 @@ export interface Request extends Global.Params {
   role: string;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.create_tenant.d.ts b/types/functions/security.create_tenant.d.ts
index fd84a45ec..58312a4ee 100644
--- a/types/functions/security.create_tenant.d.ts
+++ b/types/functions/security.create_tenant.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -21,5 +22,8 @@ export interface Request extends Global.Params {
   tenant: string;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.create_update_tenancy_config.d.ts b/types/functions/security.create_update_tenancy_config.d.ts
index f2c0a289c..b7494c58e 100644
--- a/types/functions/security.create_update_tenancy_config.d.ts
+++ b/types/functions/security.create_update_tenancy_config.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,7 +21,10 @@ export interface Request extends Global.Params {
   body: RequestBody;
 }
 
-export type Response = Security_Common.MultiTenancyConfig
+export type ResponseBody = Security_Common.MultiTenancyConfig
 
 export type RequestBody = Security_Common.MultiTenancyConfig[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.create_user.d.ts b/types/functions/security.create_user.d.ts
index 2016e6728..3a7dc765e 100644
--- a/types/functions/security.create_user.d.ts
+++ b/types/functions/security.create_user.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -21,5 +22,8 @@ export interface Request extends Global.Params {
   username: string;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.create_user_legacy.d.ts b/types/functions/security.create_user_legacy.d.ts
index 2016e6728..3a7dc765e 100644
--- a/types/functions/security.create_user_legacy.d.ts
+++ b/types/functions/security.create_user_legacy.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -21,5 +22,8 @@ export interface Request extends Global.Params {
   username: string;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.delete_action_group.d.ts b/types/functions/security.delete_action_group.d.ts
index 395c832f4..1d632f8ab 100644
--- a/types/functions/security.delete_action_group.d.ts
+++ b/types/functions/security.delete_action_group.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   action_group: string;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.delete_distinguished_name.d.ts b/types/functions/security.delete_distinguished_name.d.ts
index b2d710e14..60ca11ae0 100644
--- a/types/functions/security.delete_distinguished_name.d.ts
+++ b/types/functions/security.delete_distinguished_name.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   cluster_name: string;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.delete_role.d.ts b/types/functions/security.delete_role.d.ts
index c22c1d325..f29e5567f 100644
--- a/types/functions/security.delete_role.d.ts
+++ b/types/functions/security.delete_role.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   role: string;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.delete_role_mapping.d.ts b/types/functions/security.delete_role_mapping.d.ts
index c22c1d325..f29e5567f 100644
--- a/types/functions/security.delete_role_mapping.d.ts
+++ b/types/functions/security.delete_role_mapping.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   role: string;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.delete_tenant.d.ts b/types/functions/security.delete_tenant.d.ts
index 8958b89f6..2c6698ec0 100644
--- a/types/functions/security.delete_tenant.d.ts
+++ b/types/functions/security.delete_tenant.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   tenant: string;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.delete_user.d.ts b/types/functions/security.delete_user.d.ts
index a58b4c98d..9269a6d9d 100644
--- a/types/functions/security.delete_user.d.ts
+++ b/types/functions/security.delete_user.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   username: string;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.delete_user_legacy.d.ts b/types/functions/security.delete_user_legacy.d.ts
index a58b4c98d..9269a6d9d 100644
--- a/types/functions/security.delete_user_legacy.d.ts
+++ b/types/functions/security.delete_user_legacy.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   username: string;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.flush_cache.d.ts b/types/functions/security.flush_cache.d.ts
index e84a8583d..47d3f1b24 100644
--- a/types/functions/security.flush_cache.d.ts
+++ b/types/functions/security.flush_cache.d.ts
@@ -13,10 +13,14 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.generate_obo_token.d.ts b/types/functions/security.generate_obo_token.d.ts
index 425fec502..aaa086642 100644
--- a/types/functions/security.generate_obo_token.d.ts
+++ b/types/functions/security.generate_obo_token.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   body: Security_Common.OBOToken;
 }
 
-export type Response = Security_Common.GenerateOBOToken
+export type ResponseBody = Security_Common.GenerateOBOToken
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.generate_user_token.d.ts b/types/functions/security.generate_user_token.d.ts
index a58b4c98d..9269a6d9d 100644
--- a/types/functions/security.generate_user_token.d.ts
+++ b/types/functions/security.generate_user_token.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   username: string;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.generate_user_token_legacy.d.ts b/types/functions/security.generate_user_token_legacy.d.ts
index a58b4c98d..9269a6d9d 100644
--- a/types/functions/security.generate_user_token_legacy.d.ts
+++ b/types/functions/security.generate_user_token_legacy.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   username: string;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.get_account_details.d.ts b/types/functions/security.get_account_details.d.ts
index c04a5cb49..33636dbc4 100644
--- a/types/functions/security.get_account_details.d.ts
+++ b/types/functions/security.get_account_details.d.ts
@@ -13,10 +13,14 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Security_Common.AccountDetails
+export type ResponseBody = Security_Common.AccountDetails
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.get_action_group.d.ts b/types/functions/security.get_action_group.d.ts
index 40efd3f98..5f8e7d8e1 100644
--- a/types/functions/security.get_action_group.d.ts
+++ b/types/functions/security.get_action_group.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   action_group: string;
 }
 
-export type Response = Security_Common.ActionGroupsMap
+export type ResponseBody = Security_Common.ActionGroupsMap
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.get_action_groups.d.ts b/types/functions/security.get_action_groups.d.ts
index 62d68bc37..5a7583cc4 100644
--- a/types/functions/security.get_action_groups.d.ts
+++ b/types/functions/security.get_action_groups.d.ts
@@ -13,10 +13,14 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Security_Common.ActionGroupsMap
+export type ResponseBody = Security_Common.ActionGroupsMap
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.get_allowlist.d.ts b/types/functions/security.get_allowlist.d.ts
index b6584d943..92d9ee6dd 100644
--- a/types/functions/security.get_allowlist.d.ts
+++ b/types/functions/security.get_allowlist.d.ts
@@ -13,10 +13,14 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Security_Common.AllowListConfig
+export type ResponseBody = Security_Common.AllowListConfig
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.get_audit_configuration.d.ts b/types/functions/security.get_audit_configuration.d.ts
index 62455a49d..cc818efe7 100644
--- a/types/functions/security.get_audit_configuration.d.ts
+++ b/types/functions/security.get_audit_configuration.d.ts
@@ -13,10 +13,14 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Security_Common.AuditConfigWithReadOnly
+export type ResponseBody = Security_Common.AuditConfigWithReadOnly
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.get_certificates.d.ts b/types/functions/security.get_certificates.d.ts
index 724324d0b..4d4a02e85 100644
--- a/types/functions/security.get_certificates.d.ts
+++ b/types/functions/security.get_certificates.d.ts
@@ -13,10 +13,14 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Security_Common.GetCertificates
+export type ResponseBody = Security_Common.GetCertificates
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.get_configuration.d.ts b/types/functions/security.get_configuration.d.ts
index 473177e59..66c032b54 100644
--- a/types/functions/security.get_configuration.d.ts
+++ b/types/functions/security.get_configuration.d.ts
@@ -13,10 +13,14 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Security_Common.DynamicConfig
+export type ResponseBody = Security_Common.DynamicConfig
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.get_dashboards_info.d.ts b/types/functions/security.get_dashboards_info.d.ts
index 90ca8d9c9..fe68d8d2e 100644
--- a/types/functions/security.get_dashboards_info.d.ts
+++ b/types/functions/security.get_dashboards_info.d.ts
@@ -13,10 +13,14 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Security_Common.DashboardsInfo
+export type ResponseBody = Security_Common.DashboardsInfo
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.get_distinguished_name.d.ts b/types/functions/security.get_distinguished_name.d.ts
index 793667f14..6fcf25204 100644
--- a/types/functions/security.get_distinguished_name.d.ts
+++ b/types/functions/security.get_distinguished_name.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -21,5 +22,8 @@ export interface Request extends Global.Params {
   show_all?: boolean;
 }
 
-export type Response = Security_Common.DistinguishedNames
+export type ResponseBody = Security_Common.DistinguishedNames
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.get_distinguished_names.d.ts b/types/functions/security.get_distinguished_names.d.ts
index fbd9e3039..1d9c022d9 100644
--- a/types/functions/security.get_distinguished_names.d.ts
+++ b/types/functions/security.get_distinguished_names.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   show_all?: boolean;
 }
 
-export type Response = Security_Common.DistinguishedNamesMap
+export type ResponseBody = Security_Common.DistinguishedNamesMap
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.get_permissions_info.d.ts b/types/functions/security.get_permissions_info.d.ts
index 42c736933..d5a0e1b58 100644
--- a/types/functions/security.get_permissions_info.d.ts
+++ b/types/functions/security.get_permissions_info.d.ts
@@ -13,10 +13,14 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Security_Common.PermissionsInfo
+export type ResponseBody = Security_Common.PermissionsInfo
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.get_role.d.ts b/types/functions/security.get_role.d.ts
index 585ae5dff..67a20aa93 100644
--- a/types/functions/security.get_role.d.ts
+++ b/types/functions/security.get_role.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   role: string;
 }
 
-export type Response = Security_Common.RolesMap
+export type ResponseBody = Security_Common.RolesMap
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.get_role_mapping.d.ts b/types/functions/security.get_role_mapping.d.ts
index f71bf51ba..a6510e669 100644
--- a/types/functions/security.get_role_mapping.d.ts
+++ b/types/functions/security.get_role_mapping.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   role: string;
 }
 
-export type Response = Security_Common.RoleMappings
+export type ResponseBody = Security_Common.RoleMappings
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.get_role_mappings.d.ts b/types/functions/security.get_role_mappings.d.ts
index 50841e728..8e1036556 100644
--- a/types/functions/security.get_role_mappings.d.ts
+++ b/types/functions/security.get_role_mappings.d.ts
@@ -13,10 +13,14 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Security_Common.RoleMappings
+export type ResponseBody = Security_Common.RoleMappings
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.get_roles.d.ts b/types/functions/security.get_roles.d.ts
index c720f54bf..44a5adb32 100644
--- a/types/functions/security.get_roles.d.ts
+++ b/types/functions/security.get_roles.d.ts
@@ -13,10 +13,14 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Security_Common.RolesMap
+export type ResponseBody = Security_Common.RolesMap
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.get_sslinfo.d.ts b/types/functions/security.get_sslinfo.d.ts
index f85c798fc..397a4cb41 100644
--- a/types/functions/security.get_sslinfo.d.ts
+++ b/types/functions/security.get_sslinfo.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   show_dn?: string;
 }
 
-export type Response = Security_Common.SSLInfo
+export type ResponseBody = Security_Common.SSLInfo
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.get_tenancy_config.d.ts b/types/functions/security.get_tenancy_config.d.ts
index 47f14d7e3..26771c622 100644
--- a/types/functions/security.get_tenancy_config.d.ts
+++ b/types/functions/security.get_tenancy_config.d.ts
@@ -13,10 +13,14 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Security_Common.MultiTenancyConfig
+export type ResponseBody = Security_Common.MultiTenancyConfig
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.get_tenant.d.ts b/types/functions/security.get_tenant.d.ts
index 5dae84bbc..41b003f72 100644
--- a/types/functions/security.get_tenant.d.ts
+++ b/types/functions/security.get_tenant.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   tenant: string;
 }
 
-export type Response = Security_Common.TenantsMap
+export type ResponseBody = Security_Common.TenantsMap
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.get_tenants.d.ts b/types/functions/security.get_tenants.d.ts
index 3537d357c..3bb7bc591 100644
--- a/types/functions/security.get_tenants.d.ts
+++ b/types/functions/security.get_tenants.d.ts
@@ -13,10 +13,14 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Security_Common.TenantsMap
+export type ResponseBody = Security_Common.TenantsMap
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.get_user.d.ts b/types/functions/security.get_user.d.ts
index 008d53f1e..85fa124ec 100644
--- a/types/functions/security.get_user.d.ts
+++ b/types/functions/security.get_user.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   username: string;
 }
 
-export type Response = Security_Common.UsersMap
+export type ResponseBody = Security_Common.UsersMap
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.get_user_legacy.d.ts b/types/functions/security.get_user_legacy.d.ts
index 008d53f1e..85fa124ec 100644
--- a/types/functions/security.get_user_legacy.d.ts
+++ b/types/functions/security.get_user_legacy.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   username: string;
 }
 
-export type Response = Security_Common.UsersMap
+export type ResponseBody = Security_Common.UsersMap
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.get_users.d.ts b/types/functions/security.get_users.d.ts
index 17d97fc8d..c3a28d3c6 100644
--- a/types/functions/security.get_users.d.ts
+++ b/types/functions/security.get_users.d.ts
@@ -13,10 +13,14 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Security_Common.UsersMap
+export type ResponseBody = Security_Common.UsersMap
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.get_users_legacy.d.ts b/types/functions/security.get_users_legacy.d.ts
index 17d97fc8d..c3a28d3c6 100644
--- a/types/functions/security.get_users_legacy.d.ts
+++ b/types/functions/security.get_users_legacy.d.ts
@@ -13,10 +13,14 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Security_Common.UsersMap
+export type ResponseBody = Security_Common.UsersMap
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.health.d.ts b/types/functions/security.health.d.ts
index 48fe9003e..14d57394a 100644
--- a/types/functions/security.health.d.ts
+++ b/types/functions/security.health.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   mode?: string;
 }
 
-export type Response = Security_Common.HealthInfo
+export type ResponseBody = Security_Common.HealthInfo
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.migrate.d.ts b/types/functions/security.migrate.d.ts
index e84a8583d..47d3f1b24 100644
--- a/types/functions/security.migrate.d.ts
+++ b/types/functions/security.migrate.d.ts
@@ -13,10 +13,14 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.patch_action_group.d.ts b/types/functions/security.patch_action_group.d.ts
index a85f59edc..6ea3405d2 100644
--- a/types/functions/security.patch_action_group.d.ts
+++ b/types/functions/security.patch_action_group.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -21,7 +22,10 @@ export interface Request extends Global.Params {
   body: RequestBody;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
 export type RequestBody = Security_Common.PatchOperation[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.patch_action_groups.d.ts b/types/functions/security.patch_action_groups.d.ts
index 5857dd401..18dd018ad 100644
--- a/types/functions/security.patch_action_groups.d.ts
+++ b/types/functions/security.patch_action_groups.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,7 +21,10 @@ export interface Request extends Global.Params {
   body: RequestBody;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
 export type RequestBody = Security_Common.PatchOperation[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.patch_allowlist.d.ts b/types/functions/security.patch_allowlist.d.ts
index 1a11053f7..e62128f50 100644
--- a/types/functions/security.patch_allowlist.d.ts
+++ b/types/functions/security.patch_allowlist.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,7 +21,10 @@ export interface Request extends Global.Params {
   body: RequestBody;
 }
 
-export type Response = Security_Common.AllowListConfig
+export type ResponseBody = Security_Common.AllowListConfig
 
 export type RequestBody = Security_Common.PatchOperation[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.patch_audit_configuration.d.ts b/types/functions/security.patch_audit_configuration.d.ts
index 5857dd401..18dd018ad 100644
--- a/types/functions/security.patch_audit_configuration.d.ts
+++ b/types/functions/security.patch_audit_configuration.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,7 +21,10 @@ export interface Request extends Global.Params {
   body: RequestBody;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
 export type RequestBody = Security_Common.PatchOperation[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.patch_configuration.d.ts b/types/functions/security.patch_configuration.d.ts
index 5857dd401..18dd018ad 100644
--- a/types/functions/security.patch_configuration.d.ts
+++ b/types/functions/security.patch_configuration.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,7 +21,10 @@ export interface Request extends Global.Params {
   body: RequestBody;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
 export type RequestBody = Security_Common.PatchOperation[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.patch_distinguished_name.d.ts b/types/functions/security.patch_distinguished_name.d.ts
index de331d606..0853688a0 100644
--- a/types/functions/security.patch_distinguished_name.d.ts
+++ b/types/functions/security.patch_distinguished_name.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -21,5 +22,8 @@ export interface Request extends Global.Params {
   cluster_name: string;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.patch_distinguished_names.d.ts b/types/functions/security.patch_distinguished_names.d.ts
index 5857dd401..18dd018ad 100644
--- a/types/functions/security.patch_distinguished_names.d.ts
+++ b/types/functions/security.patch_distinguished_names.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,7 +21,10 @@ export interface Request extends Global.Params {
   body: RequestBody;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
 export type RequestBody = Security_Common.PatchOperation[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.patch_role.d.ts b/types/functions/security.patch_role.d.ts
index f26cf3696..157667837 100644
--- a/types/functions/security.patch_role.d.ts
+++ b/types/functions/security.patch_role.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -21,7 +22,10 @@ export interface Request extends Global.Params {
   role: string;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
 export type RequestBody = Security_Common.PatchOperation[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.patch_role_mapping.d.ts b/types/functions/security.patch_role_mapping.d.ts
index f26cf3696..157667837 100644
--- a/types/functions/security.patch_role_mapping.d.ts
+++ b/types/functions/security.patch_role_mapping.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -21,7 +22,10 @@ export interface Request extends Global.Params {
   role: string;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
 export type RequestBody = Security_Common.PatchOperation[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.patch_role_mappings.d.ts b/types/functions/security.patch_role_mappings.d.ts
index 5857dd401..18dd018ad 100644
--- a/types/functions/security.patch_role_mappings.d.ts
+++ b/types/functions/security.patch_role_mappings.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,7 +21,10 @@ export interface Request extends Global.Params {
   body: RequestBody;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
 export type RequestBody = Security_Common.PatchOperation[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.patch_roles.d.ts b/types/functions/security.patch_roles.d.ts
index 5857dd401..18dd018ad 100644
--- a/types/functions/security.patch_roles.d.ts
+++ b/types/functions/security.patch_roles.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,7 +21,10 @@ export interface Request extends Global.Params {
   body: RequestBody;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
 export type RequestBody = Security_Common.PatchOperation[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.patch_tenant.d.ts b/types/functions/security.patch_tenant.d.ts
index dcd89d87c..d17f62be7 100644
--- a/types/functions/security.patch_tenant.d.ts
+++ b/types/functions/security.patch_tenant.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -21,7 +22,10 @@ export interface Request extends Global.Params {
   tenant: string;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
 export type RequestBody = Security_Common.PatchOperation[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.patch_tenants.d.ts b/types/functions/security.patch_tenants.d.ts
index 5857dd401..18dd018ad 100644
--- a/types/functions/security.patch_tenants.d.ts
+++ b/types/functions/security.patch_tenants.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,7 +21,10 @@ export interface Request extends Global.Params {
   body: RequestBody;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
 export type RequestBody = Security_Common.PatchOperation[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.patch_user.d.ts b/types/functions/security.patch_user.d.ts
index 13d8c2808..5a47599bf 100644
--- a/types/functions/security.patch_user.d.ts
+++ b/types/functions/security.patch_user.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -21,7 +22,10 @@ export interface Request extends Global.Params {
   username: string;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
 export type RequestBody = Security_Common.PatchOperation[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.patch_users.d.ts b/types/functions/security.patch_users.d.ts
index 5857dd401..18dd018ad 100644
--- a/types/functions/security.patch_users.d.ts
+++ b/types/functions/security.patch_users.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,7 +21,10 @@ export interface Request extends Global.Params {
   body: RequestBody;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
 export type RequestBody = Security_Common.PatchOperation[]
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.post_dashboards_info.d.ts b/types/functions/security.post_dashboards_info.d.ts
index e8fd8f692..0a01c02c2 100644
--- a/types/functions/security.post_dashboards_info.d.ts
+++ b/types/functions/security.post_dashboards_info.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   body?: Security_Common.DashboardsInfo;
 }
 
-export type Response = Security_Common.DashboardsInfo
+export type ResponseBody = Security_Common.DashboardsInfo
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.reload_http_certificates.d.ts b/types/functions/security.reload_http_certificates.d.ts
index e84a8583d..47d3f1b24 100644
--- a/types/functions/security.reload_http_certificates.d.ts
+++ b/types/functions/security.reload_http_certificates.d.ts
@@ -13,10 +13,14 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.reload_transport_certificates.d.ts b/types/functions/security.reload_transport_certificates.d.ts
index e84a8583d..47d3f1b24 100644
--- a/types/functions/security.reload_transport_certificates.d.ts
+++ b/types/functions/security.reload_transport_certificates.d.ts
@@ -13,10 +13,14 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.tenant_info.d.ts b/types/functions/security.tenant_info.d.ts
index 50398cb29..b3f714779 100644
--- a/types/functions/security.tenant_info.d.ts
+++ b/types/functions/security.tenant_info.d.ts
@@ -13,10 +13,14 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Security_Common.TenantInfo
+export type ResponseBody = Security_Common.TenantInfo
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.update_audit_configuration.d.ts b/types/functions/security.update_audit_configuration.d.ts
index c89440f0c..ab0668a91 100644
--- a/types/functions/security.update_audit_configuration.d.ts
+++ b/types/functions/security.update_audit_configuration.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   body: Security_Common.AuditConfig;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.update_configuration.d.ts b/types/functions/security.update_configuration.d.ts
index eb06ee840..23cbdfaa3 100644
--- a/types/functions/security.update_configuration.d.ts
+++ b/types/functions/security.update_configuration.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   body: Security_Common.DynamicConfig;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.update_distinguished_name.d.ts b/types/functions/security.update_distinguished_name.d.ts
index de331d606..0853688a0 100644
--- a/types/functions/security.update_distinguished_name.d.ts
+++ b/types/functions/security.update_distinguished_name.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -21,5 +22,8 @@ export interface Request extends Global.Params {
   cluster_name: string;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.validate.d.ts b/types/functions/security.validate.d.ts
index 43c16c2b2..a90b43c9b 100644
--- a/types/functions/security.validate.d.ts
+++ b/types/functions/security.validate.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   accept_invalid?: boolean;
 }
 
-export type Response = Security_Common.Ok
+export type ResponseBody = Security_Common.Ok
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.who_am_i.d.ts b/types/functions/security.who_am_i.d.ts
index 4b2b90a2f..ae7e7dee4 100644
--- a/types/functions/security.who_am_i.d.ts
+++ b/types/functions/security.who_am_i.d.ts
@@ -13,10 +13,14 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Security_Common.WhoAmI
+export type ResponseBody = Security_Common.WhoAmI
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/security.who_am_i_protected.d.ts b/types/functions/security.who_am_i_protected.d.ts
index 4b2b90a2f..ae7e7dee4 100644
--- a/types/functions/security.who_am_i_protected.d.ts
+++ b/types/functions/security.who_am_i_protected.d.ts
@@ -13,10 +13,14 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Security_Common from '../components/security._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Security_Common.WhoAmI
+export type ResponseBody = Security_Common.WhoAmI
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/snapshot.cleanup_repository.d.ts b/types/functions/snapshot.cleanup_repository.d.ts
index 5d4216407..00c034a85 100644
--- a/types/functions/snapshot.cleanup_repository.d.ts
+++ b/types/functions/snapshot.cleanup_repository.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Snapshot_CleanupRepository from '../components/snapshot.cleanup_repository'
@@ -24,7 +25,10 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export interface Response {
+export interface ResponseBody {
   results: Snapshot_CleanupRepository.CleanupRepositoryResults;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/snapshot.clone.d.ts b/types/functions/snapshot.clone.d.ts
index 9c33838c4..e5a76b5d4 100644
--- a/types/functions/snapshot.clone.d.ts
+++ b/types/functions/snapshot.clone.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -25,9 +26,12 @@ export interface Request extends Global.Params {
   target_snapshot: Common.Name;
 }
 
-export type Response = Common.AcknowledgedResponseBase
+export type ResponseBody = Common.AcknowledgedResponseBase
 
 export interface RequestBody {
   indices: string;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/snapshot.create.d.ts b/types/functions/snapshot.create.d.ts
index 19c40e845..b947e58d6 100644
--- a/types/functions/snapshot.create.d.ts
+++ b/types/functions/snapshot.create.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Snapshot_Common from '../components/snapshot._common'
@@ -26,7 +27,7 @@ export interface Request extends Global.Params {
   wait_for_completion?: boolean;
 }
 
-export interface Response {
+export interface ResponseBody {
   accepted?: boolean;
   snapshot?: Snapshot_Common.SnapshotInfo;
 }
@@ -40,3 +41,6 @@ export interface RequestBody {
   partial?: boolean;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/snapshot.create_repository.d.ts b/types/functions/snapshot.create_repository.d.ts
index 6042c0b69..48fbf56da 100644
--- a/types/functions/snapshot.create_repository.d.ts
+++ b/types/functions/snapshot.create_repository.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Snapshot_Common from '../components/snapshot._common'
@@ -26,7 +27,7 @@ export interface Request extends Global.Params {
   verify?: boolean;
 }
 
-export type Response = Common.AcknowledgedResponseBase
+export type ResponseBody = Common.AcknowledgedResponseBase
 
 export interface RequestBody {
   repository?: Snapshot_Common.Repository;
@@ -34,3 +35,6 @@ export interface RequestBody {
   type: string;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/snapshot.delete.d.ts b/types/functions/snapshot.delete.d.ts
index 2fe84270c..9c2cfa96a 100644
--- a/types/functions/snapshot.delete.d.ts
+++ b/types/functions/snapshot.delete.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -23,5 +24,8 @@ export interface Request extends Global.Params {
   snapshot: Common.Name;
 }
 
-export type Response = Common.AcknowledgedResponseBase
+export type ResponseBody = Common.AcknowledgedResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/snapshot.delete_repository.d.ts b/types/functions/snapshot.delete_repository.d.ts
index 6c58854f7..40229c673 100644
--- a/types/functions/snapshot.delete_repository.d.ts
+++ b/types/functions/snapshot.delete_repository.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -23,5 +24,8 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export type Response = Common.AcknowledgedResponseBase
+export type ResponseBody = Common.AcknowledgedResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/snapshot.get.d.ts b/types/functions/snapshot.get.d.ts
index 9bc74db72..cfba39435 100644
--- a/types/functions/snapshot.get.d.ts
+++ b/types/functions/snapshot.get.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Snapshot_Get from '../components/snapshot.get'
@@ -27,10 +28,13 @@ export interface Request extends Global.Params {
   verbose?: boolean;
 }
 
-export interface Response {
+export interface ResponseBody {
   remaining: number;
   responses?: Snapshot_Get.SnapshotResponseItem[];
   snapshots?: Snapshot_Common.SnapshotInfo[];
   total: number;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/snapshot.get_repository.d.ts b/types/functions/snapshot.get_repository.d.ts
index db34df927..a5542ea5e 100644
--- a/types/functions/snapshot.get_repository.d.ts
+++ b/types/functions/snapshot.get_repository.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Snapshot_Common from '../components/snapshot._common'
@@ -24,5 +25,8 @@ export interface Request extends Global.Params {
   repository?: Common.Names;
 }
 
-export type Response = Record<string, Snapshot_Common.Repository>
+export type ResponseBody = Record<string, Snapshot_Common.Repository>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/snapshot.restore.d.ts b/types/functions/snapshot.restore.d.ts
index aa751b9ab..71720cc86 100644
--- a/types/functions/snapshot.restore.d.ts
+++ b/types/functions/snapshot.restore.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Snapshot_Restore from '../components/snapshot.restore'
@@ -27,7 +28,7 @@ export interface Request extends Global.Params {
   wait_for_completion?: boolean;
 }
 
-export interface Response {
+export interface ResponseBody {
   snapshot: Snapshot_Restore.SnapshotRestore;
 }
 
@@ -44,3 +45,6 @@ export interface RequestBody {
   rename_replacement?: string;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/snapshot.status.d.ts b/types/functions/snapshot.status.d.ts
index 80b101712..05006e0c4 100644
--- a/types/functions/snapshot.status.d.ts
+++ b/types/functions/snapshot.status.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Snapshot_Common from '../components/snapshot._common'
@@ -25,7 +26,10 @@ export interface Request extends Global.Params {
   snapshot?: Common.Names;
 }
 
-export interface Response {
+export interface ResponseBody {
   snapshots: Snapshot_Common.Status[];
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/snapshot.verify_repository.d.ts b/types/functions/snapshot.verify_repository.d.ts
index c4ae1b69f..b3284fe9b 100644
--- a/types/functions/snapshot.verify_repository.d.ts
+++ b/types/functions/snapshot.verify_repository.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Snapshot_VerifyRepository from '../components/snapshot.verify_repository'
@@ -24,7 +25,10 @@ export interface Request extends Global.Params {
   timeout?: Common.Duration;
 }
 
-export interface Response {
+export interface ResponseBody {
   nodes: Record<string, Snapshot_VerifyRepository.CompactNodeInfo>;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/sql.close.d.ts b/types/functions/sql.close.d.ts
index 8d3bafeb9..583d0d184 100644
--- a/types/functions/sql.close.d.ts
+++ b/types/functions/sql.close.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Sql_Common from '../components/sql._common'
 
@@ -22,5 +23,8 @@ export interface Request extends Global.Params {
   sanitize?: boolean;
 }
 
-export type Response = Sql_Common.SqlCloseResponse
+export type ResponseBody = Sql_Common.SqlCloseResponse
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/sql.explain.d.ts b/types/functions/sql.explain.d.ts
index b895e4e40..e4445af1c 100644
--- a/types/functions/sql.explain.d.ts
+++ b/types/functions/sql.explain.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Sql_Common from '../components/sql._common'
 
@@ -22,5 +23,8 @@ export interface Request extends Global.Params {
   sanitize?: boolean;
 }
 
-export type Response = Sql_Common.ExplainResponse
+export type ResponseBody = Sql_Common.ExplainResponse
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/sql.get_stats.d.ts b/types/functions/sql.get_stats.d.ts
index 6d61188f5..ce8297fba 100644
--- a/types/functions/sql.get_stats.d.ts
+++ b/types/functions/sql.get_stats.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 
 export interface Request extends Global.Params {
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   sanitize?: boolean;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/sql.post_stats.d.ts b/types/functions/sql.post_stats.d.ts
index 9eca752b6..b6c9f2d75 100644
--- a/types/functions/sql.post_stats.d.ts
+++ b/types/functions/sql.post_stats.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Sql_Common from '../components/sql._common'
 
@@ -22,5 +23,8 @@ export interface Request extends Global.Params {
   sanitize?: boolean;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/sql.query.d.ts b/types/functions/sql.query.d.ts
index 881a2da61..22db1a9aa 100644
--- a/types/functions/sql.query.d.ts
+++ b/types/functions/sql.query.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Sql_Common from '../components/sql._common'
 
@@ -22,5 +23,8 @@ export interface Request extends Global.Params {
   sanitize?: boolean;
 }
 
-export type Response = Sql_Common.QueryResponse
+export type ResponseBody = Sql_Common.QueryResponse
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/sql.settings.d.ts b/types/functions/sql.settings.d.ts
index 35c4d2488..64b187a23 100644
--- a/types/functions/sql.settings.d.ts
+++ b/types/functions/sql.settings.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Sql_Common from '../components/sql._common'
 
@@ -21,7 +22,10 @@ export interface Request extends Global.Params {
   format?: string;
 }
 
-export type Response = Sql_Common.SqlSettingsResponse
+export type ResponseBody = Sql_Common.SqlSettingsResponse
 
 export type RequestBody = Sql_Common.SqlSettingsPlain | Sql_Common.SqlSettings
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/tasks.cancel.d.ts b/types/functions/tasks.cancel.d.ts
index 8275cb78d..a1a85214c 100644
--- a/types/functions/tasks.cancel.d.ts
+++ b/types/functions/tasks.cancel.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Tasks_Common from '../components/tasks._common'
@@ -25,5 +26,8 @@ export interface Request extends Global.Params {
   wait_for_completion?: boolean;
 }
 
-export type Response = Tasks_Common.TaskListResponseBase
+export type ResponseBody = Tasks_Common.TaskListResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/tasks.get.d.ts b/types/functions/tasks.get.d.ts
index 94ac9aed2..2cc36a16a 100644
--- a/types/functions/tasks.get.d.ts
+++ b/types/functions/tasks.get.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Tasks_Common from '../components/tasks._common'
@@ -23,10 +24,13 @@ export interface Request extends Global.Params {
   wait_for_completion?: boolean;
 }
 
-export interface Response {
+export interface ResponseBody {
   completed: boolean;
   error?: Common.ErrorCause;
   response?: Record<string, any>;
   task: Tasks_Common.TaskInfo;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/tasks.list.d.ts b/types/functions/tasks.list.d.ts
index 0f87cba01..5f7c580b5 100644
--- a/types/functions/tasks.list.d.ts
+++ b/types/functions/tasks.list.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Tasks_Common from '../components/tasks._common'
 import * as Common from '../components/_common'
@@ -27,5 +28,8 @@ export interface Request extends Global.Params {
   wait_for_completion?: boolean;
 }
 
-export type Response = Tasks_Common.TaskListResponseBase
+export type ResponseBody = Tasks_Common.TaskListResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/termvectors.d.ts b/types/functions/termvectors.d.ts
index 29afe296a..c26241a04 100644
--- a/types/functions/termvectors.d.ts
+++ b/types/functions/termvectors.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Core_Termvectors from '../components/_core.termvectors'
@@ -34,7 +35,7 @@ export interface Request extends Global.Params {
   version_type?: Common.VersionType;
 }
 
-export interface Response {
+export interface ResponseBody {
   _id: Common.Id;
   _index: Common.IndexName;
   _version: Common.VersionNumber;
@@ -49,3 +50,6 @@ export interface RequestBody {
   per_field_analyzer?: Record<string, string>;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/transforms.delete.d.ts b/types/functions/transforms.delete.d.ts
index 19b8a0a4b..b031235f0 100644
--- a/types/functions/transforms.delete.d.ts
+++ b/types/functions/transforms.delete.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   id: Common.Id;
 }
 
-export type Response = Record<string, any>
+export type ResponseBody = Record<string, any>
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/transforms.explain.d.ts b/types/functions/transforms.explain.d.ts
index 4c78a965b..8e69cde5d 100644
--- a/types/functions/transforms.explain.d.ts
+++ b/types/functions/transforms.explain.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Transforms_Common from '../components/transforms._common'
@@ -21,5 +22,8 @@ export interface Request extends Global.Params {
   id: Common.Id;
 }
 
-export type Response = Transforms_Common.ExplainResponse
+export type ResponseBody = Transforms_Common.ExplainResponse
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/transforms.get.d.ts b/types/functions/transforms.get.d.ts
index 4d1f6c6c1..057f6e594 100644
--- a/types/functions/transforms.get.d.ts
+++ b/types/functions/transforms.get.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Transforms_Common from '../components/transforms._common'
@@ -21,5 +22,8 @@ export interface Request extends Global.Params {
   id: Common.Id;
 }
 
-export type Response = Transforms_Common.TransformEntity
+export type ResponseBody = Transforms_Common.TransformEntity
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/transforms.preview.d.ts b/types/functions/transforms.preview.d.ts
index 45fcf3cfc..210b7214d 100644
--- a/types/functions/transforms.preview.d.ts
+++ b/types/functions/transforms.preview.d.ts
@@ -13,10 +13,14 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Transforms_Common from '../components/transforms._common'
 
 export type Request = Global.Params & Record<string, any>
 
-export type Response = Transforms_Common.Preview
+export type ResponseBody = Transforms_Common.Preview
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/transforms.put.d.ts b/types/functions/transforms.put.d.ts
index 2141b46ae..bcaa3f131 100644
--- a/types/functions/transforms.put.d.ts
+++ b/types/functions/transforms.put.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Transforms_Common from '../components/transforms._common'
 import * as Common from '../components/_common'
@@ -24,5 +25,8 @@ export interface Request extends Global.Params {
   if_seq_no?: Common.SequenceNumber;
 }
 
-export type Response = Transforms_Common.TransformEntity
+export type ResponseBody = Transforms_Common.TransformEntity
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/transforms.search.d.ts b/types/functions/transforms.search.d.ts
index 00fe11460..7e502521c 100644
--- a/types/functions/transforms.search.d.ts
+++ b/types/functions/transforms.search.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Transforms_Common from '../components/transforms._common'
 
@@ -24,5 +25,8 @@ export interface Request extends Global.Params {
   sortField?: string;
 }
 
-export type Response = Transforms_Common.TransformsResponse
+export type ResponseBody = Transforms_Common.TransformsResponse
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/transforms.start.d.ts b/types/functions/transforms.start.d.ts
index 8978978e9..9611387da 100644
--- a/types/functions/transforms.start.d.ts
+++ b/types/functions/transforms.start.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   id: Common.Id;
 }
 
-export type Response = Common.AcknowledgedResponseBase
+export type ResponseBody = Common.AcknowledgedResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/transforms.stop.d.ts b/types/functions/transforms.stop.d.ts
index 8978978e9..9611387da 100644
--- a/types/functions/transforms.stop.d.ts
+++ b/types/functions/transforms.stop.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 
@@ -20,5 +21,8 @@ export interface Request extends Global.Params {
   id: Common.Id;
 }
 
-export type Response = Common.AcknowledgedResponseBase
+export type ResponseBody = Common.AcknowledgedResponseBase
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/update.d.ts b/types/functions/update.d.ts
index aa6c76c31..a0067d2e2 100644
--- a/types/functions/update.d.ts
+++ b/types/functions/update.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Core_Search from '../components/_core.search'
 import * as Common from '../components/_common'
@@ -36,7 +37,7 @@ export interface Request extends Global.Params {
   wait_for_active_shards?: Common.WaitForActiveShards;
 }
 
-export type Response = Core_Update.UpdateWriteResponseBase
+export type ResponseBody = Core_Update.UpdateWriteResponseBase
 
 export interface RequestBody {
   _source?: Core_Search.SourceConfig;
@@ -48,3 +49,6 @@ export interface RequestBody {
   upsert?: Record<string, any>;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/update_by_query.d.ts b/types/functions/update_by_query.d.ts
index fe257d8e7..fb49b42d4 100644
--- a/types/functions/update_by_query.d.ts
+++ b/types/functions/update_by_query.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Common_QueryDsl from '../components/_common.query_dsl'
@@ -56,7 +57,7 @@ export interface Request extends Global.Params {
   wait_for_completion?: boolean;
 }
 
-export interface Response {
+export interface ResponseBody {
   batches?: number;
   deleted?: number;
   failures?: Common.BulkIndexByScrollFailure[];
@@ -83,3 +84,6 @@ export interface RequestBody {
   slice?: Common.SlicedScroll;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}
diff --git a/types/functions/update_by_query_rethrottle.d.ts b/types/functions/update_by_query_rethrottle.d.ts
index c4d0e16a1..fe53b2b74 100644
--- a/types/functions/update_by_query_rethrottle.d.ts
+++ b/types/functions/update_by_query_rethrottle.d.ts
@@ -13,6 +13,7 @@
  * the API generator.
  */
 
+import { ApiResponse } from '../../lib/Transport'
 import * as Global from '../components/_global'
 import * as Common from '../components/_common'
 import * as Core_UpdateByQueryRethrottle from '../components/_core.update_by_query_rethrottle'
@@ -22,7 +23,10 @@ export interface Request extends Global.Params {
   task_id: Common.Id;
 }
 
-export interface Response {
+export interface ResponseBody {
   nodes: Record<string, Core_UpdateByQueryRethrottle.UpdateByQueryRethrottleNode>;
 }
 
+export interface Response extends ApiResponse {
+  body: ResponseBody
+}