diff --git a/elasticsearch-api/Gemfile b/elasticsearch-api/Gemfile
index 74ca453845..646b01d6b4 100644
--- a/elasticsearch-api/Gemfile
+++ b/elasticsearch-api/Gemfile
@@ -33,3 +33,6 @@ group :development do
     gem 'pry-byebug'
   end
 end
+
+gem 'elastic-transport', git: 'git@github.com:estolfo/elastic-transport-ruby.git', branch: 'otel-instrumentation'
+gem 'opentelemetry-sdk'
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/async_search/delete.rb b/elasticsearch-api/lib/elasticsearch/api/actions/async_search/delete.rb
index 2d48e84bcd..cd7a19a945 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/async_search/delete.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/async_search/delete.rb
@@ -34,6 +34,13 @@ def delete(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "async_search.delete" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def delete(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/async_search/get.rb b/elasticsearch-api/lib/elasticsearch/api/actions/async_search/get.rb
index 98e0940929..a201e59703 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/async_search/get.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/async_search/get.rb
@@ -37,6 +37,13 @@ def get(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "async_search.get" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -47,7 +54,7 @@ def get(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/async_search/status.rb b/elasticsearch-api/lib/elasticsearch/api/actions/async_search/status.rb
index 842771be0d..b7d6f4b75f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/async_search/status.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/async_search/status.rb
@@ -34,6 +34,13 @@ def status(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "async_search.status" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def status(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/async_search/submit.rb b/elasticsearch-api/lib/elasticsearch/api/actions/async_search/submit.rb
index 6ef7381cf4..3e7ccad886 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/async_search/submit.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/async_search/submit.rb
@@ -74,6 +74,13 @@ module Actions
         def submit(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "async_search.submit" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = arguments.delete(:body)
 
@@ -88,7 +95,7 @@ def submit(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/autoscaling/delete_autoscaling_policy.rb b/elasticsearch-api/lib/elasticsearch/api/actions/autoscaling/delete_autoscaling_policy.rb
index 1f0960a0cf..0733e660cd 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/autoscaling/delete_autoscaling_policy.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/autoscaling/delete_autoscaling_policy.rb
@@ -34,6 +34,13 @@ def delete_autoscaling_policy(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "autoscaling.delete_autoscaling_policy" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def delete_autoscaling_policy(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/autoscaling/get_autoscaling_capacity.rb b/elasticsearch-api/lib/elasticsearch/api/actions/autoscaling/get_autoscaling_capacity.rb
index ed2d383bec..cc1b14dc91 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/autoscaling/get_autoscaling_capacity.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/autoscaling/get_autoscaling_capacity.rb
@@ -31,6 +31,7 @@ module Actions
         def get_autoscaling_capacity(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "autoscaling.get_autoscaling_capacity" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def get_autoscaling_capacity(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/autoscaling/get_autoscaling_policy.rb b/elasticsearch-api/lib/elasticsearch/api/actions/autoscaling/get_autoscaling_policy.rb
index e4dfa1782d..2766b005c2 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/autoscaling/get_autoscaling_policy.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/autoscaling/get_autoscaling_policy.rb
@@ -34,6 +34,13 @@ def get_autoscaling_policy(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "autoscaling.get_autoscaling_policy" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def get_autoscaling_policy(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/autoscaling/put_autoscaling_policy.rb b/elasticsearch-api/lib/elasticsearch/api/actions/autoscaling/put_autoscaling_policy.rb
index f13afffc89..1ccaab0f50 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/autoscaling/put_autoscaling_policy.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/autoscaling/put_autoscaling_policy.rb
@@ -36,6 +36,13 @@ def put_autoscaling_policy(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "autoscaling.put_autoscaling_policy" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -46,7 +53,7 @@ def put_autoscaling_policy(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/bulk.rb b/elasticsearch-api/lib/elasticsearch/api/actions/bulk.rb
index bd4b706ba2..c4493e2d70 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/bulk.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/bulk.rb
@@ -45,6 +45,13 @@ def bulk(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "bulk" }
+
+        defined_params = ["index"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body   = arguments.delete(:body)
 
@@ -66,7 +73,7 @@ def bulk(arguments = {})
 
         headers.merge!("Content-Type" => "application/x-ndjson")
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, payload, headers)
+          perform_request(method, path, params, payload, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/aliases.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/aliases.rb
index 6aeba66637..07ff8e7767 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/aliases.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/aliases.rb
@@ -39,6 +39,13 @@ module Actions
         def aliases(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.aliases" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -54,7 +61,7 @@ def aliases(arguments = {})
           params[:h] = Utils.__listify(params[:h]) if params[:h]
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/allocation.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/allocation.rb
index ff7aba8654..61133e922f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/allocation.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/allocation.rb
@@ -40,6 +40,13 @@ module Actions
         def allocation(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.allocation" }
+
+          defined_params = ["node_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -55,7 +62,7 @@ def allocation(arguments = {})
           params[:h] = Utils.__listify(params[:h]) if params[:h]
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/component_templates.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/component_templates.rb
index 79c56e02d0..6fbcc3016a 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/component_templates.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/component_templates.rb
@@ -39,6 +39,13 @@ module Actions
         def component_templates(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.component_templates" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -53,7 +60,7 @@ def component_templates(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/count.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/count.rb
index da96e79935..b731494db4 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/count.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/count.rb
@@ -37,6 +37,13 @@ module Actions
         def count(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.count" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -52,7 +59,7 @@ def count(arguments = {})
           params[:h] = Utils.__listify(params[:h]) if params[:h]
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/fielddata.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/fielddata.rb
index cedc5d89a8..bdf3f20998 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/fielddata.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/fielddata.rb
@@ -38,6 +38,13 @@ module Actions
         def fielddata(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.fielddata" }
+
+          defined_params = ["fields"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -52,7 +59,7 @@ def fielddata(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/health.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/health.rb
index b85a478441..b340111312 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/health.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/health.rb
@@ -38,6 +38,7 @@ module Actions
         def health(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.health" }
 
           body   = nil
 
@@ -47,7 +48,7 @@ def health(arguments = {})
           params[:h] = Utils.__listify(params[:h]) if params[:h]
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/help.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/help.rb
index e8690abbab..cb639af4ee 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/help.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/help.rb
@@ -33,6 +33,7 @@ module Actions
         def help(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.help" }
 
           body   = nil
 
@@ -41,7 +42,7 @@ def help(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/indices.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/indices.rb
index 026de0e783..eb7ddc2737 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/indices.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/indices.rb
@@ -44,6 +44,13 @@ module Actions
         def indices(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.indices" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -59,7 +66,7 @@ def indices(arguments = {})
           params[:h] = Utils.__listify(params[:h]) if params[:h]
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/master.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/master.rb
index 92df41d96e..80138a7e83 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/master.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/master.rb
@@ -38,6 +38,7 @@ module Actions
         def master(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.master" }
 
           body   = nil
 
@@ -46,7 +47,7 @@ def master(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/ml_data_frame_analytics.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/ml_data_frame_analytics.rb
index dfaa649b2d..7dddd05810 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/ml_data_frame_analytics.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/ml_data_frame_analytics.rb
@@ -40,6 +40,13 @@ module Actions
         def ml_data_frame_analytics(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.ml_data_frame_analytics" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -54,7 +61,7 @@ def ml_data_frame_analytics(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/ml_datafeeds.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/ml_datafeeds.rb
index c2170b7efd..6020ac6b09 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/ml_datafeeds.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/ml_datafeeds.rb
@@ -39,6 +39,13 @@ module Actions
         def ml_datafeeds(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.ml_datafeeds" }
+
+          defined_params = ["datafeed_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -53,7 +60,7 @@ def ml_datafeeds(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/ml_jobs.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/ml_jobs.rb
index ceb6771691..264a0dc294 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/ml_jobs.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/ml_jobs.rb
@@ -40,6 +40,13 @@ module Actions
         def ml_jobs(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.ml_jobs" }
+
+          defined_params = ["job_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -54,7 +61,7 @@ def ml_jobs(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/ml_trained_models.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/ml_trained_models.rb
index fc206369cc..f681ad34a8 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/ml_trained_models.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/ml_trained_models.rb
@@ -42,6 +42,13 @@ module Actions
         def ml_trained_models(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.ml_trained_models" }
+
+          defined_params = ["model_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -56,7 +63,7 @@ def ml_trained_models(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/nodeattrs.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/nodeattrs.rb
index dbf07acb05..cc527dbf7a 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/nodeattrs.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/nodeattrs.rb
@@ -38,6 +38,7 @@ module Actions
         def nodeattrs(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.nodeattrs" }
 
           body   = nil
 
@@ -46,7 +47,7 @@ def nodeattrs(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/nodes.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/nodes.rb
index 47356741e8..aac2b15335 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/nodes.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/nodes.rb
@@ -41,6 +41,7 @@ module Actions
         def nodes(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.nodes" }
 
           body   = nil
 
@@ -50,7 +51,7 @@ def nodes(arguments = {})
           params[:h] = Utils.__listify(params[:h], escape: false) if params[:h]
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/pending_tasks.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/pending_tasks.rb
index 1d3dba91b7..1b202c1a79 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/pending_tasks.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/pending_tasks.rb
@@ -39,6 +39,7 @@ module Actions
         def pending_tasks(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.pending_tasks" }
 
           body   = nil
 
@@ -48,7 +49,7 @@ def pending_tasks(arguments = {})
           params[:h] = Utils.__listify(params[:h]) if params[:h]
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/plugins.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/plugins.rb
index 9dea6c0d31..add3fbb5fb 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/plugins.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/plugins.rb
@@ -39,6 +39,7 @@ module Actions
         def plugins(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.plugins" }
 
           body   = nil
 
@@ -47,7 +48,7 @@ def plugins(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/recovery.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/recovery.rb
index 445924eb78..fa21017b67 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/recovery.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/recovery.rb
@@ -41,6 +41,13 @@ module Actions
         def recovery(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.recovery" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -56,7 +63,7 @@ def recovery(arguments = {})
           params[:h] = Utils.__listify(params[:h]) if params[:h]
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/repositories.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/repositories.rb
index 1454d0b12c..e89ee660c5 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/repositories.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/repositories.rb
@@ -38,6 +38,7 @@ module Actions
         def repositories(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.repositories" }
 
           body   = nil
 
@@ -46,7 +47,7 @@ def repositories(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/segments.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/segments.rb
index 3deb0db3f0..d2101486e8 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/segments.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/segments.rb
@@ -38,6 +38,13 @@ module Actions
         def segments(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.segments" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -52,7 +59,7 @@ def segments(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/shards.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/shards.rb
index ccedb98ea7..2d748bd9cb 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/shards.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/shards.rb
@@ -40,6 +40,13 @@ module Actions
         def shards(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.shards" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -55,7 +62,7 @@ def shards(arguments = {})
           params[:h] = Utils.__listify(params[:h]) if params[:h]
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/snapshots.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/snapshots.rb
index 7f3e9f66d9..48b6808745 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/snapshots.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/snapshots.rb
@@ -40,6 +40,13 @@ module Actions
         def snapshots(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.snapshots" }
+
+          defined_params = ["repository"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -54,7 +61,7 @@ def snapshots(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/tasks.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/tasks.rb
index a40f6429b6..6ca3767694 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/tasks.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/tasks.rb
@@ -45,6 +45,7 @@ module Actions
         def tasks(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.tasks" }
 
           body   = nil
 
@@ -53,7 +54,7 @@ def tasks(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/templates.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/templates.rb
index afc0e72390..0f878d2e3f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/templates.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/templates.rb
@@ -39,6 +39,13 @@ module Actions
         def templates(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.templates" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -53,7 +60,7 @@ def templates(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/thread_pool.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/thread_pool.rb
index 3407cc92c7..5e3a1546ae 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/thread_pool.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/thread_pool.rb
@@ -41,6 +41,13 @@ module Actions
         def thread_pool(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.thread_pool" }
+
+          defined_params = ["thread_pool_patterns"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -56,7 +63,7 @@ def thread_pool(arguments = {})
           params[:h] = Utils.__listify(params[:h]) if params[:h]
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cat/transforms.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cat/transforms.rb
index 7414201f94..9e37b9d218 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cat/transforms.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cat/transforms.rb
@@ -41,6 +41,13 @@ module Actions
         def transforms(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cat.transforms" }
+
+          defined_params = ["transform_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -55,7 +62,7 @@ def transforms(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/clear_scroll.rb b/elasticsearch-api/lib/elasticsearch/api/actions/clear_scroll.rb
index d3e918a518..fe7e9d0819 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/clear_scroll.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/clear_scroll.rb
@@ -37,6 +37,13 @@ module Actions
       def clear_scroll(arguments = {})
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "clear_scroll" }
+
+        defined_params = ["scroll_id"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body = arguments.delete(:body)
 
@@ -53,12 +60,12 @@ def clear_scroll(arguments = {})
         if Array(arguments[:ignore]).include?(404)
           Utils.__rescue_from_not_found {
             Elasticsearch::API::Response.new(
-              perform_request(method, path, params, body, headers)
+              perform_request(method, path, params, body, headers, request_opts)
             )
           }
         else
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/close_point_in_time.rb b/elasticsearch-api/lib/elasticsearch/api/actions/close_point_in_time.rb
index b82d581896..9caae27240 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/close_point_in_time.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/close_point_in_time.rb
@@ -31,6 +31,7 @@ module Actions
       def close_point_in_time(arguments = {})
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "close_point_in_time" }
 
         body   = arguments.delete(:body)
 
@@ -39,7 +40,7 @@ def close_point_in_time(arguments = {})
         params = {}
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/allocation_explain.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/allocation_explain.rb
index d554b92c91..3d9d9714bb 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/allocation_explain.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/allocation_explain.rb
@@ -34,6 +34,7 @@ module Actions
         def allocation_explain(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cluster.allocation_explain" }
 
           body   = arguments.delete(:body)
 
@@ -47,7 +48,7 @@ def allocation_explain(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/delete_component_template.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/delete_component_template.rb
index caae9e6c07..bf72f66044 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/delete_component_template.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/delete_component_template.rb
@@ -36,6 +36,13 @@ def delete_component_template(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cluster.delete_component_template" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -46,7 +53,7 @@ def delete_component_template(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/delete_voting_config_exclusions.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/delete_voting_config_exclusions.rb
index 33b279e300..181b8adf60 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/delete_voting_config_exclusions.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/delete_voting_config_exclusions.rb
@@ -33,6 +33,7 @@ module Actions
         def delete_voting_config_exclusions(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cluster.delete_voting_config_exclusions" }
 
           body   = nil
 
@@ -41,7 +42,7 @@ def delete_voting_config_exclusions(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/exists_component_template.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/exists_component_template.rb
index 7e2289b508..f43946a51a 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/exists_component_template.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/exists_component_template.rb
@@ -36,6 +36,13 @@ def exists_component_template(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cluster.exists_component_template" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -46,7 +53,7 @@ def exists_component_template(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
 
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/get_component_template.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/get_component_template.rb
index 11dab29e49..d584748458 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/get_component_template.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/get_component_template.rb
@@ -35,6 +35,13 @@ module Actions
         def get_component_template(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cluster.get_component_template" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -49,7 +56,7 @@ def get_component_template(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/get_settings.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/get_settings.rb
index 02e72b246a..190b8fe129 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/get_settings.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/get_settings.rb
@@ -35,6 +35,7 @@ module Actions
         def get_settings(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cluster.get_settings" }
 
           body   = nil
 
@@ -43,7 +44,7 @@ def get_settings(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/health.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/health.rb
index 01e659b1c9..760aeb58ea 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/health.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/health.rb
@@ -43,6 +43,13 @@ module Actions
         def health(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cluster.health" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -57,7 +64,7 @@ def health(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/info.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/info.rb
index a501535c15..46638923d2 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/info.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/info.rb
@@ -34,6 +34,13 @@ def info(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cluster.info" }
+
+          defined_params = ["target"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def info(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/pending_tasks.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/pending_tasks.rb
index f8b556bc2b..0b5d2d80fb 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/pending_tasks.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/pending_tasks.rb
@@ -34,6 +34,7 @@ module Actions
         def pending_tasks(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cluster.pending_tasks" }
 
           body   = nil
 
@@ -42,7 +43,7 @@ def pending_tasks(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/post_voting_config_exclusions.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/post_voting_config_exclusions.rb
index 8901d8bc66..a1335e2924 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/post_voting_config_exclusions.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/post_voting_config_exclusions.rb
@@ -35,6 +35,7 @@ module Actions
         def post_voting_config_exclusions(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cluster.post_voting_config_exclusions" }
 
           body   = nil
 
@@ -43,7 +44,7 @@ def post_voting_config_exclusions(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/put_component_template.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/put_component_template.rb
index 330de203fe..6720350a4f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/put_component_template.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/put_component_template.rb
@@ -39,6 +39,13 @@ def put_component_template(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cluster.put_component_template" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -49,7 +56,7 @@ def put_component_template(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/put_settings.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/put_settings.rb
index aaec93ee7c..82501cc4cd 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/put_settings.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/put_settings.rb
@@ -37,6 +37,7 @@ def put_settings(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cluster.put_settings" }
 
           body = arguments.delete(:body) || {}
 
@@ -45,7 +46,7 @@ def put_settings(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/remote_info.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/remote_info.rb
index 1aadcdae48..31d7e78a85 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/remote_info.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/remote_info.rb
@@ -31,6 +31,7 @@ module Actions
         def remote_info(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cluster.remote_info" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def remote_info(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/reroute.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/reroute.rb
index 753ada1994..589aba7e49 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/reroute.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/reroute.rb
@@ -38,6 +38,7 @@ module Actions
         def reroute(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cluster.reroute" }
 
           body = arguments.delete(:body) || {}
 
@@ -46,7 +47,7 @@ def reroute(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/state.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/state.rb
index 56b0f07647..45444c344c 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/state.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/state.rb
@@ -41,6 +41,13 @@ module Actions
         def state(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cluster.state" }
+
+          defined_params = ["metric", "index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -59,7 +66,7 @@ def state(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/stats.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/stats.rb
index abb3424046..6f19a90a89 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cluster/stats.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cluster/stats.rb
@@ -34,6 +34,13 @@ module Actions
         def stats(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "cluster.stats" }
+
+          defined_params = ["node_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def stats(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/count.rb b/elasticsearch-api/lib/elasticsearch/api/actions/count.rb
index 7c66173d03..25fc06ddc3 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/count.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/count.rb
@@ -46,6 +46,13 @@ module Actions
       def count(arguments = {})
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "count" }
+
+        defined_params = ["index"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body   = arguments.delete(:body)
 
@@ -65,7 +72,7 @@ def count(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/delete_auto_follow_pattern.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/delete_auto_follow_pattern.rb
index 83fdb12e10..1efaa97e6d 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/delete_auto_follow_pattern.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/delete_auto_follow_pattern.rb
@@ -34,6 +34,13 @@ def delete_auto_follow_pattern(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ccr.delete_auto_follow_pattern" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def delete_auto_follow_pattern(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/follow.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/follow.rb
index 4f276f904d..092f25bf33 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/follow.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/follow.rb
@@ -37,6 +37,13 @@ def follow(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ccr.follow" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = arguments.delete(:body)
 
@@ -47,7 +54,7 @@ def follow(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/follow_info.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/follow_info.rb
index 8e79207d9e..437d098bab 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/follow_info.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/follow_info.rb
@@ -34,6 +34,13 @@ def follow_info(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ccr.follow_info" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -44,7 +51,7 @@ def follow_info(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/follow_stats.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/follow_stats.rb
index 26fb2c8718..2dfab17706 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/follow_stats.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/follow_stats.rb
@@ -34,6 +34,13 @@ def follow_stats(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ccr.follow_stats" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -44,7 +51,7 @@ def follow_stats(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/forget_follower.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/forget_follower.rb
index 89f2853ff7..6f5b9a8df2 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/forget_follower.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/forget_follower.rb
@@ -36,6 +36,13 @@ def forget_follower(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ccr.forget_follower" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = arguments.delete(:body)
 
@@ -46,7 +53,7 @@ def forget_follower(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/get_auto_follow_pattern.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/get_auto_follow_pattern.rb
index d6d2fb8b42..ec7978a2ca 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/get_auto_follow_pattern.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/get_auto_follow_pattern.rb
@@ -32,6 +32,13 @@ module Actions
         def get_auto_follow_pattern(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ccr.get_auto_follow_pattern" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -46,7 +53,7 @@ def get_auto_follow_pattern(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/pause_auto_follow_pattern.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/pause_auto_follow_pattern.rb
index 894c598491..514b102f26 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/pause_auto_follow_pattern.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/pause_auto_follow_pattern.rb
@@ -34,6 +34,13 @@ def pause_auto_follow_pattern(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ccr.pause_auto_follow_pattern" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def pause_auto_follow_pattern(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/pause_follow.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/pause_follow.rb
index f4bbb1eb78..2ef1e99126 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/pause_follow.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/pause_follow.rb
@@ -34,6 +34,13 @@ def pause_follow(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ccr.pause_follow" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -44,7 +51,7 @@ def pause_follow(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/put_auto_follow_pattern.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/put_auto_follow_pattern.rb
index dfa3b58798..baab1b10bf 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/put_auto_follow_pattern.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/put_auto_follow_pattern.rb
@@ -36,6 +36,13 @@ def put_auto_follow_pattern(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ccr.put_auto_follow_pattern" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -46,7 +53,7 @@ def put_auto_follow_pattern(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/resume_auto_follow_pattern.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/resume_auto_follow_pattern.rb
index e6b32f55bc..181fbab62f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/resume_auto_follow_pattern.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/resume_auto_follow_pattern.rb
@@ -34,6 +34,13 @@ def resume_auto_follow_pattern(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ccr.resume_auto_follow_pattern" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def resume_auto_follow_pattern(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/resume_follow.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/resume_follow.rb
index 82357e2a5d..e0e0efd1ba 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/resume_follow.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/resume_follow.rb
@@ -35,6 +35,13 @@ def resume_follow(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ccr.resume_follow" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = arguments.delete(:body)
 
@@ -45,7 +52,7 @@ def resume_follow(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/stats.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/stats.rb
index 10ebac4884..125d5f2e3c 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/stats.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/stats.rb
@@ -31,6 +31,7 @@ module Actions
         def stats(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ccr.stats" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def stats(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/unfollow.rb b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/unfollow.rb
index 9c411d82bc..50157a8b70 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/unfollow.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/cross_cluster_replication/unfollow.rb
@@ -34,6 +34,13 @@ def unfollow(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ccr.unfollow" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -44,7 +51,7 @@ def unfollow(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/dangling_indices/delete_dangling_index.rb b/elasticsearch-api/lib/elasticsearch/api/actions/dangling_indices/delete_dangling_index.rb
index 044a99de9f..47c5e91107 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/dangling_indices/delete_dangling_index.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/dangling_indices/delete_dangling_index.rb
@@ -37,6 +37,13 @@ def delete_dangling_index(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "dangling_indices.delete_dangling_index" }
+
+          defined_params = ["index_uuid"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -47,7 +54,7 @@ def delete_dangling_index(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/dangling_indices/import_dangling_index.rb b/elasticsearch-api/lib/elasticsearch/api/actions/dangling_indices/import_dangling_index.rb
index fb1c45a360..76ef73f54b 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/dangling_indices/import_dangling_index.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/dangling_indices/import_dangling_index.rb
@@ -37,6 +37,13 @@ def import_dangling_index(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "dangling_indices.import_dangling_index" }
+
+          defined_params = ["index_uuid"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -47,7 +54,7 @@ def import_dangling_index(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/dangling_indices/list_dangling_indices.rb b/elasticsearch-api/lib/elasticsearch/api/actions/dangling_indices/list_dangling_indices.rb
index 57a11e424a..3fe7bc68c7 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/dangling_indices/list_dangling_indices.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/dangling_indices/list_dangling_indices.rb
@@ -31,6 +31,7 @@ module Actions
         def list_dangling_indices(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "dangling_indices.list_dangling_indices" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def list_dangling_indices(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/delete.rb b/elasticsearch-api/lib/elasticsearch/api/actions/delete.rb
index 692ff9438d..5fd19e1e04 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/delete.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/delete.rb
@@ -43,6 +43,13 @@ def delete(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "delete" }
+
+        defined_params = ["index", "id"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body = nil
 
@@ -57,12 +64,12 @@ def delete(arguments = {})
         if Array(arguments[:ignore]).include?(404)
           Utils.__rescue_from_not_found {
             Elasticsearch::API::Response.new(
-              perform_request(method, path, params, body, headers)
+              perform_request(method, path, params, body, headers, request_opts)
             )
           }
         else
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/delete_by_query.rb b/elasticsearch-api/lib/elasticsearch/api/actions/delete_by_query.rb
index 00ab16999e..dd53073924 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/delete_by_query.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/delete_by_query.rb
@@ -64,6 +64,13 @@ def delete_by_query(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "delete_by_query" }
+
+        defined_params = ["index"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body   = arguments.delete(:body)
 
@@ -74,7 +81,7 @@ def delete_by_query(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/delete_by_query_rethrottle.rb b/elasticsearch-api/lib/elasticsearch/api/actions/delete_by_query_rethrottle.rb
index e7a43cdd19..f4b7e1718f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/delete_by_query_rethrottle.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/delete_by_query_rethrottle.rb
@@ -34,6 +34,13 @@ def delete_by_query_rethrottle(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "delete_by_query_rethrottle" }
+
+        defined_params = ["task_id"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body = nil
 
@@ -44,7 +51,7 @@ def delete_by_query_rethrottle(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/delete_script.rb b/elasticsearch-api/lib/elasticsearch/api/actions/delete_script.rb
index 0484619902..655b437083 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/delete_script.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/delete_script.rb
@@ -35,6 +35,13 @@ def delete_script(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "delete_script" }
+
+        defined_params = ["id"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body = nil
 
@@ -45,7 +52,7 @@ def delete_script(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/enrich/delete_policy.rb b/elasticsearch-api/lib/elasticsearch/api/actions/enrich/delete_policy.rb
index 8d2ea05fb5..4a24ed5369 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/enrich/delete_policy.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/enrich/delete_policy.rb
@@ -34,6 +34,13 @@ def delete_policy(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "enrich.delete_policy" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def delete_policy(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/enrich/execute_policy.rb b/elasticsearch-api/lib/elasticsearch/api/actions/enrich/execute_policy.rb
index b90e1f98b7..ca0045745c 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/enrich/execute_policy.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/enrich/execute_policy.rb
@@ -35,6 +35,13 @@ def execute_policy(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "enrich.execute_policy" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -45,7 +52,7 @@ def execute_policy(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/enrich/get_policy.rb b/elasticsearch-api/lib/elasticsearch/api/actions/enrich/get_policy.rb
index 273dda7de6..c247896923 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/enrich/get_policy.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/enrich/get_policy.rb
@@ -32,6 +32,13 @@ module Actions
         def get_policy(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "enrich.get_policy" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -46,7 +53,7 @@ def get_policy(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/enrich/put_policy.rb b/elasticsearch-api/lib/elasticsearch/api/actions/enrich/put_policy.rb
index 3ced98f637..764d35a57f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/enrich/put_policy.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/enrich/put_policy.rb
@@ -36,6 +36,13 @@ def put_policy(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "enrich.put_policy" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -46,7 +53,7 @@ def put_policy(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/enrich/stats.rb b/elasticsearch-api/lib/elasticsearch/api/actions/enrich/stats.rb
index 22828fa7b4..a502d3a175 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/enrich/stats.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/enrich/stats.rb
@@ -31,6 +31,7 @@ module Actions
         def stats(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "enrich.stats" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def stats(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/eql/delete.rb b/elasticsearch-api/lib/elasticsearch/api/actions/eql/delete.rb
index f793fcc5e9..dfcc21f7fb 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/eql/delete.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/eql/delete.rb
@@ -34,6 +34,13 @@ def delete(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "eql.delete" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def delete(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/eql/get.rb b/elasticsearch-api/lib/elasticsearch/api/actions/eql/get.rb
index a13ff1ec19..c56c76f546 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/eql/get.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/eql/get.rb
@@ -36,6 +36,13 @@ def get(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "eql.get" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -46,7 +53,7 @@ def get(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/eql/get_status.rb b/elasticsearch-api/lib/elasticsearch/api/actions/eql/get_status.rb
index 14eff8b8a6..1eaf3ae954 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/eql/get_status.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/eql/get_status.rb
@@ -34,6 +34,13 @@ def get_status(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "eql.get_status" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def get_status(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/eql/search.rb b/elasticsearch-api/lib/elasticsearch/api/actions/eql/search.rb
index c4c34384d8..47cd640055 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/eql/search.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/eql/search.rb
@@ -39,6 +39,13 @@ def search(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "eql.search" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = arguments.delete(:body)
 
@@ -49,7 +56,7 @@ def search(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/exists.rb b/elasticsearch-api/lib/elasticsearch/api/actions/exists.rb
index 8978685183..cc736631c3 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/exists.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/exists.rb
@@ -45,6 +45,13 @@ def exists(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "exists" }
+
+        defined_params = ["index", "id"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body = nil
 
@@ -57,7 +64,7 @@ def exists(arguments = {})
         params = Utils.process_params(arguments)
 
         Utils.__rescue_from_not_found do
-          perform_request(method, path, params, body, headers).status == 200 ? true : false
+          perform_request(method, path, params, body, headers, opts).status == 200 ? true : false
         end
       end
 
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/exists_source.rb b/elasticsearch-api/lib/elasticsearch/api/actions/exists_source.rb
index bfd168146b..753d449fb3 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/exists_source.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/exists_source.rb
@@ -44,6 +44,13 @@ def exists_source(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "exists_source" }
+
+        defined_params = ["index", "id"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body = nil
 
@@ -56,7 +63,7 @@ def exists_source(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
 
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/explain.rb b/elasticsearch-api/lib/elasticsearch/api/actions/explain.rb
index 6509cad3ce..e68c5bb2ef 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/explain.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/explain.rb
@@ -48,6 +48,13 @@ def explain(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "explain" }
+
+        defined_params = ["index", "id"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body = arguments.delete(:body)
 
@@ -65,7 +72,7 @@ def explain(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/features/get_features.rb b/elasticsearch-api/lib/elasticsearch/api/actions/features/get_features.rb
index 661c93ef45..87a758e228 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/features/get_features.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/features/get_features.rb
@@ -32,6 +32,7 @@ module Actions
         def get_features(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "features.get_features" }
 
           body   = nil
 
@@ -40,7 +41,7 @@ def get_features(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/features/reset_features.rb b/elasticsearch-api/lib/elasticsearch/api/actions/features/reset_features.rb
index 922eb32bf2..195f5d1cae 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/features/reset_features.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/features/reset_features.rb
@@ -35,6 +35,7 @@ module Actions
         def reset_features(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "features.reset_features" }
 
           body   = nil
 
@@ -43,7 +44,7 @@ def reset_features(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/field_caps.rb b/elasticsearch-api/lib/elasticsearch/api/actions/field_caps.rb
index 7ecb73e4bd..864bc88286 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/field_caps.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/field_caps.rb
@@ -39,6 +39,13 @@ module Actions
       def field_caps(arguments = {})
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "field_caps" }
+
+        defined_params = ["index"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body   = arguments.delete(:body)
 
@@ -58,7 +65,7 @@ def field_caps(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/fleet/global_checkpoints.rb b/elasticsearch-api/lib/elasticsearch/api/actions/fleet/global_checkpoints.rb
index 8130b9721c..390c425147 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/fleet/global_checkpoints.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/fleet/global_checkpoints.rb
@@ -38,6 +38,13 @@ def global_checkpoints(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "fleet.global_checkpoints" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -48,7 +55,7 @@ def global_checkpoints(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/fleet/msearch.rb b/elasticsearch-api/lib/elasticsearch/api/actions/fleet/msearch.rb
index 86fd9ac0ca..f1b9a17d46 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/fleet/msearch.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/fleet/msearch.rb
@@ -39,6 +39,13 @@ def msearch(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "fleet.msearch" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = arguments.delete(:body)
 
@@ -76,7 +83,7 @@ def msearch(arguments = {})
 
           headers.merge!("Content-Type" => "application/x-ndjson")
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, payload, headers)
+            perform_request(method, path, params, payload, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/fleet/search.rb b/elasticsearch-api/lib/elasticsearch/api/actions/fleet/search.rb
index 4f260bc66b..a6ca4547ee 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/fleet/search.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/fleet/search.rb
@@ -42,6 +42,13 @@ def search(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "fleet.search" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = arguments.delete(:body)
 
@@ -57,7 +64,7 @@ def search(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/get.rb b/elasticsearch-api/lib/elasticsearch/api/actions/get.rb
index fcf8c65e21..eb901213db 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/get.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/get.rb
@@ -46,6 +46,13 @@ def get(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "get" }
+
+        defined_params = ["index", "id"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body = nil
 
@@ -60,12 +67,12 @@ def get(arguments = {})
         if Array(arguments[:ignore]).include?(404)
           Utils.__rescue_from_not_found {
             Elasticsearch::API::Response.new(
-              perform_request(method, path, params, body, headers)
+              perform_request(method, path, params, body, headers, request_opts)
             )
           }
         else
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/get_script.rb b/elasticsearch-api/lib/elasticsearch/api/actions/get_script.rb
index 871d9b0972..d921ac1a2d 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/get_script.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/get_script.rb
@@ -34,6 +34,13 @@ def get_script(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "get_script" }
+
+        defined_params = ["id"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body = nil
 
@@ -44,7 +51,7 @@ def get_script(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/get_script_context.rb b/elasticsearch-api/lib/elasticsearch/api/actions/get_script_context.rb
index b76598d65e..e396f71218 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/get_script_context.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/get_script_context.rb
@@ -30,6 +30,7 @@ module Actions
       def get_script_context(arguments = {})
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "get_script_context" }
 
         body   = nil
 
@@ -38,7 +39,7 @@ def get_script_context(arguments = {})
         params = {}
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/get_script_languages.rb b/elasticsearch-api/lib/elasticsearch/api/actions/get_script_languages.rb
index 0a835aff70..35c6dfde20 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/get_script_languages.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/get_script_languages.rb
@@ -30,6 +30,7 @@ module Actions
       def get_script_languages(arguments = {})
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "get_script_languages" }
 
         body   = nil
 
@@ -38,7 +39,7 @@ def get_script_languages(arguments = {})
         params = {}
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/get_source.rb b/elasticsearch-api/lib/elasticsearch/api/actions/get_source.rb
index c2f645ca3f..d1b09f6416 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/get_source.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/get_source.rb
@@ -44,6 +44,13 @@ def get_source(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "get_source" }
+
+        defined_params = ["index", "id"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body = nil
 
@@ -56,7 +63,7 @@ def get_source(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/graph/explore.rb b/elasticsearch-api/lib/elasticsearch/api/actions/graph/explore.rb
index f9c8187e39..e38346809a 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/graph/explore.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/graph/explore.rb
@@ -37,6 +37,13 @@ def explore(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "graph.explore" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = arguments.delete(:body)
 
@@ -52,7 +59,7 @@ def explore(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/health_report.rb b/elasticsearch-api/lib/elasticsearch/api/actions/health_report.rb
index 48293f7b6d..c9dcdc1b47 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/health_report.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/health_report.rb
@@ -34,6 +34,13 @@ module Actions
       def health_report(arguments = {})
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "health_report" }
+
+        defined_params = ["feature"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body = nil
 
@@ -48,7 +55,7 @@ def health_report(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/index.rb b/elasticsearch-api/lib/elasticsearch/api/actions/index.rb
index f4a90f1416..2dc4d38402 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/index.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/index.rb
@@ -47,6 +47,13 @@ def index(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "index" }
+
+        defined_params = ["index", "id"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body = arguments.delete(:body)
 
@@ -63,7 +70,7 @@ def index(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/delete_lifecycle.rb b/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/delete_lifecycle.rb
index 2c2a8c89f3..6c4b33864e 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/delete_lifecycle.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/delete_lifecycle.rb
@@ -34,6 +34,13 @@ def delete_lifecycle(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ilm.delete_lifecycle" }
+
+          defined_params = ["policy"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def delete_lifecycle(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/explain_lifecycle.rb b/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/explain_lifecycle.rb
index e789cd2447..2e888236ce 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/explain_lifecycle.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/explain_lifecycle.rb
@@ -36,6 +36,13 @@ def explain_lifecycle(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ilm.explain_lifecycle" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -46,7 +53,7 @@ def explain_lifecycle(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/get_lifecycle.rb b/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/get_lifecycle.rb
index cf2ba111cf..c00a190ffd 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/get_lifecycle.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/get_lifecycle.rb
@@ -32,6 +32,13 @@ module Actions
         def get_lifecycle(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ilm.get_lifecycle" }
+
+          defined_params = ["policy"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -46,7 +53,7 @@ def get_lifecycle(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/get_status.rb b/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/get_status.rb
index 1d237cbde1..ca5e34d1d2 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/get_status.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/get_status.rb
@@ -31,6 +31,7 @@ module Actions
         def get_status(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ilm.get_status" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def get_status(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/migrate_to_data_tiers.rb b/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/migrate_to_data_tiers.rb
index 29b806142d..577bee1473 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/migrate_to_data_tiers.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/migrate_to_data_tiers.rb
@@ -33,6 +33,7 @@ module Actions
         def migrate_to_data_tiers(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ilm.migrate_to_data_tiers" }
 
           body   = arguments.delete(:body)
 
@@ -41,7 +42,7 @@ def migrate_to_data_tiers(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/move_to_step.rb b/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/move_to_step.rb
index 04e398b5d6..20e06ea8f0 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/move_to_step.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/move_to_step.rb
@@ -35,6 +35,13 @@ def move_to_step(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ilm.move_to_step" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = arguments.delete(:body)
 
@@ -45,7 +52,7 @@ def move_to_step(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/put_lifecycle.rb b/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/put_lifecycle.rb
index 89c3fc8adc..5af935efb2 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/put_lifecycle.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/put_lifecycle.rb
@@ -35,6 +35,13 @@ def put_lifecycle(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ilm.put_lifecycle" }
+
+          defined_params = ["policy"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -45,7 +52,7 @@ def put_lifecycle(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/remove_policy.rb b/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/remove_policy.rb
index 3949503e61..2845a8895b 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/remove_policy.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/remove_policy.rb
@@ -34,6 +34,13 @@ def remove_policy(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ilm.remove_policy" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -44,7 +51,7 @@ def remove_policy(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/retry.rb b/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/retry.rb
index 5f307f3687..536c3902c0 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/retry.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/retry.rb
@@ -34,6 +34,13 @@ def retry(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ilm.retry" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -44,7 +51,7 @@ def retry(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/start.rb b/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/start.rb
index 2db6b015b6..ce0e94fc3f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/start.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/start.rb
@@ -31,6 +31,7 @@ module Actions
         def start(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ilm.start" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def start(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/stop.rb b/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/stop.rb
index 994a8dea19..870623e600 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/stop.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/index_lifecycle_management/stop.rb
@@ -31,6 +31,7 @@ module Actions
         def stop(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ilm.stop" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def stop(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/add_block.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/add_block.rb
index dbc424a3a4..352220d75e 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/add_block.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/add_block.rb
@@ -41,6 +41,13 @@ def add_block(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.add_block" }
+
+          defined_params = ["index", "block"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -53,7 +60,7 @@ def add_block(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/analyze.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/analyze.rb
index d4a922ef32..c66bea09b1 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/analyze.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/analyze.rb
@@ -33,6 +33,13 @@ module Actions
         def analyze(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.analyze" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = arguments.delete(:body)
 
@@ -52,7 +59,7 @@ def analyze(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/clear_cache.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/clear_cache.rb
index 6d1e5d4431..0e23b73591 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/clear_cache.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/clear_cache.rb
@@ -39,6 +39,13 @@ module Actions
         def clear_cache(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.clear_cache" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -53,7 +60,7 @@ def clear_cache(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/clone.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/clone.rb
index d81382ac55..d5e2abb709 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/clone.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/clone.rb
@@ -40,6 +40,13 @@ def clone(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.clone" }
+
+          defined_params = ["index", "target"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = arguments.delete(:body)
 
@@ -52,7 +59,7 @@ def clone(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/close.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/close.rb
index 98f72f6c66..4df7d3c0a2 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/close.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/close.rb
@@ -40,6 +40,13 @@ def close(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.close" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -50,7 +57,7 @@ def close(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/create.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/create.rb
index 82f098841a..4de02331c7 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/create.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/create.rb
@@ -38,6 +38,13 @@ def create(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.create" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = arguments.delete(:body)
 
@@ -48,7 +55,7 @@ def create(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/create_data_stream.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/create_data_stream.rb
index 8a297a522b..0dc679b72e 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/create_data_stream.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/create_data_stream.rb
@@ -34,6 +34,13 @@ def create_data_stream(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.create_data_stream" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def create_data_stream(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/data_streams_stats.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/data_streams_stats.rb
index c5089eca6c..a3b44ef878 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/data_streams_stats.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/data_streams_stats.rb
@@ -32,6 +32,13 @@ module Actions
         def data_streams_stats(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.data_streams_stats" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -46,7 +53,7 @@ def data_streams_stats(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/delete.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/delete.rb
index cbfc13369e..4ab35fc210 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/delete.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/delete.rb
@@ -39,6 +39,13 @@ def delete(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.delete" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -51,12 +58,12 @@ def delete(arguments = {})
           if Array(arguments[:ignore]).include?(404)
             Utils.__rescue_from_not_found {
               Elasticsearch::API::Response.new(
-                perform_request(method, path, params, body, headers)
+                perform_request(method, path, params, body, headers, request_opts)
               )
             }
           else
             Elasticsearch::API::Response.new(
-              perform_request(method, path, params, body, headers)
+              perform_request(method, path, params, body, headers, request_opts)
             )
           end
         end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/delete_alias.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/delete_alias.rb
index 948c3512fd..ff6cee236c 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/delete_alias.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/delete_alias.rb
@@ -38,6 +38,13 @@ def delete_alias(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.delete_alias" }
+
+          defined_params = ["index", "name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -52,7 +59,7 @@ def delete_alias(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/delete_data_lifecycle.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/delete_data_lifecycle.rb
index b3e879494f..49f932983b 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/delete_data_lifecycle.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/delete_data_lifecycle.rb
@@ -41,6 +41,13 @@ def delete_data_lifecycle(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.delete_data_lifecycle" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -51,7 +58,7 @@ def delete_data_lifecycle(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/delete_data_stream.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/delete_data_stream.rb
index c46183e3a9..964b3d09a0 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/delete_data_stream.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/delete_data_stream.rb
@@ -35,6 +35,13 @@ def delete_data_stream(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.delete_data_stream" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -45,7 +52,7 @@ def delete_data_stream(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/delete_index_template.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/delete_index_template.rb
index 9f6072b96f..f0f9681ff3 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/delete_index_template.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/delete_index_template.rb
@@ -36,6 +36,13 @@ def delete_index_template(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.delete_index_template" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -46,7 +53,7 @@ def delete_index_template(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/delete_template.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/delete_template.rb
index 608efd6d4f..b612f57c9d 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/delete_template.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/delete_template.rb
@@ -36,6 +36,13 @@ def delete_template(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.delete_template" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,12 +55,12 @@ def delete_template(arguments = {})
           if Array(arguments[:ignore]).include?(404)
             Utils.__rescue_from_not_found {
               Elasticsearch::API::Response.new(
-                perform_request(method, path, params, body, headers)
+                perform_request(method, path, params, body, headers, request_opts)
               )
             }
           else
             Elasticsearch::API::Response.new(
-              perform_request(method, path, params, body, headers)
+              perform_request(method, path, params, body, headers, request_opts)
             )
           end
         end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/disk_usage.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/disk_usage.rb
index b93645a48c..d1a0b08ca4 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/disk_usage.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/disk_usage.rb
@@ -43,6 +43,13 @@ def disk_usage(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.disk_usage" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -53,7 +60,7 @@ def disk_usage(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/downsample.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/downsample.rb
index 687b99fd07..80198841af 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/downsample.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/downsample.rb
@@ -42,6 +42,13 @@ def downsample(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.downsample" }
+
+          defined_params = ["index", "target_index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = arguments.delete(:body)
 
@@ -54,7 +61,7 @@ def downsample(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/exists.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/exists.rb
index b244d86513..669b083e77 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/exists.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/exists.rb
@@ -40,6 +40,13 @@ def exists(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.exists" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -50,7 +57,7 @@ def exists(arguments = {})
           params = Utils.process_params(arguments)
 
           Utils.__rescue_from_not_found do
-            perform_request(method, path, params, body, headers).status == 200 ? true : false
+            perform_request(method, path, params, body, headers, opts).status == 200 ? true : false
           end
         end
 
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/exists_alias.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/exists_alias.rb
index e52f4575e7..84456a0e85 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/exists_alias.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/exists_alias.rb
@@ -39,6 +39,13 @@ def exists_alias(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.exists_alias" }
+
+          defined_params = ["name", "index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -55,7 +62,7 @@ def exists_alias(arguments = {})
           params = Utils.process_params(arguments)
 
           Utils.__rescue_from_not_found do
-            perform_request(method, path, params, body, headers).status == 200 ? true : false
+            perform_request(method, path, params, body, headers, opts).status == 200 ? true : false
           end
         end
 
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/exists_index_template.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/exists_index_template.rb
index 9f87f17404..dd26460a22 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/exists_index_template.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/exists_index_template.rb
@@ -37,6 +37,13 @@ def exists_index_template(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.exists_index_template" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -47,7 +54,7 @@ def exists_index_template(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
 
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/exists_template.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/exists_template.rb
index d9fbb5c235..92676ab253 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/exists_template.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/exists_template.rb
@@ -37,6 +37,13 @@ def exists_template(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.exists_template" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -47,7 +54,7 @@ def exists_template(arguments = {})
           params = Utils.process_params(arguments)
 
           Utils.__rescue_from_not_found do
-            perform_request(method, path, params, body, headers).status == 200 ? true : false
+            perform_request(method, path, params, body, headers, opts).status == 200 ? true : false
           end
         end
 
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/explain_data_lifecycle.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/explain_data_lifecycle.rb
index b508521434..022d6ec12a 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/explain_data_lifecycle.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/explain_data_lifecycle.rb
@@ -40,6 +40,13 @@ def explain_data_lifecycle(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.explain_data_lifecycle" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -50,7 +57,7 @@ def explain_data_lifecycle(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/field_usage_stats.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/field_usage_stats.rb
index 265b064caf..a2ebd6936e 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/field_usage_stats.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/field_usage_stats.rb
@@ -42,6 +42,13 @@ def field_usage_stats(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.field_usage_stats" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -52,7 +59,7 @@ def field_usage_stats(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/flush.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/flush.rb
index 92c77705e0..410b3877eb 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/flush.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/flush.rb
@@ -37,6 +37,13 @@ module Actions
         def flush(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.flush" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -51,7 +58,7 @@ def flush(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/forcemerge.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/forcemerge.rb
index 674d155040..769a541fd2 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/forcemerge.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/forcemerge.rb
@@ -39,6 +39,13 @@ module Actions
         def forcemerge(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.forcemerge" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -53,7 +60,7 @@ def forcemerge(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/get.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/get.rb
index b9abcde2d1..e4bfdd093a 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/get.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/get.rb
@@ -42,6 +42,13 @@ def get(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.get" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -52,7 +59,7 @@ def get(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_alias.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_alias.rb
index 90a6b25cfc..e510b33301 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_alias.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_alias.rb
@@ -37,6 +37,13 @@ module Actions
         def get_alias(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.get_alias" }
+
+          defined_params = ["name", "index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -57,7 +64,7 @@ def get_alias(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_data_lifecycle.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_data_lifecycle.rb
index c4c947a735..bcf05a25c8 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_data_lifecycle.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_data_lifecycle.rb
@@ -40,6 +40,13 @@ def get_data_lifecycle(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.get_data_lifecycle" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -50,7 +57,7 @@ def get_data_lifecycle(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_data_stream.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_data_stream.rb
index 6bf54b2e28..7ff3a7d2c0 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_data_stream.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_data_stream.rb
@@ -34,6 +34,13 @@ module Actions
         def get_data_stream(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.get_data_stream" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def get_data_stream(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_field_mapping.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_field_mapping.rb
index 6f67efdc66..f720b15c11 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_field_mapping.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_field_mapping.rb
@@ -41,6 +41,13 @@ def get_field_mapping(arguments = {})
           raise ArgumentError, "Required argument 'field' missing" unless _fields
 
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.get_field_mapping" }
+
+          defined_params = ["fields", "index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -55,7 +62,7 @@ def get_field_mapping(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_index_template.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_index_template.rb
index b5541104af..9a2ae6cf96 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_index_template.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_index_template.rb
@@ -36,6 +36,13 @@ module Actions
         def get_index_template(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.get_index_template" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -50,7 +57,7 @@ def get_index_template(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_mapping.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_mapping.rb
index 9ebf4590d0..adbcbe2ae3 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_mapping.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_mapping.rb
@@ -37,6 +37,13 @@ module Actions
         def get_mapping(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.get_mapping" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -51,7 +58,7 @@ def get_mapping(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_settings.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_settings.rb
index 2c8a123d94..713c68599a 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_settings.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_settings.rb
@@ -40,6 +40,13 @@ module Actions
         def get_settings(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.get_settings" }
+
+          defined_params = ["index", "name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -60,7 +67,7 @@ def get_settings(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_template.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_template.rb
index 1e2c4a76ce..d21de055d2 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_template.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/get_template.rb
@@ -35,6 +35,13 @@ module Actions
         def get_template(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.get_template" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -49,7 +56,7 @@ def get_template(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/migrate_to_data_stream.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/migrate_to_data_stream.rb
index c6a4a4ba95..f3258029f0 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/migrate_to_data_stream.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/migrate_to_data_stream.rb
@@ -34,6 +34,13 @@ def migrate_to_data_stream(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.migrate_to_data_stream" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def migrate_to_data_stream(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/modify_data_stream.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/modify_data_stream.rb
index 709b7e98ef..5fe6c0657f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/modify_data_stream.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/modify_data_stream.rb
@@ -34,6 +34,7 @@ def modify_data_stream(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.modify_data_stream" }
 
           body   = arguments.delete(:body)
 
@@ -42,7 +43,7 @@ def modify_data_stream(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/open.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/open.rb
index fe9619cbfc..bce72e2453 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/open.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/open.rb
@@ -40,6 +40,13 @@ def open(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.open" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -50,7 +57,7 @@ def open(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/promote_data_stream.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/promote_data_stream.rb
index c93174a286..ca4e481270 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/promote_data_stream.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/promote_data_stream.rb
@@ -34,6 +34,13 @@ def promote_data_stream(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.promote_data_stream" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def promote_data_stream(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/put_alias.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/put_alias.rb
index 135b6b5513..e7228d9955 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/put_alias.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/put_alias.rb
@@ -39,6 +39,13 @@ def put_alias(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.put_alias" }
+
+          defined_params = ["index", "name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = arguments.delete(:body)
 
@@ -53,7 +60,7 @@ def put_alias(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/put_data_lifecycle.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/put_data_lifecycle.rb
index d1cab851ec..3c041a0161 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/put_data_lifecycle.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/put_data_lifecycle.rb
@@ -42,6 +42,13 @@ def put_data_lifecycle(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.put_data_lifecycle" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -52,7 +59,7 @@ def put_data_lifecycle(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/put_index_template.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/put_index_template.rb
index da71539e38..7f264bfd5b 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/put_index_template.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/put_index_template.rb
@@ -39,6 +39,13 @@ def put_index_template(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.put_index_template" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -49,7 +56,7 @@ def put_index_template(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/put_mapping.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/put_mapping.rb
index fdfb26aa63..ac87f80494 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/put_mapping.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/put_mapping.rb
@@ -42,6 +42,13 @@ def put_mapping(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.put_mapping" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = arguments.delete(:body)
 
@@ -52,7 +59,7 @@ def put_mapping(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/put_settings.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/put_settings.rb
index a5a48e4b21..50f73f6bf3 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/put_settings.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/put_settings.rb
@@ -42,6 +42,13 @@ def put_settings(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.put_settings" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = arguments.delete(:body)
 
@@ -56,7 +63,7 @@ def put_settings(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/put_template.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/put_template.rb
index cc08adb55f..1ba1187622 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/put_template.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/put_template.rb
@@ -39,6 +39,13 @@ def put_template(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.put_template" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -49,7 +56,7 @@ def put_template(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/recovery.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/recovery.rb
index 9076c02224..753d88b856 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/recovery.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/recovery.rb
@@ -34,6 +34,13 @@ module Actions
         def recovery(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.recovery" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -48,7 +55,7 @@ def recovery(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/refresh.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/refresh.rb
index aeb521327f..11d3262f30 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/refresh.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/refresh.rb
@@ -35,6 +35,13 @@ module Actions
         def refresh(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.refresh" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -49,7 +56,7 @@ def refresh(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/reload_search_analyzers.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/reload_search_analyzers.rb
index 25b6f49645..d1f08ebf9b 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/reload_search_analyzers.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/reload_search_analyzers.rb
@@ -28,7 +28,6 @@ module Actions
         # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when unavailable (missing or closed)
         # @option arguments [Boolean] :allow_no_indices Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
         # @option arguments [String] :expand_wildcards Whether to expand wildcard expression to concrete indices that are open, closed or both. (options: open, closed, hidden, none, all)
-        # @option arguments [String] :resource changed resource to reload analyzers from if applicable
         # @option arguments [Hash] :headers Custom HTTP headers
         #
         # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-reload-analyzers.html
@@ -38,6 +37,13 @@ def reload_search_analyzers(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.reload_search_analyzers" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -48,7 +54,7 @@ def reload_search_analyzers(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/resolve_index.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/resolve_index.rb
index 71a0f80cd1..2409afb019 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/resolve_index.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/resolve_index.rb
@@ -35,6 +35,13 @@ def resolve_index(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.resolve_index" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -45,7 +52,7 @@ def resolve_index(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/rollover.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/rollover.rb
index aac93fbb27..6660d31f00 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/rollover.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/rollover.rb
@@ -41,6 +41,13 @@ def rollover(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.rollover" }
+
+          defined_params = ["alias", "new_index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = arguments.delete(:body)
 
@@ -57,7 +64,7 @@ def rollover(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/segments.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/segments.rb
index 0f5505852c..8e5372d7db 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/segments.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/segments.rb
@@ -36,6 +36,13 @@ module Actions
         def segments(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.segments" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -50,7 +57,7 @@ def segments(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/shard_stores.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/shard_stores.rb
index 62f4848579..22407ac487 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/shard_stores.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/shard_stores.rb
@@ -36,6 +36,13 @@ module Actions
         def shard_stores(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.shard_stores" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -50,7 +57,7 @@ def shard_stores(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/shrink.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/shrink.rb
index 2fbb9c91a3..c3fe392e5b 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/shrink.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/shrink.rb
@@ -40,6 +40,13 @@ def shrink(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.shrink" }
+
+          defined_params = ["index", "target"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = arguments.delete(:body)
 
@@ -52,7 +59,7 @@ def shrink(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/simulate_index_template.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/simulate_index_template.rb
index 60b1ff6373..977e3bc302 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/simulate_index_template.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/simulate_index_template.rb
@@ -39,6 +39,13 @@ def simulate_index_template(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.simulate_index_template" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -49,7 +56,7 @@ def simulate_index_template(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/simulate_template.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/simulate_template.rb
index c581f77ba0..3c32447661 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/simulate_template.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/simulate_template.rb
@@ -37,6 +37,13 @@ module Actions
         def simulate_template(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.simulate_template" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -51,7 +58,7 @@ def simulate_template(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/split.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/split.rb
index 1c6d3e3ff7..83c147367d 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/split.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/split.rb
@@ -40,6 +40,13 @@ def split(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.split" }
+
+          defined_params = ["index", "target"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = arguments.delete(:body)
 
@@ -52,7 +59,7 @@ def split(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/stats.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/stats.rb
index 1c8c3387c8..e05d367923 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/stats.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/stats.rb
@@ -42,6 +42,13 @@ module Actions
         def stats(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.stats" }
+
+          defined_params = ["metric", "index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -62,7 +69,7 @@ def stats(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/unfreeze.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/unfreeze.rb
index def6fb41f1..918dca881c 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/unfreeze.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/unfreeze.rb
@@ -45,6 +45,13 @@ def unfreeze(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.unfreeze" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -55,7 +62,7 @@ def unfreeze(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/update_aliases.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/update_aliases.rb
index 2b7dba3775..011e0ed003 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/update_aliases.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/update_aliases.rb
@@ -36,6 +36,7 @@ def update_aliases(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.update_aliases" }
 
           body   = arguments.delete(:body)
 
@@ -44,7 +45,7 @@ def update_aliases(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/indices/validate_query.rb b/elasticsearch-api/lib/elasticsearch/api/actions/indices/validate_query.rb
index ce7eed2869..91a92ff96c 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/indices/validate_query.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/indices/validate_query.rb
@@ -45,6 +45,13 @@ module Actions
         def validate_query(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "indices.validate_query" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = arguments.delete(:body)
 
@@ -64,7 +71,7 @@ def validate_query(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/info.rb b/elasticsearch-api/lib/elasticsearch/api/actions/info.rb
index d199a17277..28c3b31e2d 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/info.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/info.rb
@@ -30,6 +30,7 @@ module Actions
       def info(arguments = {})
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "info" }
 
         body   = nil
 
@@ -38,7 +39,7 @@ def info(arguments = {})
         params = {}
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/ingest/delete_pipeline.rb b/elasticsearch-api/lib/elasticsearch/api/actions/ingest/delete_pipeline.rb
index 4c653ec284..672931569e 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/ingest/delete_pipeline.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/ingest/delete_pipeline.rb
@@ -36,6 +36,13 @@ def delete_pipeline(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ingest.delete_pipeline" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -46,7 +53,7 @@ def delete_pipeline(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/ingest/geo_ip_stats.rb b/elasticsearch-api/lib/elasticsearch/api/actions/ingest/geo_ip_stats.rb
index 15ab98e64a..58755735b7 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/ingest/geo_ip_stats.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/ingest/geo_ip_stats.rb
@@ -31,6 +31,7 @@ module Actions
         def geo_ip_stats(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ingest.geo_ip_stats" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def geo_ip_stats(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/ingest/get_pipeline.rb b/elasticsearch-api/lib/elasticsearch/api/actions/ingest/get_pipeline.rb
index 400c3ea593..4a84f70862 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/ingest/get_pipeline.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/ingest/get_pipeline.rb
@@ -34,6 +34,13 @@ module Actions
         def get_pipeline(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ingest.get_pipeline" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def get_pipeline(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/ingest/processor_grok.rb b/elasticsearch-api/lib/elasticsearch/api/actions/ingest/processor_grok.rb
index 9f893c10a0..952cdb70e0 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/ingest/processor_grok.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/ingest/processor_grok.rb
@@ -31,6 +31,7 @@ module Actions
         def processor_grok(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ingest.processor_grok" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def processor_grok(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/ingest/put_pipeline.rb b/elasticsearch-api/lib/elasticsearch/api/actions/ingest/put_pipeline.rb
index db4628544b..48433c0540 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/ingest/put_pipeline.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/ingest/put_pipeline.rb
@@ -39,6 +39,13 @@ def put_pipeline(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ingest.put_pipeline" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -49,7 +56,7 @@ def put_pipeline(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/ingest/simulate.rb b/elasticsearch-api/lib/elasticsearch/api/actions/ingest/simulate.rb
index 21f26cc5d5..bdb7204e96 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/ingest/simulate.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/ingest/simulate.rb
@@ -36,6 +36,13 @@ def simulate(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ingest.simulate" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -50,7 +57,7 @@ def simulate(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/knn_search.rb b/elasticsearch-api/lib/elasticsearch/api/actions/knn_search.rb
index 83bd8ac9d9..9ba5b71a13 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/knn_search.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/knn_search.rb
@@ -39,6 +39,13 @@ def knn_search(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "knn_search" }
+
+        defined_params = ["index"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body   = arguments.delete(:body)
 
@@ -54,7 +61,7 @@ def knn_search(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/license/delete.rb b/elasticsearch-api/lib/elasticsearch/api/actions/license/delete.rb
index 47b5c5adae..428aeddf55 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/license/delete.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/license/delete.rb
@@ -31,6 +31,7 @@ module Actions
         def delete(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "license.delete" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def delete(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/license/get.rb b/elasticsearch-api/lib/elasticsearch/api/actions/license/get.rb
index aaff59578f..7a65c5a902 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/license/get.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/license/get.rb
@@ -33,6 +33,7 @@ module Actions
         def get(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "license.get" }
 
           body   = nil
 
@@ -41,7 +42,7 @@ def get(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/license/get_basic_status.rb b/elasticsearch-api/lib/elasticsearch/api/actions/license/get_basic_status.rb
index ae1ee87210..fe055282ac 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/license/get_basic_status.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/license/get_basic_status.rb
@@ -31,6 +31,7 @@ module Actions
         def get_basic_status(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "license.get_basic_status" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def get_basic_status(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/license/get_trial_status.rb b/elasticsearch-api/lib/elasticsearch/api/actions/license/get_trial_status.rb
index 454e77cce8..4097f685a8 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/license/get_trial_status.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/license/get_trial_status.rb
@@ -31,6 +31,7 @@ module Actions
         def get_trial_status(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "license.get_trial_status" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def get_trial_status(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/license/post.rb b/elasticsearch-api/lib/elasticsearch/api/actions/license/post.rb
index 8c03da859f..1aeb365b82 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/license/post.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/license/post.rb
@@ -33,6 +33,7 @@ module Actions
         def post(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "license.post" }
 
           body   = arguments.delete(:body)
 
@@ -41,7 +42,7 @@ def post(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/license/post_start_basic.rb b/elasticsearch-api/lib/elasticsearch/api/actions/license/post_start_basic.rb
index b5b3ff59a5..94fe650a4d 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/license/post_start_basic.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/license/post_start_basic.rb
@@ -32,6 +32,7 @@ module Actions
         def post_start_basic(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "license.post_start_basic" }
 
           body   = nil
 
@@ -40,7 +41,7 @@ def post_start_basic(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/license/post_start_trial.rb b/elasticsearch-api/lib/elasticsearch/api/actions/license/post_start_trial.rb
index ae1713b178..76fa3febbf 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/license/post_start_trial.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/license/post_start_trial.rb
@@ -33,6 +33,7 @@ module Actions
         def post_start_trial(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "license.post_start_trial" }
 
           body   = nil
 
@@ -41,7 +42,7 @@ def post_start_trial(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/logstash/delete_pipeline.rb b/elasticsearch-api/lib/elasticsearch/api/actions/logstash/delete_pipeline.rb
index 58ab034b24..4b566c1f01 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/logstash/delete_pipeline.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/logstash/delete_pipeline.rb
@@ -34,6 +34,13 @@ def delete_pipeline(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "logstash.delete_pipeline" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def delete_pipeline(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/logstash/get_pipeline.rb b/elasticsearch-api/lib/elasticsearch/api/actions/logstash/get_pipeline.rb
index 356a05261d..371d58cab6 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/logstash/get_pipeline.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/logstash/get_pipeline.rb
@@ -32,6 +32,13 @@ module Actions
         def get_pipeline(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "logstash.get_pipeline" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -46,7 +53,7 @@ def get_pipeline(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/logstash/put_pipeline.rb b/elasticsearch-api/lib/elasticsearch/api/actions/logstash/put_pipeline.rb
index dd4d6d8b6b..3eca20ccbc 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/logstash/put_pipeline.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/logstash/put_pipeline.rb
@@ -36,6 +36,13 @@ def put_pipeline(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "logstash.put_pipeline" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -46,7 +53,7 @@ def put_pipeline(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/clear_trained_model_deployment_cache.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/clear_trained_model_deployment_cache.rb
index 05e471a91e..c3573954f3 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/clear_trained_model_deployment_cache.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/clear_trained_model_deployment_cache.rb
@@ -34,6 +34,13 @@ def clear_trained_model_deployment_cache(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.clear_trained_model_deployment_cache" }
+
+          defined_params = ["model_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def clear_trained_model_deployment_cache(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/close_job.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/close_job.rb
index 18a2d043db..60a24df400 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/close_job.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/close_job.rb
@@ -38,6 +38,13 @@ def close_job(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.close_job" }
+
+          defined_params = ["job_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -48,7 +55,7 @@ def close_job(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_calendar.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_calendar.rb
index 7af6b3b13d..d60408a298 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_calendar.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_calendar.rb
@@ -34,6 +34,13 @@ def delete_calendar(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.delete_calendar" }
+
+          defined_params = ["calendar_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def delete_calendar(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_calendar_event.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_calendar_event.rb
index 14b90a8406..128153969c 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_calendar_event.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_calendar_event.rb
@@ -36,6 +36,13 @@ def delete_calendar_event(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.delete_calendar_event" }
+
+          defined_params = ["calendar_id", "event_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def delete_calendar_event(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_calendar_job.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_calendar_job.rb
index 2869b2bd88..cfb10ea11f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_calendar_job.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_calendar_job.rb
@@ -36,6 +36,13 @@ def delete_calendar_job(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.delete_calendar_job" }
+
+          defined_params = ["calendar_id", "job_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def delete_calendar_job(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_data_frame_analytics.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_data_frame_analytics.rb
index 1529f7ad1a..bc8d72fbd3 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_data_frame_analytics.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_data_frame_analytics.rb
@@ -36,6 +36,13 @@ def delete_data_frame_analytics(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.delete_data_frame_analytics" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -46,7 +53,7 @@ def delete_data_frame_analytics(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_datafeed.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_datafeed.rb
index d9b4a1e009..ca456fcaca 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_datafeed.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_datafeed.rb
@@ -35,6 +35,13 @@ def delete_datafeed(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.delete_datafeed" }
+
+          defined_params = ["datafeed_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -45,7 +52,7 @@ def delete_datafeed(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_expired_data.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_expired_data.rb
index 1dc2b2e0cd..5ab5263baa 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_expired_data.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_expired_data.rb
@@ -35,6 +35,13 @@ module Actions
         def delete_expired_data(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.delete_expired_data" }
+
+          defined_params = ["job_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -49,7 +56,7 @@ def delete_expired_data(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_filter.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_filter.rb
index f5751b33a9..bcbd91776d 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_filter.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_filter.rb
@@ -34,6 +34,13 @@ def delete_filter(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.delete_filter" }
+
+          defined_params = ["filter_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def delete_filter(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_forecast.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_forecast.rb
index 0ace7f717c..e3c5530c8d 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_forecast.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_forecast.rb
@@ -37,6 +37,13 @@ def delete_forecast(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.delete_forecast" }
+
+          defined_params = ["job_id", "forecast_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -53,7 +60,7 @@ def delete_forecast(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_job.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_job.rb
index 118dfc35fa..3356e2c805 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_job.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_job.rb
@@ -37,6 +37,13 @@ def delete_job(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.delete_job" }
+
+          defined_params = ["job_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -47,7 +54,7 @@ def delete_job(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_model_snapshot.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_model_snapshot.rb
index 0596fd2728..8be8ca1bf0 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_model_snapshot.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_model_snapshot.rb
@@ -36,6 +36,13 @@ def delete_model_snapshot(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.delete_model_snapshot" }
+
+          defined_params = ["job_id", "snapshot_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def delete_model_snapshot(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_trained_model.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_trained_model.rb
index 827a0e0a64..c8cbe004c0 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_trained_model.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_trained_model.rb
@@ -36,6 +36,13 @@ def delete_trained_model(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.delete_trained_model" }
+
+          defined_params = ["model_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -46,7 +53,7 @@ def delete_trained_model(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_trained_model_alias.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_trained_model_alias.rb
index 491d168962..6d17677398 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_trained_model_alias.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/delete_trained_model_alias.rb
@@ -36,6 +36,13 @@ def delete_trained_model_alias(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.delete_trained_model_alias" }
+
+          defined_params = ["model_id", "model_alias"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def delete_trained_model_alias(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/estimate_model_memory.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/estimate_model_memory.rb
index 2c351d13be..72379106e3 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/estimate_model_memory.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/estimate_model_memory.rb
@@ -34,6 +34,7 @@ def estimate_model_memory(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.estimate_model_memory" }
 
           body   = arguments.delete(:body)
 
@@ -42,7 +43,7 @@ def estimate_model_memory(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/evaluate_data_frame.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/evaluate_data_frame.rb
index 380a3c62de..472e545827 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/evaluate_data_frame.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/evaluate_data_frame.rb
@@ -34,6 +34,7 @@ def evaluate_data_frame(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.evaluate_data_frame" }
 
           body   = arguments.delete(:body)
 
@@ -42,7 +43,7 @@ def evaluate_data_frame(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/explain_data_frame_analytics.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/explain_data_frame_analytics.rb
index 1e49f96a08..5fcbae73a7 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/explain_data_frame_analytics.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/explain_data_frame_analytics.rb
@@ -33,6 +33,13 @@ module Actions
         def explain_data_frame_analytics(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.explain_data_frame_analytics" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -52,7 +59,7 @@ def explain_data_frame_analytics(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/flush_job.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/flush_job.rb
index 81f4889724..2ca82b107d 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/flush_job.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/flush_job.rb
@@ -40,6 +40,13 @@ def flush_job(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.flush_job" }
+
+          defined_params = ["job_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -50,7 +57,7 @@ def flush_job(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/forecast.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/forecast.rb
index 7e91fd2b4a..9f0b9d71a8 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/forecast.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/forecast.rb
@@ -38,6 +38,13 @@ def forecast(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.forecast" }
+
+          defined_params = ["job_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -48,7 +55,7 @@ def forecast(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_buckets.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_buckets.rb
index e5b9098019..c69af77e9f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_buckets.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_buckets.rb
@@ -45,6 +45,13 @@ def get_buckets(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.get_buckets" }
+
+          defined_params = ["job_id", "timestamp"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -66,7 +73,7 @@ def get_buckets(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_calendar_events.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_calendar_events.rb
index 56207de79d..2cb157a7ef 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_calendar_events.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_calendar_events.rb
@@ -39,6 +39,13 @@ def get_calendar_events(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.get_calendar_events" }
+
+          defined_params = ["calendar_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -49,7 +56,7 @@ def get_calendar_events(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_calendars.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_calendars.rb
index 8fee8aa989..a26e1d3f2d 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_calendars.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_calendars.rb
@@ -35,6 +35,13 @@ module Actions
         def get_calendars(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.get_calendars" }
+
+          defined_params = ["calendar_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -54,7 +61,7 @@ def get_calendars(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_categories.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_categories.rb
index 03091a80a7..d8bc6be512 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_categories.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_categories.rb
@@ -39,6 +39,13 @@ def get_categories(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.get_categories" }
+
+          defined_params = ["job_id", "category_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -60,7 +67,7 @@ def get_categories(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_data_frame_analytics.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_data_frame_analytics.rb
index ad2f81d8f1..eef5b4d3fc 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_data_frame_analytics.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_data_frame_analytics.rb
@@ -36,6 +36,13 @@ module Actions
         def get_data_frame_analytics(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.get_data_frame_analytics" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -50,7 +57,7 @@ def get_data_frame_analytics(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_data_frame_analytics_stats.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_data_frame_analytics_stats.rb
index 8dc251dca6..f9a2ed940c 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_data_frame_analytics_stats.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_data_frame_analytics_stats.rb
@@ -36,6 +36,13 @@ module Actions
         def get_data_frame_analytics_stats(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.get_data_frame_analytics_stats" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -50,7 +57,7 @@ def get_data_frame_analytics_stats(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_datafeed_stats.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_datafeed_stats.rb
index bd8bde1788..848f81beac 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_datafeed_stats.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_datafeed_stats.rb
@@ -33,6 +33,13 @@ module Actions
         def get_datafeed_stats(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.get_datafeed_stats" }
+
+          defined_params = ["datafeed_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -47,7 +54,7 @@ def get_datafeed_stats(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_datafeeds.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_datafeeds.rb
index 76cca4e56b..a24ba3b44f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_datafeeds.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_datafeeds.rb
@@ -34,6 +34,13 @@ module Actions
         def get_datafeeds(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.get_datafeeds" }
+
+          defined_params = ["datafeed_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def get_datafeeds(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_filters.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_filters.rb
index 81b6c1e7d1..fb4938ee16 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_filters.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_filters.rb
@@ -34,6 +34,13 @@ module Actions
         def get_filters(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.get_filters" }
+
+          defined_params = ["filter_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def get_filters(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_influencers.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_influencers.rb
index 4cbdd7adf8..dbf77b1ccf 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_influencers.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_influencers.rb
@@ -43,6 +43,13 @@ def get_influencers(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.get_influencers" }
+
+          defined_params = ["job_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -58,7 +65,7 @@ def get_influencers(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_job_stats.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_job_stats.rb
index b8e22d38bd..a647e6fa4d 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_job_stats.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_job_stats.rb
@@ -33,6 +33,13 @@ module Actions
         def get_job_stats(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.get_job_stats" }
+
+          defined_params = ["job_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -47,7 +54,7 @@ def get_job_stats(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_jobs.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_jobs.rb
index 0d2aebe1bb..8768c1a09b 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_jobs.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_jobs.rb
@@ -34,6 +34,13 @@ module Actions
         def get_jobs(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.get_jobs" }
+
+          defined_params = ["job_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def get_jobs(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_memory_stats.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_memory_stats.rb
index 84881b8492..d369af36db 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_memory_stats.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_memory_stats.rb
@@ -34,6 +34,13 @@ module Actions
         def get_memory_stats(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.get_memory_stats" }
+
+          defined_params = ["node_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def get_memory_stats(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_model_snapshot_upgrade_stats.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_model_snapshot_upgrade_stats.rb
index a1378d96e0..02f19f6860 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_model_snapshot_upgrade_stats.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_model_snapshot_upgrade_stats.rb
@@ -37,6 +37,13 @@ def get_model_snapshot_upgrade_stats(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.get_model_snapshot_upgrade_stats" }
+
+          defined_params = ["job_id", "snapshot_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -49,7 +56,7 @@ def get_model_snapshot_upgrade_stats(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_model_snapshots.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_model_snapshots.rb
index 65371c057c..af70db2a12 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_model_snapshots.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_model_snapshots.rb
@@ -42,6 +42,13 @@ def get_model_snapshots(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.get_model_snapshots" }
+
+          defined_params = ["job_id", "snapshot_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -63,7 +70,7 @@ def get_model_snapshots(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_overall_buckets.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_overall_buckets.rb
index 382a996d21..74c58a2097 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_overall_buckets.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_overall_buckets.rb
@@ -42,6 +42,13 @@ def get_overall_buckets(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.get_overall_buckets" }
+
+          defined_params = ["job_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -57,7 +64,7 @@ def get_overall_buckets(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_records.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_records.rb
index 524cb79457..9d84f3841d 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_records.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_records.rb
@@ -43,6 +43,13 @@ def get_records(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.get_records" }
+
+          defined_params = ["job_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -58,7 +65,7 @@ def get_records(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_trained_models.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_trained_models.rb
index 148ace8472..0e5bb6283f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_trained_models.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_trained_models.rb
@@ -40,6 +40,13 @@ module Actions
         def get_trained_models(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.get_trained_models" }
+
+          defined_params = ["model_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -54,7 +61,7 @@ def get_trained_models(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_trained_models_stats.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_trained_models_stats.rb
index a34eb6f0d9..20809c1161 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_trained_models_stats.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/get_trained_models_stats.rb
@@ -35,6 +35,13 @@ module Actions
         def get_trained_models_stats(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.get_trained_models_stats" }
+
+          defined_params = ["model_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -49,7 +56,7 @@ def get_trained_models_stats(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/infer_trained_model.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/infer_trained_model.rb
index dce043ef99..e29803f7cc 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/infer_trained_model.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/infer_trained_model.rb
@@ -42,6 +42,13 @@ def infer_trained_model(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.infer_trained_model" }
+
+          defined_params = ["model_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -54,7 +61,7 @@ def infer_trained_model(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/info.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/info.rb
index 45944ab36d..c610afb417 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/info.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/info.rb
@@ -31,6 +31,7 @@ module Actions
         def info(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.info" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def info(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/open_job.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/open_job.rb
index 4d3de91959..a1efc79090 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/open_job.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/open_job.rb
@@ -35,6 +35,13 @@ def open_job(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.open_job" }
+
+          defined_params = ["job_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -45,7 +52,7 @@ def open_job(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/post_calendar_events.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/post_calendar_events.rb
index f98a9274db..bc927bf617 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/post_calendar_events.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/post_calendar_events.rb
@@ -36,6 +36,13 @@ def post_calendar_events(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.post_calendar_events" }
+
+          defined_params = ["calendar_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -46,7 +53,7 @@ def post_calendar_events(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/post_data.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/post_data.rb
index d860c6e6e1..4cd4ef2baa 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/post_data.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/post_data.rb
@@ -38,6 +38,13 @@ def post_data(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.post_data" }
+
+          defined_params = ["job_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -48,7 +55,7 @@ def post_data(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/preview_data_frame_analytics.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/preview_data_frame_analytics.rb
index 86fa509837..34b15bbff1 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/preview_data_frame_analytics.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/preview_data_frame_analytics.rb
@@ -33,6 +33,13 @@ module Actions
         def preview_data_frame_analytics(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.preview_data_frame_analytics" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -52,7 +59,7 @@ def preview_data_frame_analytics(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/preview_datafeed.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/preview_datafeed.rb
index 6a373e8e75..db7b09136c 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/preview_datafeed.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/preview_datafeed.rb
@@ -35,6 +35,13 @@ module Actions
         def preview_datafeed(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.preview_datafeed" }
+
+          defined_params = ["datafeed_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -54,7 +61,7 @@ def preview_datafeed(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_calendar.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_calendar.rb
index 7459b0bd60..1c848dfa9f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_calendar.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_calendar.rb
@@ -35,6 +35,13 @@ def put_calendar(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.put_calendar" }
+
+          defined_params = ["calendar_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -45,7 +52,7 @@ def put_calendar(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_calendar_job.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_calendar_job.rb
index beaf19c365..b95248cf93 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_calendar_job.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_calendar_job.rb
@@ -36,6 +36,13 @@ def put_calendar_job(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.put_calendar_job" }
+
+          defined_params = ["calendar_id", "job_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def put_calendar_job(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_data_frame_analytics.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_data_frame_analytics.rb
index ba2b626c7c..261c37075c 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_data_frame_analytics.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_data_frame_analytics.rb
@@ -36,6 +36,13 @@ def put_data_frame_analytics(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.put_data_frame_analytics" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -46,7 +53,7 @@ def put_data_frame_analytics(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_datafeed.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_datafeed.rb
index e8dea26e38..5c5547cec2 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_datafeed.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_datafeed.rb
@@ -40,6 +40,13 @@ def put_datafeed(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.put_datafeed" }
+
+          defined_params = ["datafeed_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -50,7 +57,7 @@ def put_datafeed(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_filter.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_filter.rb
index 73cd594b0c..eab15add48 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_filter.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_filter.rb
@@ -36,6 +36,13 @@ def put_filter(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.put_filter" }
+
+          defined_params = ["filter_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -46,7 +53,7 @@ def put_filter(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_job.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_job.rb
index 6b4e85913a..51cd1ed967 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_job.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_job.rb
@@ -40,6 +40,13 @@ def put_job(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.put_job" }
+
+          defined_params = ["job_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -50,7 +57,7 @@ def put_job(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_trained_model.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_trained_model.rb
index 61bd0d3eab..ed1f7de230 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_trained_model.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_trained_model.rb
@@ -38,6 +38,13 @@ def put_trained_model(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.put_trained_model" }
+
+          defined_params = ["model_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -48,7 +55,7 @@ def put_trained_model(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_trained_model_alias.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_trained_model_alias.rb
index 77503e79df..2d69e40902 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_trained_model_alias.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_trained_model_alias.rb
@@ -37,6 +37,13 @@ def put_trained_model_alias(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.put_trained_model_alias" }
+
+          defined_params = ["model_id", "model_alias"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -49,7 +56,7 @@ def put_trained_model_alias(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_trained_model_definition_part.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_trained_model_definition_part.rb
index 0dfc798631..2b005d8c7f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_trained_model_definition_part.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_trained_model_definition_part.rb
@@ -38,6 +38,13 @@ def put_trained_model_definition_part(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.put_trained_model_definition_part" }
+
+          defined_params = ["model_id", "part"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -50,7 +57,7 @@ def put_trained_model_definition_part(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_trained_model_vocabulary.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_trained_model_vocabulary.rb
index f9d8566d3c..80a57d05de 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_trained_model_vocabulary.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/put_trained_model_vocabulary.rb
@@ -36,6 +36,13 @@ def put_trained_model_vocabulary(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.put_trained_model_vocabulary" }
+
+          defined_params = ["model_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -46,7 +53,7 @@ def put_trained_model_vocabulary(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/reset_job.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/reset_job.rb
index 2155227ad9..2032b1090c 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/reset_job.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/reset_job.rb
@@ -36,6 +36,13 @@ def reset_job(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.reset_job" }
+
+          defined_params = ["job_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -46,7 +53,7 @@ def reset_job(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/revert_model_snapshot.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/revert_model_snapshot.rb
index 9dea6125aa..6c64d08617 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/revert_model_snapshot.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/revert_model_snapshot.rb
@@ -38,6 +38,13 @@ def revert_model_snapshot(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.revert_model_snapshot" }
+
+          defined_params = ["job_id", "snapshot_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -50,7 +57,7 @@ def revert_model_snapshot(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/set_upgrade_mode.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/set_upgrade_mode.rb
index 7e183cf4cb..34ccde253c 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/set_upgrade_mode.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/set_upgrade_mode.rb
@@ -33,6 +33,7 @@ module Actions
         def set_upgrade_mode(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.set_upgrade_mode" }
 
           body   = nil
 
@@ -41,7 +42,7 @@ def set_upgrade_mode(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/start_data_frame_analytics.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/start_data_frame_analytics.rb
index ef225f1514..f7886b4799 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/start_data_frame_analytics.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/start_data_frame_analytics.rb
@@ -36,6 +36,13 @@ def start_data_frame_analytics(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.start_data_frame_analytics" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -46,7 +53,7 @@ def start_data_frame_analytics(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/start_datafeed.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/start_datafeed.rb
index 625a297763..3a70de38b8 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/start_datafeed.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/start_datafeed.rb
@@ -38,6 +38,13 @@ def start_datafeed(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.start_datafeed" }
+
+          defined_params = ["datafeed_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -48,7 +55,7 @@ def start_datafeed(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/start_trained_model_deployment.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/start_trained_model_deployment.rb
index 155e5e673b..6dbe5c130f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/start_trained_model_deployment.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/start_trained_model_deployment.rb
@@ -42,6 +42,13 @@ def start_trained_model_deployment(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.start_trained_model_deployment" }
+
+          defined_params = ["model_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -52,7 +59,7 @@ def start_trained_model_deployment(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/stop_data_frame_analytics.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/stop_data_frame_analytics.rb
index 805fc84dbe..62979684f9 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/stop_data_frame_analytics.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/stop_data_frame_analytics.rb
@@ -38,6 +38,13 @@ def stop_data_frame_analytics(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.stop_data_frame_analytics" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -48,7 +55,7 @@ def stop_data_frame_analytics(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/stop_datafeed.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/stop_datafeed.rb
index 8d908a4aaf..8f315ed38c 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/stop_datafeed.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/stop_datafeed.rb
@@ -39,6 +39,13 @@ def stop_datafeed(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.stop_datafeed" }
+
+          defined_params = ["datafeed_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -49,7 +56,7 @@ def stop_datafeed(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/stop_trained_model_deployment.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/stop_trained_model_deployment.rb
index 44c21207f7..1558910fcf 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/stop_trained_model_deployment.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/stop_trained_model_deployment.rb
@@ -37,6 +37,13 @@ def stop_trained_model_deployment(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.stop_trained_model_deployment" }
+
+          defined_params = ["model_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -47,7 +54,7 @@ def stop_trained_model_deployment(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/update_data_frame_analytics.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/update_data_frame_analytics.rb
index e938d30701..61ab9fd582 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/update_data_frame_analytics.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/update_data_frame_analytics.rb
@@ -36,6 +36,13 @@ def update_data_frame_analytics(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.update_data_frame_analytics" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -46,7 +53,7 @@ def update_data_frame_analytics(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/update_datafeed.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/update_datafeed.rb
index 1f1c1a8b30..8537e0b579 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/update_datafeed.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/update_datafeed.rb
@@ -40,6 +40,13 @@ def update_datafeed(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.update_datafeed" }
+
+          defined_params = ["datafeed_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -50,7 +57,7 @@ def update_datafeed(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/update_filter.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/update_filter.rb
index 00ebc41e81..6c00f991f5 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/update_filter.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/update_filter.rb
@@ -36,6 +36,13 @@ def update_filter(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.update_filter" }
+
+          defined_params = ["filter_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -46,7 +53,7 @@ def update_filter(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/update_job.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/update_job.rb
index 0692dfd7eb..7e0bf5fc6a 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/update_job.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/update_job.rb
@@ -36,6 +36,13 @@ def update_job(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.update_job" }
+
+          defined_params = ["job_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -46,7 +53,7 @@ def update_job(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/update_model_snapshot.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/update_model_snapshot.rb
index 7cdf14a574..fc21bb8512 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/update_model_snapshot.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/update_model_snapshot.rb
@@ -38,6 +38,13 @@ def update_model_snapshot(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.update_model_snapshot" }
+
+          defined_params = ["job_id", "snapshot_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -50,7 +57,7 @@ def update_model_snapshot(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/update_trained_model_deployment.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/update_trained_model_deployment.rb
index 1b592c79f5..253acabe1a 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/update_trained_model_deployment.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/update_trained_model_deployment.rb
@@ -40,6 +40,13 @@ def update_trained_model_deployment(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.update_trained_model_deployment" }
+
+          defined_params = ["model_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -50,7 +57,7 @@ def update_trained_model_deployment(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/upgrade_job_snapshot.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/upgrade_job_snapshot.rb
index 9042b13be7..dd66eb8acc 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/upgrade_job_snapshot.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/upgrade_job_snapshot.rb
@@ -38,6 +38,13 @@ def upgrade_job_snapshot(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.upgrade_job_snapshot" }
+
+          defined_params = ["job_id", "snapshot_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -50,7 +57,7 @@ def upgrade_job_snapshot(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/validate.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/validate.rb
index 7982cc8a9f..d8a4841171 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/validate.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/validate.rb
@@ -34,6 +34,7 @@ def validate(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.validate" }
 
           body   = arguments.delete(:body)
 
@@ -42,7 +43,7 @@ def validate(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/validate_detector.rb b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/validate_detector.rb
index 8a577a7ae9..bbfbe86fad 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/validate_detector.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/machine_learning/validate_detector.rb
@@ -34,6 +34,7 @@ def validate_detector(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ml.validate_detector" }
 
           body   = arguments.delete(:body)
 
@@ -42,7 +43,7 @@ def validate_detector(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/mget.rb b/elasticsearch-api/lib/elasticsearch/api/actions/mget.rb
index 64611bbb83..a7ca0b1a19 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/mget.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/mget.rb
@@ -43,6 +43,13 @@ def mget(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "mget" }
+
+        defined_params = ["index"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body   = arguments.delete(:body)
 
@@ -57,7 +64,7 @@ def mget(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/migration/deprecations.rb b/elasticsearch-api/lib/elasticsearch/api/actions/migration/deprecations.rb
index 7b29369a02..0b6e1862ff 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/migration/deprecations.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/migration/deprecations.rb
@@ -32,6 +32,13 @@ module Actions
         def deprecations(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "migration.deprecations" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -46,7 +53,7 @@ def deprecations(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/migration/get_feature_upgrade_status.rb b/elasticsearch-api/lib/elasticsearch/api/actions/migration/get_feature_upgrade_status.rb
index 0b3bbfa799..eed204341e 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/migration/get_feature_upgrade_status.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/migration/get_feature_upgrade_status.rb
@@ -31,6 +31,7 @@ module Actions
         def get_feature_upgrade_status(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "migration.get_feature_upgrade_status" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def get_feature_upgrade_status(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/migration/post_feature_upgrade.rb b/elasticsearch-api/lib/elasticsearch/api/actions/migration/post_feature_upgrade.rb
index 7e81fe6a48..41f7ebf7e4 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/migration/post_feature_upgrade.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/migration/post_feature_upgrade.rb
@@ -31,6 +31,7 @@ module Actions
         def post_feature_upgrade(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "migration.post_feature_upgrade" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def post_feature_upgrade(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/monitoring/bulk.rb b/elasticsearch-api/lib/elasticsearch/api/actions/monitoring/bulk.rb
index 5b3eab461c..a9946c3e53 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/monitoring/bulk.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/monitoring/bulk.rb
@@ -44,6 +44,13 @@ def bulk(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "monitoring.bulk" }
+
+          defined_params = ["type"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -65,7 +72,7 @@ def bulk(arguments = {})
 
           headers.merge!("Content-Type" => "application/x-ndjson")
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, payload, headers)
+            perform_request(method, path, params, payload, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/msearch.rb b/elasticsearch-api/lib/elasticsearch/api/actions/msearch.rb
index 7ee4ed4aa0..9b15032a59 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/msearch.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/msearch.rb
@@ -41,6 +41,13 @@ def msearch(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "msearch" }
+
+        defined_params = ["index"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body   = arguments.delete(:body)
 
@@ -78,7 +85,7 @@ def msearch(arguments = {})
 
         headers.merge!("Content-Type" => "application/x-ndjson")
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, payload, headers)
+          perform_request(method, path, params, payload, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/msearch_template.rb b/elasticsearch-api/lib/elasticsearch/api/actions/msearch_template.rb
index f4e4457771..e5c06c9374 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/msearch_template.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/msearch_template.rb
@@ -39,6 +39,13 @@ def msearch_template(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "msearch_template" }
+
+        defined_params = ["index"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body   = arguments.delete(:body)
 
@@ -64,7 +71,7 @@ def msearch_template(arguments = {})
 
         headers.merge!("Content-Type" => "application/x-ndjson")
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, payload, headers)
+          perform_request(method, path, params, payload, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/mtermvectors.rb b/elasticsearch-api/lib/elasticsearch/api/actions/mtermvectors.rb
index 968cf42a93..96fca1ae9b 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/mtermvectors.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/mtermvectors.rb
@@ -44,6 +44,13 @@ module Actions
       def mtermvectors(arguments = {})
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "mtermvectors" }
+
+        defined_params = ["index"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body = if (ids = arguments.delete(:ids))
                  { :ids => ids }
@@ -67,7 +74,7 @@ def mtermvectors(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/nodes/clear_repositories_metering_archive.rb b/elasticsearch-api/lib/elasticsearch/api/actions/nodes/clear_repositories_metering_archive.rb
index 6e2856820d..337c671142 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/nodes/clear_repositories_metering_archive.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/nodes/clear_repositories_metering_archive.rb
@@ -42,6 +42,13 @@ def clear_repositories_metering_archive(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "nodes.clear_repositories_metering_archive" }
+
+          defined_params = ["node_id", "max_archive_version"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -54,7 +61,7 @@ def clear_repositories_metering_archive(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/nodes/get_repositories_metering_info.rb b/elasticsearch-api/lib/elasticsearch/api/actions/nodes/get_repositories_metering_info.rb
index 9dfb0d96a1..0c2394f39f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/nodes/get_repositories_metering_info.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/nodes/get_repositories_metering_info.rb
@@ -38,6 +38,13 @@ def get_repositories_metering_info(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "nodes.get_repositories_metering_info" }
+
+          defined_params = ["node_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def get_repositories_metering_info(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/nodes/hot_threads.rb b/elasticsearch-api/lib/elasticsearch/api/actions/nodes/hot_threads.rb
index a6a51ffde1..bbed54b903 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/nodes/hot_threads.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/nodes/hot_threads.rb
@@ -39,6 +39,13 @@ module Actions
         def hot_threads(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "nodes.hot_threads" }
+
+          defined_params = ["node_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -53,7 +60,7 @@ def hot_threads(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/nodes/info.rb b/elasticsearch-api/lib/elasticsearch/api/actions/nodes/info.rb
index 63a10d6a99..fc9dce9ffa 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/nodes/info.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/nodes/info.rb
@@ -35,6 +35,13 @@ module Actions
         def info(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "nodes.info" }
+
+          defined_params = ["node_id", "metric"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -55,7 +62,7 @@ def info(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/nodes/reload_secure_settings.rb b/elasticsearch-api/lib/elasticsearch/api/actions/nodes/reload_secure_settings.rb
index 3370c927c9..099f5146fb 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/nodes/reload_secure_settings.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/nodes/reload_secure_settings.rb
@@ -34,6 +34,13 @@ module Actions
         def reload_secure_settings(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "nodes.reload_secure_settings" }
+
+          defined_params = ["node_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -48,7 +55,7 @@ def reload_secure_settings(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/nodes/stats.rb b/elasticsearch-api/lib/elasticsearch/api/actions/nodes/stats.rb
index 706b73eb2d..564998e3d0 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/nodes/stats.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/nodes/stats.rb
@@ -43,6 +43,13 @@ module Actions
         def stats(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "nodes.stats" }
+
+          defined_params = ["node_id", "metric", "index_metric"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -69,7 +76,7 @@ def stats(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/nodes/usage.rb b/elasticsearch-api/lib/elasticsearch/api/actions/nodes/usage.rb
index 4b54a7fbe2..c8e187fed7 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/nodes/usage.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/nodes/usage.rb
@@ -34,6 +34,13 @@ module Actions
         def usage(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "nodes.usage" }
+
+          defined_params = ["node_id", "metric"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -54,7 +61,7 @@ def usage(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/open_point_in_time.rb b/elasticsearch-api/lib/elasticsearch/api/actions/open_point_in_time.rb
index 82d6ecd10f..0807943d8a 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/open_point_in_time.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/open_point_in_time.rb
@@ -38,6 +38,13 @@ def open_point_in_time(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "open_point_in_time" }
+
+        defined_params = ["index"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body   = nil
 
@@ -48,7 +55,7 @@ def open_point_in_time(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/ping.rb b/elasticsearch-api/lib/elasticsearch/api/actions/ping.rb
index d8ed048ff1..d890961028 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/ping.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/ping.rb
@@ -30,6 +30,7 @@ module Actions
       def ping(arguments = {})
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "ping" }
 
         body   = nil
 
@@ -38,7 +39,7 @@ def ping(arguments = {})
         params = {}
 
         begin
-          perform_request(method, path, params, body, headers).status == 200 ? true : false
+          perform_request(method, path, params, body, headers, request_opts).status == 200 ? true : false
         rescue Exception => e
           if e.class.to_s =~ /NotFound|ConnectionFailed/ || e.message =~ /Not *Found|404|ConnectionFailed/i
             false
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/put_script.rb b/elasticsearch-api/lib/elasticsearch/api/actions/put_script.rb
index d2d33c424a..733ce2a2da 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/put_script.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/put_script.rb
@@ -38,6 +38,13 @@ def put_script(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "put_script" }
+
+        defined_params = ["id", "context"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body = arguments.delete(:body)
 
@@ -54,7 +61,7 @@ def put_script(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/query_ruleset/delete.rb b/elasticsearch-api/lib/elasticsearch/api/actions/query_ruleset/delete.rb
index 0558c5fac5..d8d5f4ec97 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/query_ruleset/delete.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/query_ruleset/delete.rb
@@ -38,6 +38,13 @@ def delete(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "query_ruleset.delete" }
+
+          defined_params = ["ruleset_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def delete(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/query_ruleset/get.rb b/elasticsearch-api/lib/elasticsearch/api/actions/query_ruleset/get.rb
index c6d3fe2e72..87ada7c28f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/query_ruleset/get.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/query_ruleset/get.rb
@@ -38,6 +38,13 @@ def get(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "query_ruleset.get" }
+
+          defined_params = ["ruleset_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def get(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/query_ruleset/list.rb b/elasticsearch-api/lib/elasticsearch/api/actions/query_ruleset/list.rb
deleted file mode 100644
index 06c425809b..0000000000
--- a/elasticsearch-api/lib/elasticsearch/api/actions/query_ruleset/list.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-# Licensed to Elasticsearch B.V. under one or more contributor
-# license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright
-# ownership. Elasticsearch B.V. licenses this file to you under
-# the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# Auto generated from build hash f284cc16f4d4b4289bc679aa1529bb504190fe80
-# @see https://github.com/elastic/elasticsearch/tree/main/rest-api-spec
-#
-module Elasticsearch
-  module API
-    module QueryRuleset
-      module Actions
-        # Lists query rulesets.
-        # This functionality is Experimental and may be changed or removed
-        # completely in a future release. Elastic will take a best effort approach
-        # to fix any issues, but experimental features are not subject to the
-        # support SLA of official GA features.
-        #
-        # @option arguments [Integer] :from Starting offset (default: 0)
-        # @option arguments [Integer] :size specifies a max number of results to get (default: 100)
-        # @option arguments [Hash] :headers Custom HTTP headers
-        #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/list-query-rulesets.html
-        #
-        def list(arguments = {})
-          arguments = arguments.clone
-          headers = arguments.delete(:headers) || {}
-
-          body   = nil
-
-          method = Elasticsearch::API::HTTP_GET
-          path   = "_query_rules"
-          params = Utils.process_params(arguments)
-
-          Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
-          )
-        end
-      end
-    end
-  end
-end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/query_ruleset/put.rb b/elasticsearch-api/lib/elasticsearch/api/actions/query_ruleset/put.rb
index ec6ef648d2..bc2baf11c6 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/query_ruleset/put.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/query_ruleset/put.rb
@@ -40,6 +40,13 @@ def put(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "query_ruleset.put" }
+
+          defined_params = ["ruleset_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -50,7 +57,7 @@ def put(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/rank_eval.rb b/elasticsearch-api/lib/elasticsearch/api/actions/rank_eval.rb
index bf4a92afdb..6482c7834a 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/rank_eval.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/rank_eval.rb
@@ -38,6 +38,13 @@ def rank_eval(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "rank_eval" }
+
+        defined_params = ["index"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body   = arguments.delete(:body)
 
@@ -52,7 +59,7 @@ def rank_eval(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/reindex.rb b/elasticsearch-api/lib/elasticsearch/api/actions/reindex.rb
index 72d44efb4f..148aa2b703 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/reindex.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/reindex.rb
@@ -43,6 +43,7 @@ def reindex(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "reindex" }
 
         body   = arguments.delete(:body)
 
@@ -51,7 +52,7 @@ def reindex(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/reindex_rethrottle.rb b/elasticsearch-api/lib/elasticsearch/api/actions/reindex_rethrottle.rb
index aa6f493642..66344e2be2 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/reindex_rethrottle.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/reindex_rethrottle.rb
@@ -34,6 +34,13 @@ def reindex_rethrottle(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "reindex_rethrottle" }
+
+        defined_params = ["task_id"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body = nil
 
@@ -44,7 +51,7 @@ def reindex_rethrottle(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/render_search_template.rb b/elasticsearch-api/lib/elasticsearch/api/actions/render_search_template.rb
index 7b7f3e2e30..f668b5f8aa 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/render_search_template.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/render_search_template.rb
@@ -32,6 +32,13 @@ module Actions
       def render_search_template(arguments = {})
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "render_search_template" }
+
+        defined_params = ["id"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body = arguments.delete(:body)
 
@@ -51,7 +58,7 @@ def render_search_template(arguments = {})
         params = {}
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/rollup/delete_job.rb b/elasticsearch-api/lib/elasticsearch/api/actions/rollup/delete_job.rb
index df5481d092..4806d5155d 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/rollup/delete_job.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/rollup/delete_job.rb
@@ -38,6 +38,13 @@ def delete_job(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "rollup.delete_job" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def delete_job(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/rollup/get_jobs.rb b/elasticsearch-api/lib/elasticsearch/api/actions/rollup/get_jobs.rb
index f07d6bc358..33aa7cc77b 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/rollup/get_jobs.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/rollup/get_jobs.rb
@@ -36,6 +36,13 @@ module Actions
         def get_jobs(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "rollup.get_jobs" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -50,7 +57,7 @@ def get_jobs(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/rollup/get_rollup_caps.rb b/elasticsearch-api/lib/elasticsearch/api/actions/rollup/get_rollup_caps.rb
index 3047e45a2e..a65d7a17a7 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/rollup/get_rollup_caps.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/rollup/get_rollup_caps.rb
@@ -36,6 +36,13 @@ module Actions
         def get_rollup_caps(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "rollup.get_rollup_caps" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -50,7 +57,7 @@ def get_rollup_caps(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/rollup/get_rollup_index_caps.rb b/elasticsearch-api/lib/elasticsearch/api/actions/rollup/get_rollup_index_caps.rb
index c1e5264a7d..6d23b373dd 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/rollup/get_rollup_index_caps.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/rollup/get_rollup_index_caps.rb
@@ -38,6 +38,13 @@ def get_rollup_index_caps(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "rollup.get_rollup_index_caps" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -48,7 +55,7 @@ def get_rollup_index_caps(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/rollup/put_job.rb b/elasticsearch-api/lib/elasticsearch/api/actions/rollup/put_job.rb
index fdb9616f4b..68c2a04022 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/rollup/put_job.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/rollup/put_job.rb
@@ -40,6 +40,13 @@ def put_job(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "rollup.put_job" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -50,7 +57,7 @@ def put_job(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/rollup/rollup_search.rb b/elasticsearch-api/lib/elasticsearch/api/actions/rollup/rollup_search.rb
index 832db0da11..ba9a60ac45 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/rollup/rollup_search.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/rollup/rollup_search.rb
@@ -42,6 +42,13 @@ def rollup_search(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "rollup.rollup_search" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = arguments.delete(:body)
 
@@ -52,7 +59,7 @@ def rollup_search(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/rollup/start_job.rb b/elasticsearch-api/lib/elasticsearch/api/actions/rollup/start_job.rb
index 768b461fb4..12ed5f5103 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/rollup/start_job.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/rollup/start_job.rb
@@ -38,6 +38,13 @@ def start_job(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "rollup.start_job" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def start_job(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/rollup/stop_job.rb b/elasticsearch-api/lib/elasticsearch/api/actions/rollup/stop_job.rb
index bad3231161..e5e7a44a70 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/rollup/stop_job.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/rollup/stop_job.rb
@@ -40,6 +40,13 @@ def stop_job(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "rollup.stop_job" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -50,7 +57,7 @@ def stop_job(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/scripts_painless_execute.rb b/elasticsearch-api/lib/elasticsearch/api/actions/scripts_painless_execute.rb
index 07e39dcb8f..7c4129c16a 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/scripts_painless_execute.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/scripts_painless_execute.rb
@@ -35,6 +35,7 @@ module Actions
       def scripts_painless_execute(arguments = {})
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "scripts_painless_execute" }
 
         body   = arguments.delete(:body)
 
@@ -48,7 +49,7 @@ def scripts_painless_execute(arguments = {})
         params = {}
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/scroll.rb b/elasticsearch-api/lib/elasticsearch/api/actions/scroll.rb
index c3b4bf52b4..5a318ac874 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/scroll.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/scroll.rb
@@ -39,6 +39,13 @@ module Actions
       def scroll(arguments = {})
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "scroll" }
+
+        defined_params = ["scroll_id"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body = arguments.delete(:body)
 
@@ -58,7 +65,7 @@ def scroll(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/search.rb b/elasticsearch-api/lib/elasticsearch/api/actions/search.rb
index d278fcb4a4..f4286c791e 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/search.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/search.rb
@@ -77,6 +77,13 @@ module Actions
       def search(arguments = {})
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "search" }
+
+        defined_params = ["index"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body   = arguments.delete(:body)
 
@@ -96,7 +103,7 @@ def search(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/search_application/delete.rb b/elasticsearch-api/lib/elasticsearch/api/actions/search_application/delete.rb
index ac9ff6b3fa..08ef42609c 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/search_application/delete.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/search_application/delete.rb
@@ -38,6 +38,13 @@ def delete(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "search_application.delete" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def delete(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/search_application/delete_behavioral_analytics.rb b/elasticsearch-api/lib/elasticsearch/api/actions/search_application/delete_behavioral_analytics.rb
index 5565e636ec..9e257125fc 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/search_application/delete_behavioral_analytics.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/search_application/delete_behavioral_analytics.rb
@@ -38,6 +38,13 @@ def delete_behavioral_analytics(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "search_application.delete_behavioral_analytics" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def delete_behavioral_analytics(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/search_application/get.rb b/elasticsearch-api/lib/elasticsearch/api/actions/search_application/get.rb
index 328f3f0dc4..16f30c8813 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/search_application/get.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/search_application/get.rb
@@ -38,6 +38,13 @@ def get(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "search_application.get" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def get(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/search_application/get_behavioral_analytics.rb b/elasticsearch-api/lib/elasticsearch/api/actions/search_application/get_behavioral_analytics.rb
index 3b916a6d87..38759588b1 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/search_application/get_behavioral_analytics.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/search_application/get_behavioral_analytics.rb
@@ -36,6 +36,13 @@ module Actions
         def get_behavioral_analytics(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "search_application.get_behavioral_analytics" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -50,7 +57,7 @@ def get_behavioral_analytics(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/search_application/list.rb b/elasticsearch-api/lib/elasticsearch/api/actions/search_application/list.rb
index 8f97e322f7..57edde1230 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/search_application/list.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/search_application/list.rb
@@ -38,6 +38,7 @@ module Actions
         def list(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "search_application.list" }
 
           body   = nil
 
@@ -46,7 +47,7 @@ def list(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/search_application/post_behavioral_analytics_event.rb b/elasticsearch-api/lib/elasticsearch/api/actions/search_application/post_behavioral_analytics_event.rb
index ee71ab3785..09988124b7 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/search_application/post_behavioral_analytics_event.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/search_application/post_behavioral_analytics_event.rb
@@ -43,6 +43,13 @@ def post_behavioral_analytics_event(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "search_application.post_behavioral_analytics_event" }
+
+          defined_params = ["collection_name", "event_type"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -55,7 +62,7 @@ def post_behavioral_analytics_event(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/search_application/put.rb b/elasticsearch-api/lib/elasticsearch/api/actions/search_application/put.rb
index 9a3f7e566e..cfa16d5fe0 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/search_application/put.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/search_application/put.rb
@@ -41,6 +41,13 @@ def put(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "search_application.put" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -51,7 +58,7 @@ def put(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/search_application/put_behavioral_analytics.rb b/elasticsearch-api/lib/elasticsearch/api/actions/search_application/put_behavioral_analytics.rb
index 5551f9b9ab..e1c37c07c6 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/search_application/put_behavioral_analytics.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/search_application/put_behavioral_analytics.rb
@@ -38,6 +38,13 @@ def put_behavioral_analytics(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "search_application.put_behavioral_analytics" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def put_behavioral_analytics(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/search_application/render_query.rb b/elasticsearch-api/lib/elasticsearch/api/actions/search_application/render_query.rb
index 91f27e67f8..204090689d 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/search_application/render_query.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/search_application/render_query.rb
@@ -39,6 +39,13 @@ def render_query(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "search_application.render_query" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -49,7 +56,7 @@ def render_query(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/search_application/search.rb b/elasticsearch-api/lib/elasticsearch/api/actions/search_application/search.rb
index 0a9c36381f..75161d1bbb 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/search_application/search.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/search_application/search.rb
@@ -39,6 +39,13 @@ def search(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "search_application.search" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -54,7 +61,7 @@ def search(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/search_mvt.rb b/elasticsearch-api/lib/elasticsearch/api/actions/search_mvt.rb
index a19695770b..67dbe167c6 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/search_mvt.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/search_mvt.rb
@@ -53,6 +53,13 @@ def search_mvt(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "search_mvt" }
+
+        defined_params = ["index", "field", "zoom", "x", "y"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body   = arguments.delete(:body)
 
@@ -71,7 +78,7 @@ def search_mvt(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/search_shards.rb b/elasticsearch-api/lib/elasticsearch/api/actions/search_shards.rb
index 8b03109690..c97bd163e8 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/search_shards.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/search_shards.rb
@@ -37,6 +37,13 @@ module Actions
       def search_shards(arguments = {})
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "search_shards" }
+
+        defined_params = ["index"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body   = nil
 
@@ -51,7 +58,7 @@ def search_shards(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/search_template.rb b/elasticsearch-api/lib/elasticsearch/api/actions/search_template.rb
index c3a2dd7ece..75c07efdb1 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/search_template.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/search_template.rb
@@ -47,6 +47,13 @@ def search_template(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "search_template" }
+
+        defined_params = ["index"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body   = arguments.delete(:body)
 
@@ -61,7 +68,7 @@ def search_template(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/searchable_snapshots/cache_stats.rb b/elasticsearch-api/lib/elasticsearch/api/actions/searchable_snapshots/cache_stats.rb
index 7c194bdc0a..1201a8b4ac 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/searchable_snapshots/cache_stats.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/searchable_snapshots/cache_stats.rb
@@ -36,6 +36,13 @@ module Actions
         def cache_stats(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "searchable_snapshots.cache_stats" }
+
+          defined_params = ["node_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -50,7 +57,7 @@ def cache_stats(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/searchable_snapshots/clear_cache.rb b/elasticsearch-api/lib/elasticsearch/api/actions/searchable_snapshots/clear_cache.rb
index 63e42e7cbd..77f31fb27f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/searchable_snapshots/clear_cache.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/searchable_snapshots/clear_cache.rb
@@ -39,6 +39,13 @@ module Actions
         def clear_cache(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "searchable_snapshots.clear_cache" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -53,7 +60,7 @@ def clear_cache(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/searchable_snapshots/mount.rb b/elasticsearch-api/lib/elasticsearch/api/actions/searchable_snapshots/mount.rb
index 08f1b0e198..70017c7dea 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/searchable_snapshots/mount.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/searchable_snapshots/mount.rb
@@ -41,6 +41,13 @@ def mount(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "searchable_snapshots.mount" }
+
+          defined_params = ["repository", "snapshot"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -53,7 +60,7 @@ def mount(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/searchable_snapshots/stats.rb b/elasticsearch-api/lib/elasticsearch/api/actions/searchable_snapshots/stats.rb
index 0a214885f4..e2b3b4ed16 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/searchable_snapshots/stats.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/searchable_snapshots/stats.rb
@@ -33,6 +33,13 @@ module Actions
         def stats(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "searchable_snapshots.stats" }
+
+          defined_params = ["index"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -47,7 +54,7 @@ def stats(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/activate_user_profile.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/activate_user_profile.rb
index de2b478aca..4f548d55be 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/activate_user_profile.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/activate_user_profile.rb
@@ -34,6 +34,7 @@ def activate_user_profile(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.activate_user_profile" }
 
           body   = arguments.delete(:body)
 
@@ -42,7 +43,7 @@ def activate_user_profile(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/authenticate.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/authenticate.rb
index eed4a29a5e..c9b506b992 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/authenticate.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/authenticate.rb
@@ -31,6 +31,7 @@ module Actions
         def authenticate(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.authenticate" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def authenticate(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/bulk_update_api_keys.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/bulk_update_api_keys.rb
index 5b0f12419b..1a3f08c56c 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/bulk_update_api_keys.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/bulk_update_api_keys.rb
@@ -34,6 +34,7 @@ def bulk_update_api_keys(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.bulk_update_api_keys" }
 
           body   = arguments.delete(:body)
 
@@ -42,7 +43,7 @@ def bulk_update_api_keys(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/change_password.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/change_password.rb
index 239a8f38e6..e48bea4825 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/change_password.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/change_password.rb
@@ -36,6 +36,13 @@ def change_password(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.change_password" }
+
+          defined_params = ["username"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -50,7 +57,7 @@ def change_password(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/clear_api_key_cache.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/clear_api_key_cache.rb
index aba6705fbf..3044936011 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/clear_api_key_cache.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/clear_api_key_cache.rb
@@ -34,6 +34,13 @@ def clear_api_key_cache(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.clear_api_key_cache" }
+
+          defined_params = ["ids"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -44,7 +51,7 @@ def clear_api_key_cache(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/clear_cached_privileges.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/clear_cached_privileges.rb
index abd6699fae..48d8ec3da1 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/clear_cached_privileges.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/clear_cached_privileges.rb
@@ -34,6 +34,13 @@ def clear_cached_privileges(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.clear_cached_privileges" }
+
+          defined_params = ["application"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def clear_cached_privileges(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/clear_cached_realms.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/clear_cached_realms.rb
index 4e039ebea5..69579d9b04 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/clear_cached_realms.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/clear_cached_realms.rb
@@ -35,6 +35,13 @@ def clear_cached_realms(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.clear_cached_realms" }
+
+          defined_params = ["realms"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -45,7 +52,7 @@ def clear_cached_realms(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/clear_cached_roles.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/clear_cached_roles.rb
index 5b8cf1b848..662f14b3ae 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/clear_cached_roles.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/clear_cached_roles.rb
@@ -34,6 +34,13 @@ def clear_cached_roles(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.clear_cached_roles" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def clear_cached_roles(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/clear_cached_service_tokens.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/clear_cached_service_tokens.rb
index 6ca1f72b4a..a527fc0603 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/clear_cached_service_tokens.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/clear_cached_service_tokens.rb
@@ -38,6 +38,13 @@ def clear_cached_service_tokens(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.clear_cached_service_tokens" }
+
+          defined_params = ["namespace", "service", "name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -52,7 +59,7 @@ def clear_cached_service_tokens(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/create_api_key.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/create_api_key.rb
index 5d0fc93ddb..d4422e1264 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/create_api_key.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/create_api_key.rb
@@ -35,6 +35,7 @@ def create_api_key(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.create_api_key" }
 
           body   = arguments.delete(:body)
 
@@ -43,7 +44,7 @@ def create_api_key(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/create_cross_cluster_api_key.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/create_cross_cluster_api_key.rb
index ee3a6125b2..cd218c8886 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/create_cross_cluster_api_key.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/create_cross_cluster_api_key.rb
@@ -38,6 +38,7 @@ def create_cross_cluster_api_key(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.create_cross_cluster_api_key" }
 
           body   = arguments.delete(:body)
 
@@ -46,7 +47,7 @@ def create_cross_cluster_api_key(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/create_service_token.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/create_service_token.rb
index 42bc6d73fa..75c8bc1829 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/create_service_token.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/create_service_token.rb
@@ -38,6 +38,13 @@ def create_service_token(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.create_service_token" }
+
+          defined_params = ["namespace", "service", "name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -56,7 +63,7 @@ def create_service_token(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/delete_privileges.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/delete_privileges.rb
index d25c5b95e3..2c103bbd78 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/delete_privileges.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/delete_privileges.rb
@@ -37,6 +37,13 @@ def delete_privileges(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.delete_privileges" }
+
+          defined_params = ["application", "name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -49,7 +56,7 @@ def delete_privileges(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/delete_role.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/delete_role.rb
index d4902cf9e9..f46bf9e839 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/delete_role.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/delete_role.rb
@@ -35,6 +35,13 @@ def delete_role(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.delete_role" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -45,7 +52,7 @@ def delete_role(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/delete_role_mapping.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/delete_role_mapping.rb
index 2cc199f560..787bd4417f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/delete_role_mapping.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/delete_role_mapping.rb
@@ -35,6 +35,13 @@ def delete_role_mapping(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.delete_role_mapping" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -45,7 +52,7 @@ def delete_role_mapping(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/delete_service_token.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/delete_service_token.rb
index eb89dfc7d9..2603615aed 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/delete_service_token.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/delete_service_token.rb
@@ -39,6 +39,13 @@ def delete_service_token(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.delete_service_token" }
+
+          defined_params = ["namespace", "service", "name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -53,7 +60,7 @@ def delete_service_token(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/delete_user.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/delete_user.rb
index 1729c6ffd1..dce200c42d 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/delete_user.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/delete_user.rb
@@ -35,6 +35,13 @@ def delete_user(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.delete_user" }
+
+          defined_params = ["username"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -45,7 +52,7 @@ def delete_user(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/disable_user.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/disable_user.rb
index 1d756e2048..5e29d26ff3 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/disable_user.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/disable_user.rb
@@ -35,6 +35,13 @@ def disable_user(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.disable_user" }
+
+          defined_params = ["username"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -45,7 +52,7 @@ def disable_user(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/disable_user_profile.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/disable_user_profile.rb
index b5228f47dc..c29461ef0d 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/disable_user_profile.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/disable_user_profile.rb
@@ -35,6 +35,13 @@ def disable_user_profile(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.disable_user_profile" }
+
+          defined_params = ["uid"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -45,7 +52,7 @@ def disable_user_profile(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/enable_user.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/enable_user.rb
index 926b295fa0..911d0aafe4 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/enable_user.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/enable_user.rb
@@ -35,6 +35,13 @@ def enable_user(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.enable_user" }
+
+          defined_params = ["username"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -45,7 +52,7 @@ def enable_user(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/enable_user_profile.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/enable_user_profile.rb
index 42c61217d9..c3ca7141d3 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/enable_user_profile.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/enable_user_profile.rb
@@ -35,6 +35,13 @@ def enable_user_profile(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.enable_user_profile" }
+
+          defined_params = ["uid"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -45,7 +52,7 @@ def enable_user_profile(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/enroll_kibana.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/enroll_kibana.rb
index 1ac392de4e..76e031d71b 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/enroll_kibana.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/enroll_kibana.rb
@@ -31,6 +31,7 @@ module Actions
         def enroll_kibana(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.enroll_kibana" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def enroll_kibana(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/enroll_node.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/enroll_node.rb
index 9c33882787..d72f968de1 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/enroll_node.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/enroll_node.rb
@@ -31,6 +31,7 @@ module Actions
         def enroll_node(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.enroll_node" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def enroll_node(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/get_api_key.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/get_api_key.rb
index 7ffb39ba07..2b77edbe7b 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/get_api_key.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/get_api_key.rb
@@ -37,6 +37,7 @@ module Actions
         def get_api_key(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.get_api_key" }
 
           body   = nil
 
@@ -45,7 +46,7 @@ def get_api_key(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/get_builtin_privileges.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/get_builtin_privileges.rb
index b4983e21f5..63273a1d45 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/get_builtin_privileges.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/get_builtin_privileges.rb
@@ -31,6 +31,7 @@ module Actions
         def get_builtin_privileges(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.get_builtin_privileges" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def get_builtin_privileges(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/get_privileges.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/get_privileges.rb
index 9b09f3c75b..12c53f9297 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/get_privileges.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/get_privileges.rb
@@ -33,6 +33,13 @@ module Actions
         def get_privileges(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.get_privileges" }
+
+          defined_params = ["application", "name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -51,7 +58,7 @@ def get_privileges(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/get_role.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/get_role.rb
index 2d4c5e4992..dc2428defd 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/get_role.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/get_role.rb
@@ -32,6 +32,13 @@ module Actions
         def get_role(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.get_role" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,12 +55,12 @@ def get_role(arguments = {})
           if Array(arguments[:ignore]).include?(404)
             Utils.__rescue_from_not_found {
               Elasticsearch::API::Response.new(
-                perform_request(method, path, params, body, headers)
+                perform_request(method, path, params, body, headers, request_opts)
               )
             }
           else
             Elasticsearch::API::Response.new(
-              perform_request(method, path, params, body, headers)
+              perform_request(method, path, params, body, headers, request_opts)
             )
           end
         end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/get_role_mapping.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/get_role_mapping.rb
index 8c4571c8bd..977fbc2f98 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/get_role_mapping.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/get_role_mapping.rb
@@ -32,6 +32,13 @@ module Actions
         def get_role_mapping(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.get_role_mapping" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -46,7 +53,7 @@ def get_role_mapping(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/get_service_accounts.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/get_service_accounts.rb
index d48a0b13e9..b1fc9adf81 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/get_service_accounts.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/get_service_accounts.rb
@@ -33,6 +33,13 @@ module Actions
         def get_service_accounts(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.get_service_accounts" }
+
+          defined_params = ["namespace", "service"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -51,7 +58,7 @@ def get_service_accounts(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/get_service_credentials.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/get_service_credentials.rb
index 4b28035cb9..b37c1da0a6 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/get_service_credentials.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/get_service_credentials.rb
@@ -36,6 +36,13 @@ def get_service_credentials(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.get_service_credentials" }
+
+          defined_params = ["namespace", "service"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def get_service_credentials(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/get_token.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/get_token.rb
index f96a03978a..5f79a51a61 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/get_token.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/get_token.rb
@@ -34,6 +34,7 @@ def get_token(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.get_token" }
 
           body   = arguments.delete(:body)
 
@@ -42,7 +43,7 @@ def get_token(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/get_user.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/get_user.rb
index 68254b014c..10e13f42bd 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/get_user.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/get_user.rb
@@ -33,6 +33,13 @@ module Actions
         def get_user(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.get_user" }
+
+          defined_params = ["username"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -49,12 +56,12 @@ def get_user(arguments = {})
           if Array(arguments[:ignore]).include?(404)
             Utils.__rescue_from_not_found {
               Elasticsearch::API::Response.new(
-                perform_request(method, path, params, body, headers)
+                perform_request(method, path, params, body, headers, request_opts)
               )
             }
           else
             Elasticsearch::API::Response.new(
-              perform_request(method, path, params, body, headers)
+              perform_request(method, path, params, body, headers, request_opts)
             )
           end
         end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/get_user_privileges.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/get_user_privileges.rb
index 826e3cdf3a..7245f658c8 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/get_user_privileges.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/get_user_privileges.rb
@@ -31,6 +31,7 @@ module Actions
         def get_user_privileges(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.get_user_privileges" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def get_user_privileges(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/get_user_profile.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/get_user_profile.rb
index 836794286f..f651e568cc 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/get_user_profile.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/get_user_profile.rb
@@ -35,6 +35,13 @@ def get_user_profile(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.get_user_profile" }
+
+          defined_params = ["uid"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = nil
 
@@ -45,7 +52,7 @@ def get_user_profile(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/grant_api_key.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/grant_api_key.rb
index bf1803e561..f00dada6d5 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/grant_api_key.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/grant_api_key.rb
@@ -35,6 +35,7 @@ def grant_api_key(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.grant_api_key" }
 
           body   = arguments.delete(:body)
 
@@ -43,7 +44,7 @@ def grant_api_key(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/has_privileges.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/has_privileges.rb
index f607ce5d2a..0de6137290 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/has_privileges.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/has_privileges.rb
@@ -35,6 +35,13 @@ def has_privileges(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.has_privileges" }
+
+          defined_params = ["user"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -49,7 +56,7 @@ def has_privileges(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/has_privileges_user_profile.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/has_privileges_user_profile.rb
index e292fad425..c23d66f853 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/has_privileges_user_profile.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/has_privileges_user_profile.rb
@@ -34,6 +34,7 @@ def has_privileges_user_profile(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.has_privileges_user_profile" }
 
           body   = arguments.delete(:body)
 
@@ -42,7 +43,7 @@ def has_privileges_user_profile(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/invalidate_api_key.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/invalidate_api_key.rb
index 4c6af6d104..731d230221 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/invalidate_api_key.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/invalidate_api_key.rb
@@ -34,6 +34,7 @@ def invalidate_api_key(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.invalidate_api_key" }
 
           body   = arguments.delete(:body)
 
@@ -42,7 +43,7 @@ def invalidate_api_key(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/invalidate_token.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/invalidate_token.rb
index 00c7321015..2380ae601c 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/invalidate_token.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/invalidate_token.rb
@@ -34,6 +34,7 @@ def invalidate_token(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.invalidate_token" }
 
           body   = arguments.delete(:body)
 
@@ -42,7 +43,7 @@ def invalidate_token(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/oidc_authenticate.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/oidc_authenticate.rb
index e2e0d93456..afb65bfda7 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/oidc_authenticate.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/oidc_authenticate.rb
@@ -34,6 +34,7 @@ def oidc_authenticate(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.oidc_authenticate" }
 
           body   = arguments.delete(:body)
 
@@ -42,7 +43,7 @@ def oidc_authenticate(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/oidc_logout.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/oidc_logout.rb
index 93985d9fde..e539954fd0 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/oidc_logout.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/oidc_logout.rb
@@ -34,6 +34,7 @@ def oidc_logout(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.oidc_logout" }
 
           body   = arguments.delete(:body)
 
@@ -42,7 +43,7 @@ def oidc_logout(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/oidc_prepare_authentication.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/oidc_prepare_authentication.rb
index b79da8ad73..bc68f54c11 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/oidc_prepare_authentication.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/oidc_prepare_authentication.rb
@@ -34,6 +34,7 @@ def oidc_prepare_authentication(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.oidc_prepare_authentication" }
 
           body   = arguments.delete(:body)
 
@@ -42,7 +43,7 @@ def oidc_prepare_authentication(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/put_privileges.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/put_privileges.rb
index d2cfd8dd15..af05f29ecc 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/put_privileges.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/put_privileges.rb
@@ -35,6 +35,7 @@ def put_privileges(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.put_privileges" }
 
           body   = arguments.delete(:body)
 
@@ -43,7 +44,7 @@ def put_privileges(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/put_role.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/put_role.rb
index b8e7ca155c..c9da4825d9 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/put_role.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/put_role.rb
@@ -37,6 +37,13 @@ def put_role(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.put_role" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -47,7 +54,7 @@ def put_role(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/put_role_mapping.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/put_role_mapping.rb
index 7de6143ab4..3912d9ae1a 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/put_role_mapping.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/put_role_mapping.rb
@@ -37,6 +37,13 @@ def put_role_mapping(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.put_role_mapping" }
+
+          defined_params = ["name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -47,7 +54,7 @@ def put_role_mapping(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/put_user.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/put_user.rb
index 966d8131ef..bacd8823d3 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/put_user.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/put_user.rb
@@ -37,6 +37,13 @@ def put_user(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.put_user" }
+
+          defined_params = ["username"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -47,7 +54,7 @@ def put_user(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/query_api_keys.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/query_api_keys.rb
index d60d86253b..7339162e26 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/query_api_keys.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/query_api_keys.rb
@@ -33,6 +33,7 @@ module Actions
         def query_api_keys(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.query_api_keys" }
 
           body   = arguments.delete(:body)
 
@@ -46,7 +47,7 @@ def query_api_keys(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/saml_authenticate.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/saml_authenticate.rb
index d743628c83..f4d14eb7ad 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/saml_authenticate.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/saml_authenticate.rb
@@ -34,6 +34,7 @@ def saml_authenticate(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.saml_authenticate" }
 
           body   = arguments.delete(:body)
 
@@ -42,7 +43,7 @@ def saml_authenticate(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/saml_complete_logout.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/saml_complete_logout.rb
index f78b2278e7..1ac996f7fb 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/saml_complete_logout.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/saml_complete_logout.rb
@@ -34,6 +34,7 @@ def saml_complete_logout(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.saml_complete_logout" }
 
           body   = arguments.delete(:body)
 
@@ -42,7 +43,7 @@ def saml_complete_logout(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/saml_invalidate.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/saml_invalidate.rb
index 264dfad171..865de98bda 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/saml_invalidate.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/saml_invalidate.rb
@@ -34,6 +34,7 @@ def saml_invalidate(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.saml_invalidate" }
 
           body   = arguments.delete(:body)
 
@@ -42,7 +43,7 @@ def saml_invalidate(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/saml_logout.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/saml_logout.rb
index c3a9b3ed53..d4a610ac0f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/saml_logout.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/saml_logout.rb
@@ -34,6 +34,7 @@ def saml_logout(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.saml_logout" }
 
           body   = arguments.delete(:body)
 
@@ -42,7 +43,7 @@ def saml_logout(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/saml_prepare_authentication.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/saml_prepare_authentication.rb
index 38ada9f603..0ba3bbaf3d 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/saml_prepare_authentication.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/saml_prepare_authentication.rb
@@ -34,6 +34,7 @@ def saml_prepare_authentication(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.saml_prepare_authentication" }
 
           body   = arguments.delete(:body)
 
@@ -42,7 +43,7 @@ def saml_prepare_authentication(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/saml_service_provider_metadata.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/saml_service_provider_metadata.rb
index ef67353889..d29fac6dad 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/saml_service_provider_metadata.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/saml_service_provider_metadata.rb
@@ -34,6 +34,13 @@ def saml_service_provider_metadata(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.saml_service_provider_metadata" }
+
+          defined_params = ["realm_name"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def saml_service_provider_metadata(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/suggest_user_profiles.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/suggest_user_profiles.rb
index 8f11761af6..8a7ce70a0b 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/suggest_user_profiles.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/suggest_user_profiles.rb
@@ -33,6 +33,7 @@ module Actions
         def suggest_user_profiles(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.suggest_user_profiles" }
 
           body   = arguments.delete(:body)
 
@@ -46,7 +47,7 @@ def suggest_user_profiles(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/update_api_key.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/update_api_key.rb
index 2939d02627..1910c51dc6 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/update_api_key.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/update_api_key.rb
@@ -35,6 +35,13 @@ def update_api_key(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.update_api_key" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -45,7 +52,7 @@ def update_api_key(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/update_cross_cluster_api_key.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/update_cross_cluster_api_key.rb
index 4d677d39c2..24ce3cc573 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/update_cross_cluster_api_key.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/update_cross_cluster_api_key.rb
@@ -40,6 +40,13 @@ def update_cross_cluster_api_key(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.update_cross_cluster_api_key" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -50,7 +57,7 @@ def update_cross_cluster_api_key(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/update_user_profile_data.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/update_user_profile_data.rb
index 41d7f5bf3d..9f9f2197fa 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/security/update_user_profile_data.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/security/update_user_profile_data.rb
@@ -39,6 +39,13 @@ def update_user_profile_data(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "security.update_user_profile_data" }
+
+          defined_params = ["uid"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body   = arguments.delete(:body)
 
@@ -49,7 +56,7 @@ def update_user_profile_data(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/shutdown/delete_node.rb b/elasticsearch-api/lib/elasticsearch/api/actions/shutdown/delete_node.rb
index dcb95bab40..7f4db153ac 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/shutdown/delete_node.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/shutdown/delete_node.rb
@@ -34,6 +34,13 @@ def delete_node(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "shutdown.delete_node" }
+
+          defined_params = ["node_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def delete_node(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/shutdown/get_node.rb b/elasticsearch-api/lib/elasticsearch/api/actions/shutdown/get_node.rb
index 2ccfb56563..f6bf7db11f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/shutdown/get_node.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/shutdown/get_node.rb
@@ -32,6 +32,13 @@ module Actions
         def get_node(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "shutdown.get_node" }
+
+          defined_params = ["node_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -46,7 +53,7 @@ def get_node(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/shutdown/put_node.rb b/elasticsearch-api/lib/elasticsearch/api/actions/shutdown/put_node.rb
index 768b5cc0c9..fb5656ce60 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/shutdown/put_node.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/shutdown/put_node.rb
@@ -36,6 +36,13 @@ def put_node(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "shutdown.put_node" }
+
+          defined_params = ["node_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -46,7 +53,7 @@ def put_node(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/cleanup_repository.rb b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/cleanup_repository.rb
index 43f94739af..eef308ea90 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/cleanup_repository.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/cleanup_repository.rb
@@ -36,6 +36,13 @@ def cleanup_repository(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "snapshot.cleanup_repository" }
+
+          defined_params = ["repository"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -46,7 +53,7 @@ def cleanup_repository(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/clone.rb b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/clone.rb
index a4804c4d3c..db2fb1b1cc 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/clone.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/clone.rb
@@ -41,6 +41,13 @@ def clone(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "snapshot.clone" }
+
+          defined_params = ["repository", "snapshot", "target_snapshot"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -55,7 +62,7 @@ def clone(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/create.rb b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/create.rb
index 1adf0321e7..66443ef99f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/create.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/create.rb
@@ -39,6 +39,13 @@ def create(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "snapshot.create" }
+
+          defined_params = ["repository", "snapshot"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -51,7 +58,7 @@ def create(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/create_repository.rb b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/create_repository.rb
index 239b0e656f..9a1369f3c5 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/create_repository.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/create_repository.rb
@@ -39,6 +39,13 @@ def create_repository(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "snapshot.create_repository" }
+
+          defined_params = ["repository"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -49,7 +56,7 @@ def create_repository(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/delete.rb b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/delete.rb
index ee154a709b..8721b5ae03 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/delete.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/delete.rb
@@ -37,6 +37,13 @@ def delete(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "snapshot.delete" }
+
+          defined_params = ["repository", "snapshot"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -51,12 +58,12 @@ def delete(arguments = {})
           if Array(arguments[:ignore]).include?(404)
             Utils.__rescue_from_not_found {
               Elasticsearch::API::Response.new(
-                perform_request(method, path, params, body, headers)
+                perform_request(method, path, params, body, headers, request_opts)
               )
             }
           else
             Elasticsearch::API::Response.new(
-              perform_request(method, path, params, body, headers)
+              perform_request(method, path, params, body, headers, request_opts)
             )
           end
         end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/delete_repository.rb b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/delete_repository.rb
index 7570265903..b705c961b2 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/delete_repository.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/delete_repository.rb
@@ -36,6 +36,13 @@ def delete_repository(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "snapshot.delete_repository" }
+
+          defined_params = ["repository"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,12 +55,12 @@ def delete_repository(arguments = {})
           if Array(arguments[:ignore]).include?(404)
             Utils.__rescue_from_not_found {
               Elasticsearch::API::Response.new(
-                perform_request(method, path, params, body, headers)
+                perform_request(method, path, params, body, headers, request_opts)
               )
             }
           else
             Elasticsearch::API::Response.new(
-              perform_request(method, path, params, body, headers)
+              perform_request(method, path, params, body, headers, request_opts)
             )
           end
         end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/get.rb b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/get.rb
index 4d42438caf..898e751d5b 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/get.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/get.rb
@@ -49,6 +49,13 @@ def get(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "snapshot.get" }
+
+          defined_params = ["repository", "snapshot"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -63,12 +70,12 @@ def get(arguments = {})
           if Array(arguments[:ignore]).include?(404)
             Utils.__rescue_from_not_found {
               Elasticsearch::API::Response.new(
-                perform_request(method, path, params, body, headers)
+                perform_request(method, path, params, body, headers, request_opts)
               )
             }
           else
             Elasticsearch::API::Response.new(
-              perform_request(method, path, params, body, headers)
+              perform_request(method, path, params, body, headers, request_opts)
             )
           end
         end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/get_repository.rb b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/get_repository.rb
index a15f903d52..3ffa74ac96 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/get_repository.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/get_repository.rb
@@ -34,6 +34,13 @@ module Actions
         def get_repository(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "snapshot.get_repository" }
+
+          defined_params = ["repository"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -50,12 +57,12 @@ def get_repository(arguments = {})
           if Array(arguments[:ignore]).include?(404)
             Utils.__rescue_from_not_found {
               Elasticsearch::API::Response.new(
-                perform_request(method, path, params, body, headers)
+                perform_request(method, path, params, body, headers, request_opts)
               )
             }
           else
             Elasticsearch::API::Response.new(
-              perform_request(method, path, params, body, headers)
+              perform_request(method, path, params, body, headers, request_opts)
             )
           end
         end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/repository_analyze.rb b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/repository_analyze.rb
index cee6820ec2..b79ef30633 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/repository_analyze.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/repository_analyze.rb
@@ -45,6 +45,13 @@ def repository_analyze(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "snapshot.repository_analyze" }
+
+          defined_params = ["repository"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -55,7 +62,7 @@ def repository_analyze(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/restore.rb b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/restore.rb
index b304cb43c7..c0690433fe 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/restore.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/restore.rb
@@ -39,6 +39,13 @@ def restore(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "snapshot.restore" }
+
+          defined_params = ["repository", "snapshot"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -51,7 +58,7 @@ def restore(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/status.rb b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/status.rb
index c2a024cd9d..f6fadc4e49 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/status.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/status.rb
@@ -35,6 +35,13 @@ module Actions
         def status(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "snapshot.status" }
+
+          defined_params = ["repository", "snapshot"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -55,12 +62,12 @@ def status(arguments = {})
           if Array(arguments[:ignore]).include?(404)
             Utils.__rescue_from_not_found {
               Elasticsearch::API::Response.new(
-                perform_request(method, path, params, body, headers)
+                perform_request(method, path, params, body, headers, request_opts)
               )
             }
           else
             Elasticsearch::API::Response.new(
-              perform_request(method, path, params, body, headers)
+              perform_request(method, path, params, body, headers, request_opts)
             )
           end
         end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/verify_repository.rb b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/verify_repository.rb
index 35c02f62e1..f1e2b6ac55 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/verify_repository.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot/verify_repository.rb
@@ -36,6 +36,13 @@ def verify_repository(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "snapshot.verify_repository" }
+
+          defined_params = ["repository"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -46,7 +53,7 @@ def verify_repository(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/delete_lifecycle.rb b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/delete_lifecycle.rb
index 0781577c3b..44e9907e0e 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/delete_lifecycle.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/delete_lifecycle.rb
@@ -34,6 +34,13 @@ def delete_lifecycle(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "slm.delete_lifecycle" }
+
+          defined_params = ["policy_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def delete_lifecycle(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/execute_lifecycle.rb b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/execute_lifecycle.rb
index a4e11a1c67..b71d557be4 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/execute_lifecycle.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/execute_lifecycle.rb
@@ -34,6 +34,13 @@ def execute_lifecycle(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "slm.execute_lifecycle" }
+
+          defined_params = ["policy_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def execute_lifecycle(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/execute_retention.rb b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/execute_retention.rb
index 6f49f1bb91..754624b3da 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/execute_retention.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/execute_retention.rb
@@ -31,6 +31,7 @@ module Actions
         def execute_retention(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "slm.execute_retention" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def execute_retention(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/get_lifecycle.rb b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/get_lifecycle.rb
index cbd8f3e3a7..5dc37ddf9c 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/get_lifecycle.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/get_lifecycle.rb
@@ -32,6 +32,13 @@ module Actions
         def get_lifecycle(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "slm.get_lifecycle" }
+
+          defined_params = ["policy_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -46,7 +53,7 @@ def get_lifecycle(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/get_stats.rb b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/get_stats.rb
index 3463f48a12..000812cfdf 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/get_stats.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/get_stats.rb
@@ -31,6 +31,7 @@ module Actions
         def get_stats(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "slm.get_stats" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def get_stats(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/get_status.rb b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/get_status.rb
index 1801e72b97..57eb4887b3 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/get_status.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/get_status.rb
@@ -31,6 +31,7 @@ module Actions
         def get_status(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "slm.get_status" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def get_status(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/put_lifecycle.rb b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/put_lifecycle.rb
index 86106c0d82..c500b73960 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/put_lifecycle.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/put_lifecycle.rb
@@ -35,6 +35,13 @@ def put_lifecycle(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "slm.put_lifecycle" }
+
+          defined_params = ["policy_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -45,7 +52,7 @@ def put_lifecycle(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/start.rb b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/start.rb
index 92b091f26e..227ad82592 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/start.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/start.rb
@@ -31,6 +31,7 @@ module Actions
         def start(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "slm.start" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def start(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/stop.rb b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/stop.rb
index 0fe259257e..381b83258f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/stop.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/snapshot_lifecycle_management/stop.rb
@@ -31,6 +31,7 @@ module Actions
         def stop(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "slm.stop" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def stop(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/sql/clear_cursor.rb b/elasticsearch-api/lib/elasticsearch/api/actions/sql/clear_cursor.rb
index aa97e9efca..231bdb925b 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/sql/clear_cursor.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/sql/clear_cursor.rb
@@ -34,6 +34,7 @@ def clear_cursor(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "sql.clear_cursor" }
 
           body   = arguments.delete(:body)
 
@@ -42,7 +43,7 @@ def clear_cursor(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/sql/delete_async.rb b/elasticsearch-api/lib/elasticsearch/api/actions/sql/delete_async.rb
index 5801dcc08d..7747e0fb01 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/sql/delete_async.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/sql/delete_async.rb
@@ -34,6 +34,13 @@ def delete_async(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "sql.delete_async" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def delete_async(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/sql/get_async.rb b/elasticsearch-api/lib/elasticsearch/api/actions/sql/get_async.rb
index a2347e9717..1bd0420cd9 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/sql/get_async.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/sql/get_async.rb
@@ -38,6 +38,13 @@ def get_async(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "sql.get_async" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def get_async(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/sql/get_async_status.rb b/elasticsearch-api/lib/elasticsearch/api/actions/sql/get_async_status.rb
index bc7a91522f..49323dcf8b 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/sql/get_async_status.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/sql/get_async_status.rb
@@ -34,6 +34,13 @@ def get_async_status(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "sql.get_async_status" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def get_async_status(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/sql/query.rb b/elasticsearch-api/lib/elasticsearch/api/actions/sql/query.rb
index 90f4875669..871daa886d 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/sql/query.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/sql/query.rb
@@ -35,6 +35,7 @@ def query(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "sql.query" }
 
           body   = arguments.delete(:body)
 
@@ -43,7 +44,7 @@ def query(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/sql/translate.rb b/elasticsearch-api/lib/elasticsearch/api/actions/sql/translate.rb
index 3f9764e75f..08f000560d 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/sql/translate.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/sql/translate.rb
@@ -34,6 +34,7 @@ def translate(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "sql.translate" }
 
           body   = arguments.delete(:body)
 
@@ -42,7 +43,7 @@ def translate(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/ssl/certificates.rb b/elasticsearch-api/lib/elasticsearch/api/actions/ssl/certificates.rb
index 549c149c9a..72b354f5bd 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/ssl/certificates.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/ssl/certificates.rb
@@ -31,6 +31,7 @@ module Actions
         def certificates(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "ssl.certificates" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def certificates(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/synonym_rule/get.rb b/elasticsearch-api/lib/elasticsearch/api/actions/synonym_rule/get.rb
deleted file mode 100644
index 3b09962ca1..0000000000
--- a/elasticsearch-api/lib/elasticsearch/api/actions/synonym_rule/get.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-# Licensed to Elasticsearch B.V. under one or more contributor
-# license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright
-# ownership. Elasticsearch B.V. licenses this file to you under
-# the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# Auto generated from build hash f284cc16f4d4b4289bc679aa1529bb504190fe80
-# @see https://github.com/elastic/elasticsearch/tree/main/rest-api-spec
-#
-module Elasticsearch
-  module API
-    module SynonymRule
-      module Actions
-        # Retrieves a synonym rule from a synonym set
-        # This functionality is Experimental and may be changed or removed
-        # completely in a future release. Elastic will take a best effort approach
-        # to fix any issues, but experimental features are not subject to the
-        # support SLA of official GA features.
-        #
-        # @option arguments [String] :synonyms_set The id of the synonym set to retrieve the synonym rule from
-        # @option arguments [String] :synonym_rule The id of the synonym rule to retrieve
-        # @option arguments [Hash] :headers Custom HTTP headers
-        #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/get-synonym-rule.html
-        #
-        def get(arguments = {})
-          raise ArgumentError, "Required argument 'synonyms_set' missing" unless arguments[:synonyms_set]
-          raise ArgumentError, "Required argument 'synonym_rule' missing" unless arguments[:synonym_rule]
-
-          arguments = arguments.clone
-          headers = arguments.delete(:headers) || {}
-
-          body = nil
-
-          _synonyms_set = arguments.delete(:synonyms_set)
-
-          _synonym_rule = arguments.delete(:synonym_rule)
-
-          method = Elasticsearch::API::HTTP_GET
-          path   = "_synonyms/#{Utils.__listify(_synonyms_set)}/#{Utils.__listify(_synonym_rule)}"
-          params = {}
-
-          Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
-          )
-        end
-      end
-    end
-  end
-end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/synonym_rule/put.rb b/elasticsearch-api/lib/elasticsearch/api/actions/synonym_rule/put.rb
index 15063d7f63..ab7a0d1a62 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/synonym_rule/put.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/synonym_rule/put.rb
@@ -42,6 +42,13 @@ def put(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "synonym_rule.put" }
+
+          defined_params = ["synonyms_set", "synonym_rule"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -54,7 +61,7 @@ def put(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/synonyms/delete.rb b/elasticsearch-api/lib/elasticsearch/api/actions/synonyms/delete.rb
index c7d64979c3..01719f8ec6 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/synonyms/delete.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/synonyms/delete.rb
@@ -38,6 +38,13 @@ def delete(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "synonyms.delete" }
+
+          defined_params = ["synonyms_set"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def delete(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/synonyms/get.rb b/elasticsearch-api/lib/elasticsearch/api/actions/synonyms/get.rb
index f20ae634da..f2793e8bfe 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/synonyms/get.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/synonyms/get.rb
@@ -40,6 +40,13 @@ def get(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "synonyms.get" }
+
+          defined_params = ["synonyms_set"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -50,7 +57,7 @@ def get(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/synonyms/put.rb b/elasticsearch-api/lib/elasticsearch/api/actions/synonyms/put.rb
index 4b0cd02143..8499f81ec6 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/synonyms/put.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/synonyms/put.rb
@@ -40,6 +40,13 @@ def put(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "synonyms.put" }
+
+          defined_params = ["synonyms_set"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -50,7 +57,7 @@ def put(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/synonyms_sets/get.rb b/elasticsearch-api/lib/elasticsearch/api/actions/synonyms_sets/get.rb
index 8a20c6b9da..bf64cc86dc 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/synonyms_sets/get.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/synonyms_sets/get.rb
@@ -37,6 +37,7 @@ module Actions
         def get(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "synonyms_sets.get" }
 
           body   = nil
 
@@ -45,7 +46,7 @@ def get(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/tasks/cancel.rb b/elasticsearch-api/lib/elasticsearch/api/actions/tasks/cancel.rb
index 076fb91d80..3ce43b2f46 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/tasks/cancel.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/tasks/cancel.rb
@@ -40,6 +40,13 @@ module Actions
         def cancel(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "tasks.cancel" }
+
+          defined_params = ["task_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -54,7 +61,7 @@ def cancel(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/tasks/get.rb b/elasticsearch-api/lib/elasticsearch/api/actions/tasks/get.rb
index b94d91bc6b..961675707e 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/tasks/get.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/tasks/get.rb
@@ -38,6 +38,13 @@ module Actions
         def get(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "tasks.get" }
+
+          defined_params = ["task_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def get(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/tasks/list.rb b/elasticsearch-api/lib/elasticsearch/api/actions/tasks/list.rb
index a16ef69c36..0c13c1b057 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/tasks/list.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/tasks/list.rb
@@ -42,6 +42,7 @@ module Actions
         def list(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "tasks.list" }
 
           body   = nil
 
@@ -50,7 +51,7 @@ def list(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/terms_enum.rb b/elasticsearch-api/lib/elasticsearch/api/actions/terms_enum.rb
index 9dbfd23551..92f27c5249 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/terms_enum.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/terms_enum.rb
@@ -34,6 +34,13 @@ def terms_enum(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "terms_enum" }
+
+        defined_params = ["index"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body   = arguments.delete(:body)
 
@@ -49,7 +56,7 @@ def terms_enum(arguments = {})
         params = {}
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/termvectors.rb b/elasticsearch-api/lib/elasticsearch/api/actions/termvectors.rb
index 1e6f2eea98..2ce6950d41 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/termvectors.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/termvectors.rb
@@ -46,6 +46,13 @@ def termvectors(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "termvectors" }
+
+        defined_params = ["index", "id"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body   = arguments.delete(:body)
 
@@ -68,7 +75,7 @@ def termvectors(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
 
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/text_structure/find_structure.rb b/elasticsearch-api/lib/elasticsearch/api/actions/text_structure/find_structure.rb
index 56ea7efbfa..5a94a38166 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/text_structure/find_structure.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/text_structure/find_structure.rb
@@ -49,6 +49,7 @@ def find_structure(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "text_structure.find_structure" }
 
           body   = arguments.delete(:body)
 
@@ -64,7 +65,7 @@ def find_structure(arguments = {})
 
           headers.merge!("Content-Type" => "application/x-ndjson")
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, payload, headers)
+            perform_request(method, path, params, payload, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/transform/delete_transform.rb b/elasticsearch-api/lib/elasticsearch/api/actions/transform/delete_transform.rb
index 0be922e61b..6f590254be 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/transform/delete_transform.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/transform/delete_transform.rb
@@ -37,6 +37,13 @@ def delete_transform(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "transform.delete_transform" }
+
+          defined_params = ["transform_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -47,7 +54,7 @@ def delete_transform(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/transform/get_transform.rb b/elasticsearch-api/lib/elasticsearch/api/actions/transform/get_transform.rb
index 957645fca5..4a6a3685df 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/transform/get_transform.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/transform/get_transform.rb
@@ -36,6 +36,13 @@ module Actions
         def get_transform(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "transform.get_transform" }
+
+          defined_params = ["transform_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -50,7 +57,7 @@ def get_transform(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/transform/get_transform_stats.rb b/elasticsearch-api/lib/elasticsearch/api/actions/transform/get_transform_stats.rb
index 72c8b5f0d3..a2eadee5da 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/transform/get_transform_stats.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/transform/get_transform_stats.rb
@@ -38,6 +38,13 @@ def get_transform_stats(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "transform.get_transform_stats" }
+
+          defined_params = ["transform_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -48,7 +55,7 @@ def get_transform_stats(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/transform/preview_transform.rb b/elasticsearch-api/lib/elasticsearch/api/actions/transform/preview_transform.rb
index ec438cd5d6..ec8d4798cc 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/transform/preview_transform.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/transform/preview_transform.rb
@@ -34,6 +34,13 @@ module Actions
         def preview_transform(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "transform.preview_transform" }
+
+          defined_params = ["transform_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -53,7 +60,7 @@ def preview_transform(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/transform/put_transform.rb b/elasticsearch-api/lib/elasticsearch/api/actions/transform/put_transform.rb
index ceab00abbc..d5492a353f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/transform/put_transform.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/transform/put_transform.rb
@@ -38,6 +38,13 @@ def put_transform(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "transform.put_transform" }
+
+          defined_params = ["transform_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -48,7 +55,7 @@ def put_transform(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/transform/reset_transform.rb b/elasticsearch-api/lib/elasticsearch/api/actions/transform/reset_transform.rb
index b05517f375..2745ee2ab6 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/transform/reset_transform.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/transform/reset_transform.rb
@@ -36,6 +36,13 @@ def reset_transform(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "transform.reset_transform" }
+
+          defined_params = ["transform_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -46,7 +53,7 @@ def reset_transform(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/transform/schedule_now_transform.rb b/elasticsearch-api/lib/elasticsearch/api/actions/transform/schedule_now_transform.rb
index c609724e69..1a96e8706d 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/transform/schedule_now_transform.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/transform/schedule_now_transform.rb
@@ -35,6 +35,13 @@ def schedule_now_transform(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "transform.schedule_now_transform" }
+
+          defined_params = ["transform_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -45,7 +52,7 @@ def schedule_now_transform(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/transform/start_transform.rb b/elasticsearch-api/lib/elasticsearch/api/actions/transform/start_transform.rb
index d41773766d..e7ea6698f4 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/transform/start_transform.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/transform/start_transform.rb
@@ -36,6 +36,13 @@ def start_transform(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "transform.start_transform" }
+
+          defined_params = ["transform_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -46,7 +53,7 @@ def start_transform(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/transform/stop_transform.rb b/elasticsearch-api/lib/elasticsearch/api/actions/transform/stop_transform.rb
index 42743b657c..eaefcb81f0 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/transform/stop_transform.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/transform/stop_transform.rb
@@ -39,6 +39,13 @@ def stop_transform(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "transform.stop_transform" }
+
+          defined_params = ["transform_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -49,7 +56,7 @@ def stop_transform(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/transform/update_transform.rb b/elasticsearch-api/lib/elasticsearch/api/actions/transform/update_transform.rb
index f5b8e245c7..ec1e3c9c01 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/transform/update_transform.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/transform/update_transform.rb
@@ -38,6 +38,13 @@ def update_transform(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "transform.update_transform" }
+
+          defined_params = ["transform_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -48,7 +55,7 @@ def update_transform(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/transform/upgrade_transforms.rb b/elasticsearch-api/lib/elasticsearch/api/actions/transform/upgrade_transforms.rb
index 22bf4c0353..e61a2db4b3 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/transform/upgrade_transforms.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/transform/upgrade_transforms.rb
@@ -33,6 +33,7 @@ module Actions
         def upgrade_transforms(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "transform.upgrade_transforms" }
 
           body   = nil
 
@@ -41,7 +42,7 @@ def upgrade_transforms(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/update.rb b/elasticsearch-api/lib/elasticsearch/api/actions/update.rb
index 93cdb4b992..e7147614d9 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/update.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/update.rb
@@ -49,6 +49,13 @@ def update(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "update" }
+
+        defined_params = ["index", "id"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body = arguments.delete(:body)
 
@@ -63,12 +70,12 @@ def update(arguments = {})
         if Array(arguments[:ignore]).include?(404)
           Utils.__rescue_from_not_found {
             Elasticsearch::API::Response.new(
-              perform_request(method, path, params, body, headers)
+              perform_request(method, path, params, body, headers, request_opts)
             )
           }
         else
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/update_by_query.rb b/elasticsearch-api/lib/elasticsearch/api/actions/update_by_query.rb
index 54d1d63102..8d6495e807 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/update_by_query.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/update_by_query.rb
@@ -66,6 +66,13 @@ def update_by_query(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "update_by_query" }
+
+        defined_params = ["index"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body   = arguments.delete(:body)
 
@@ -76,7 +83,7 @@ def update_by_query(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/update_by_query_rethrottle.rb b/elasticsearch-api/lib/elasticsearch/api/actions/update_by_query_rethrottle.rb
index b34ecd28b4..359c346f48 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/update_by_query_rethrottle.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/update_by_query_rethrottle.rb
@@ -34,6 +34,13 @@ def update_by_query_rethrottle(arguments = {})
 
         arguments = arguments.clone
         headers = arguments.delete(:headers) || {}
+        request_opts = { :endpoint => "update_by_query_rethrottle" }
+
+        defined_params = ["task_id"].inject({}) do |set_variables, variable|
+          set_variables[variable] = arguments[variable] if arguments.key?(variable)
+          set_variables
+        end
+        request_opts[:defined_params] = defined_params unless defined_params.empty?
 
         body = nil
 
@@ -44,7 +51,7 @@ def update_by_query_rethrottle(arguments = {})
         params = Utils.process_params(arguments)
 
         Elasticsearch::API::Response.new(
-          perform_request(method, path, params, body, headers)
+          perform_request(method, path, params, body, headers, request_opts)
         )
       end
     end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/ack_watch.rb b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/ack_watch.rb
index 985ca3db1d..849726634e 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/ack_watch.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/ack_watch.rb
@@ -35,6 +35,13 @@ def ack_watch(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "watcher.ack_watch" }
+
+          defined_params = ["watch_id", "action_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -51,7 +58,7 @@ def ack_watch(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/activate_watch.rb b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/activate_watch.rb
index c973d60dac..acca4cb8a9 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/activate_watch.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/activate_watch.rb
@@ -34,6 +34,13 @@ def activate_watch(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "watcher.activate_watch" }
+
+          defined_params = ["watch_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def activate_watch(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/deactivate_watch.rb b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/deactivate_watch.rb
index 25cbeabd9d..74178bd2e8 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/deactivate_watch.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/deactivate_watch.rb
@@ -34,6 +34,13 @@ def deactivate_watch(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "watcher.deactivate_watch" }
+
+          defined_params = ["watch_id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def deactivate_watch(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/delete_watch.rb b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/delete_watch.rb
index 46a19f167b..05996737a3 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/delete_watch.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/delete_watch.rb
@@ -34,6 +34,13 @@ def delete_watch(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "watcher.delete_watch" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -46,12 +53,12 @@ def delete_watch(arguments = {})
           if Array(arguments[:ignore]).include?(404)
             Utils.__rescue_from_not_found {
               Elasticsearch::API::Response.new(
-                perform_request(method, path, params, body, headers)
+                perform_request(method, path, params, body, headers, request_opts)
               )
             }
           else
             Elasticsearch::API::Response.new(
-              perform_request(method, path, params, body, headers)
+              perform_request(method, path, params, body, headers, request_opts)
             )
           end
         end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/execute_watch.rb b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/execute_watch.rb
index d0bf8b1c26..06e84c88df 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/execute_watch.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/execute_watch.rb
@@ -34,6 +34,13 @@ module Actions
         def execute_watch(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "watcher.execute_watch" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -48,7 +55,7 @@ def execute_watch(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/get_settings.rb b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/get_settings.rb
index 565a6b8840..a516b0d577 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/get_settings.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/get_settings.rb
@@ -31,6 +31,7 @@ module Actions
         def get_settings(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "watcher.get_settings" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def get_settings(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/get_watch.rb b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/get_watch.rb
index f6d28bea93..a56a90627d 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/get_watch.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/get_watch.rb
@@ -34,6 +34,13 @@ def get_watch(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "watcher.get_watch" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -44,7 +51,7 @@ def get_watch(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/put_watch.rb b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/put_watch.rb
index a582e0016e..7e0f17f77e 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/put_watch.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/put_watch.rb
@@ -39,6 +39,13 @@ def put_watch(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "watcher.put_watch" }
+
+          defined_params = ["id"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = arguments.delete(:body)
 
@@ -49,7 +56,7 @@ def put_watch(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/query_watches.rb b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/query_watches.rb
index 5a952ca40a..46191b3a0f 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/query_watches.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/query_watches.rb
@@ -32,6 +32,7 @@ module Actions
         def query_watches(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "watcher.query_watches" }
 
           body   = arguments.delete(:body)
 
@@ -45,7 +46,7 @@ def query_watches(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/start.rb b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/start.rb
index fa71261a8a..63da1b2920 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/start.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/start.rb
@@ -31,6 +31,7 @@ module Actions
         def start(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "watcher.start" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def start(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/stats.rb b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/stats.rb
index cea1d31c91..9c7d85240c 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/stats.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/stats.rb
@@ -33,6 +33,13 @@ module Actions
         def stats(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "watcher.stats" }
+
+          defined_params = ["metric"].inject({}) do |set_variables, variable|
+            set_variables[variable] = arguments[variable] if arguments.key?(variable)
+            set_variables
+          end
+          request_opts[:defined_params] = defined_params unless defined_params.empty?
 
           body = nil
 
@@ -47,7 +54,7 @@ def stats(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/stop.rb b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/stop.rb
index 5d2394caf4..9031577cba 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/stop.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/stop.rb
@@ -31,6 +31,7 @@ module Actions
         def stop(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "watcher.stop" }
 
           body   = nil
 
@@ -39,7 +40,7 @@ def stop(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/update_settings.rb b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/update_settings.rb
index 6e4c27c223..7b101fcb7d 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/watcher/update_settings.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/watcher/update_settings.rb
@@ -34,6 +34,7 @@ def update_settings(arguments = {})
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "watcher.update_settings" }
 
           body   = arguments.delete(:body)
 
@@ -42,7 +43,7 @@ def update_settings(arguments = {})
           params = {}
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/xpack/info.rb b/elasticsearch-api/lib/elasticsearch/api/actions/xpack/info.rb
index 6dc2b6e496..d12c62bd5c 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/xpack/info.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/xpack/info.rb
@@ -33,6 +33,7 @@ module Actions
         def info(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "xpack.info" }
 
           body   = nil
 
@@ -41,7 +42,7 @@ def info(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/xpack/usage.rb b/elasticsearch-api/lib/elasticsearch/api/actions/xpack/usage.rb
index b15346c02a..a0035673a8 100644
--- a/elasticsearch-api/lib/elasticsearch/api/actions/xpack/usage.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/actions/xpack/usage.rb
@@ -32,6 +32,7 @@ module Actions
         def usage(arguments = {})
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}
+          request_opts = { :endpoint => "xpack.usage" }
 
           body   = nil
 
@@ -40,7 +41,7 @@ def usage(arguments = {})
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(
-            perform_request(method, path, params, body, headers)
+            perform_request(method, path, params, body, headers, request_opts)
           )
         end
       end
diff --git a/elasticsearch-api/lib/elasticsearch/api/namespace/common.rb b/elasticsearch-api/lib/elasticsearch/api/namespace/common.rb
index 06cac3f73a..72477db380 100644
--- a/elasticsearch-api/lib/elasticsearch/api/namespace/common.rb
+++ b/elasticsearch-api/lib/elasticsearch/api/namespace/common.rb
@@ -34,8 +34,8 @@ def initialize(client)
 
         # Delegates the `perform_request` method to the wrapped client
         #
-        def perform_request(method, path, params={}, body=nil, headers=nil)
-          client.perform_request method, path, params, body, headers
+        def perform_request(method, path, params={}, body=nil, headers=nil, opts = {})
+          client.perform_request method, path, params, body, headers, opts
         end
       end
 
diff --git a/elasticsearch-api/spec/elasticsearch/api/actions/cat/aliases_spec.rb b/elasticsearch-api/spec/elasticsearch/api/actions/cat/aliases_spec.rb
index 934e4d3aa0..fd7fb4e475 100644
--- a/elasticsearch-api/spec/elasticsearch/api/actions/cat/aliases_spec.rb
+++ b/elasticsearch-api/spec/elasticsearch/api/actions/cat/aliases_spec.rb
@@ -25,7 +25,9 @@
         '_cat/aliases',
         {},
         nil,
-        {}
+        {},
+        { path_templates: ["/_cat/aliases", "/_cat/aliases/{name}"],
+          endpoint: "cat.aliases" }
     ]
   end
 
diff --git a/elasticsearch-api/spec/elasticsearch/api/actions/cat/allocation_spec.rb b/elasticsearch-api/spec/elasticsearch/api/actions/cat/allocation_spec.rb
index ee5db7275e..e2033acfb6 100644
--- a/elasticsearch-api/spec/elasticsearch/api/actions/cat/allocation_spec.rb
+++ b/elasticsearch-api/spec/elasticsearch/api/actions/cat/allocation_spec.rb
@@ -25,7 +25,9 @@
         '_cat/allocation',
         {},
         nil,
-        {}
+        {},
+        path_templates: ["/_cat/allocation", "/_cat/allocation/{node_id}"],
+        endpoint: "cat.allocation"
     ]
   end
 
diff --git a/elasticsearch-api/spec/elasticsearch/api/actions/cat/component_templates_spec.rb b/elasticsearch-api/spec/elasticsearch/api/actions/cat/component_templates_spec.rb
index eb03af9102..563ee1edd5 100644
--- a/elasticsearch-api/spec/elasticsearch/api/actions/cat/component_templates_spec.rb
+++ b/elasticsearch-api/spec/elasticsearch/api/actions/cat/component_templates_spec.rb
@@ -24,7 +24,9 @@
       url,
       {},
       nil,
-      {}
+      {},
+      path_templates: ["/_cat/component_templates", "/_cat/component_templates/{name}"],
+      endpoint: "cat.component_templates"
     ]
   end
 
diff --git a/elasticsearch-api/spec/elasticsearch/api/actions/cat/count_spec.rb b/elasticsearch-api/spec/elasticsearch/api/actions/cat/count_spec.rb
index e1c335032a..967fe638dd 100644
--- a/elasticsearch-api/spec/elasticsearch/api/actions/cat/count_spec.rb
+++ b/elasticsearch-api/spec/elasticsearch/api/actions/cat/count_spec.rb
@@ -25,7 +25,9 @@
         '_cat/count',
         {},
         nil,
-        {}
+        {},
+        path_templates: ["/_cat/count", "/_cat/count/{index}"],
+        endpoint: "cat.count"
     ]
   end
 
diff --git a/elasticsearch-api/spec/elasticsearch/api/actions/cat/fielddata_spec.rb b/elasticsearch-api/spec/elasticsearch/api/actions/cat/fielddata_spec.rb
index 051622921d..6cb116df64 100644
--- a/elasticsearch-api/spec/elasticsearch/api/actions/cat/fielddata_spec.rb
+++ b/elasticsearch-api/spec/elasticsearch/api/actions/cat/fielddata_spec.rb
@@ -25,7 +25,9 @@
         '_cat/fielddata',
         {},
         nil,
-        {}
+        {},
+        path_templates: ["/_cat/fielddata", "/_cat/fielddata/{fields}"],
+        endpoint: "cat.fielddata"
     ]
   end
 
@@ -41,7 +43,9 @@
           '_cat/fielddata/foo,bar',
           {},
           nil,
-          {}
+          {},
+          path_templates: ["/_cat/fielddata", "/_cat/fielddata/{fields}"],
+          endpoint: "cat.fielddata"
       ]
     end
 
diff --git a/elasticsearch-api/spec/elasticsearch/api/actions/cat/health_spec.rb b/elasticsearch-api/spec/elasticsearch/api/actions/cat/health_spec.rb
index 32afd710f2..51554c8997 100644
--- a/elasticsearch-api/spec/elasticsearch/api/actions/cat/health_spec.rb
+++ b/elasticsearch-api/spec/elasticsearch/api/actions/cat/health_spec.rb
@@ -25,7 +25,9 @@
         '_cat/health',
         {},
         nil,
-        {}
+        {},
+        path_templates: ["/_cat/health"],
+        endpoint: "cat.health"
     ]
   end
 
diff --git a/elasticsearch-api/spec/elasticsearch/api/actions/cat/help_spec.rb b/elasticsearch-api/spec/elasticsearch/api/actions/cat/help_spec.rb
index eccfa32c29..19f5b67d6e 100644
--- a/elasticsearch-api/spec/elasticsearch/api/actions/cat/help_spec.rb
+++ b/elasticsearch-api/spec/elasticsearch/api/actions/cat/help_spec.rb
@@ -25,7 +25,9 @@
         '_cat',
         {},
         nil,
-        {}
+        {},
+        path_templates: ["/_cat"],
+        endpoint: "cat.help"
     ]
   end
 
diff --git a/elasticsearch-api/spec/elasticsearch/api/actions/cat/indices_spec.rb b/elasticsearch-api/spec/elasticsearch/api/actions/cat/indices_spec.rb
index 823ec1f8fa..0e9a4d1d68 100644
--- a/elasticsearch-api/spec/elasticsearch/api/actions/cat/indices_spec.rb
+++ b/elasticsearch-api/spec/elasticsearch/api/actions/cat/indices_spec.rb
@@ -25,7 +25,8 @@
         '_cat/indices',
         {},
         nil,
-        {}
+        {},
+        { endpoint: "cat.indices" }
     ]
   end
 
diff --git a/elasticsearch-api/spec/elasticsearch/api/actions/cat/master_spec.rb b/elasticsearch-api/spec/elasticsearch/api/actions/cat/master_spec.rb
index 906c67fe05..698faec7bb 100644
--- a/elasticsearch-api/spec/elasticsearch/api/actions/cat/master_spec.rb
+++ b/elasticsearch-api/spec/elasticsearch/api/actions/cat/master_spec.rb
@@ -25,7 +25,9 @@
         '_cat/master',
         {},
         nil,
-        {}
+        {},
+        path_templates: ["/_cat/master"],
+        endpoint: "cat.master"
     ]
   end
 
diff --git a/elasticsearch-api/spec/elasticsearch/api/actions/cat/nodeattrs_spec.rb b/elasticsearch-api/spec/elasticsearch/api/actions/cat/nodeattrs_spec.rb
index b7caa40ea9..2da901ef96 100644
--- a/elasticsearch-api/spec/elasticsearch/api/actions/cat/nodeattrs_spec.rb
+++ b/elasticsearch-api/spec/elasticsearch/api/actions/cat/nodeattrs_spec.rb
@@ -25,7 +25,9 @@
         '_cat/nodeattrs',
         {},
         nil,
-        {}
+        {},
+        path_templates: ["/_cat/nodeattrs"],
+        endpoint: "cat.nodeattrs"
     ]
   end
 
diff --git a/elasticsearch-api/spec/elasticsearch/api/actions/cat/nodes_spec.rb b/elasticsearch-api/spec/elasticsearch/api/actions/cat/nodes_spec.rb
index 8c21eeb698..c2bcbe319b 100644
--- a/elasticsearch-api/spec/elasticsearch/api/actions/cat/nodes_spec.rb
+++ b/elasticsearch-api/spec/elasticsearch/api/actions/cat/nodes_spec.rb
@@ -25,7 +25,8 @@
         '_cat/nodes',
         {},
         nil,
-        {}
+        {},
+        { endpoint: "cat.nodes" }
     ]
   end
 
diff --git a/elasticsearch-api/spec/elasticsearch/api/actions/cat/pending_tasks_spec.rb b/elasticsearch-api/spec/elasticsearch/api/actions/cat/pending_tasks_spec.rb
index f61e07ba34..a2161a0fb2 100644
--- a/elasticsearch-api/spec/elasticsearch/api/actions/cat/pending_tasks_spec.rb
+++ b/elasticsearch-api/spec/elasticsearch/api/actions/cat/pending_tasks_spec.rb
@@ -25,7 +25,9 @@
         '_cat/pending_tasks',
         {},
         nil,
-        {}
+        {},
+        path_templates: ["/_cat/pending_tasks"],
+        endpoint: "cat.pending_tasks"
     ]
   end
 
diff --git a/elasticsearch-api/spec/elasticsearch/api/actions/cat/plugins_spec.rb b/elasticsearch-api/spec/elasticsearch/api/actions/cat/plugins_spec.rb
index 186b3a4903..e657f6183a 100644
--- a/elasticsearch-api/spec/elasticsearch/api/actions/cat/plugins_spec.rb
+++ b/elasticsearch-api/spec/elasticsearch/api/actions/cat/plugins_spec.rb
@@ -25,7 +25,9 @@
         '_cat/plugins',
         {},
         nil,
-        {}
+        {},
+        path_templates: ["/_cat/plugins"],
+        endpoint: "cat.plugins"
     ]
   end
 
diff --git a/elasticsearch-api/spec/elasticsearch/api/actions/cat/recovery_spec.rb b/elasticsearch-api/spec/elasticsearch/api/actions/cat/recovery_spec.rb
index c2b08ba799..e230fe94f6 100644
--- a/elasticsearch-api/spec/elasticsearch/api/actions/cat/recovery_spec.rb
+++ b/elasticsearch-api/spec/elasticsearch/api/actions/cat/recovery_spec.rb
@@ -25,7 +25,9 @@
         '_cat/recovery',
         {},
         nil,
-        {}
+        {},
+        path_templates: ["/_cat/recovery", "/_cat/recovery/{index}"],
+        endpoint: "cat.recovery"
     ]
   end
 
diff --git a/elasticsearch-api/spec/elasticsearch/api/actions/cat/repositories_spec.rb b/elasticsearch-api/spec/elasticsearch/api/actions/cat/repositories_spec.rb
index ac22e49eef..823028bcfc 100644
--- a/elasticsearch-api/spec/elasticsearch/api/actions/cat/repositories_spec.rb
+++ b/elasticsearch-api/spec/elasticsearch/api/actions/cat/repositories_spec.rb
@@ -25,7 +25,9 @@
         '_cat/repositories',
         {},
         nil,
-        {}
+        {},
+        path_templates: ["/_cat/repositories"],
+        endpoint: "cat.repositories"
     ]
   end
 
diff --git a/elasticsearch-api/spec/elasticsearch/api/actions/cat/segments_spec.rb b/elasticsearch-api/spec/elasticsearch/api/actions/cat/segments_spec.rb
index f85fd7e623..e44b011b65 100644
--- a/elasticsearch-api/spec/elasticsearch/api/actions/cat/segments_spec.rb
+++ b/elasticsearch-api/spec/elasticsearch/api/actions/cat/segments_spec.rb
@@ -25,7 +25,9 @@
       url,
       {},
       nil,
-      {}
+      {},
+      path_templates: ["/_cat/segments", "/_cat/segments/{index}"],
+      endpoint: "cat.segments"
     ]
   end
 
diff --git a/elasticsearch-api/spec/elasticsearch/api/actions/cat/shards_spec.rb b/elasticsearch-api/spec/elasticsearch/api/actions/cat/shards_spec.rb
index acad84f522..42e00f2290 100644
--- a/elasticsearch-api/spec/elasticsearch/api/actions/cat/shards_spec.rb
+++ b/elasticsearch-api/spec/elasticsearch/api/actions/cat/shards_spec.rb
@@ -25,7 +25,9 @@
         '_cat/shards',
         {},
         nil,
-        {}
+        {},
+        path_templates: ["/_cat/shards", "/_cat/shards/{index}"],
+        endpoint: "cat.shards"
     ]
   end
 
diff --git a/elasticsearch-api/spec/elasticsearch/api/actions/cat/snapshot_spec.rb b/elasticsearch-api/spec/elasticsearch/api/actions/cat/snapshot_spec.rb
index 476fe1c3e3..5606d17cf4 100644
--- a/elasticsearch-api/spec/elasticsearch/api/actions/cat/snapshot_spec.rb
+++ b/elasticsearch-api/spec/elasticsearch/api/actions/cat/snapshot_spec.rb
@@ -25,7 +25,9 @@
         '_cat/snapshots/foo',
         {},
         nil,
-        {}
+        {},
+        path_templates: ["/_cat/snapshots", "/_cat/snapshots/{repository}"],
+        endpoint: "cat.snapshots"
     ]
   end
 
diff --git a/elasticsearch-api/spec/elasticsearch/api/actions/cat/tasks_spec.rb b/elasticsearch-api/spec/elasticsearch/api/actions/cat/tasks_spec.rb
index 5d64e3747b..77f0a12376 100644
--- a/elasticsearch-api/spec/elasticsearch/api/actions/cat/tasks_spec.rb
+++ b/elasticsearch-api/spec/elasticsearch/api/actions/cat/tasks_spec.rb
@@ -25,7 +25,9 @@
         '_cat/tasks',
         {},
         nil,
-        {}
+        {},
+        path_templates: ["/_cat/tasks"],
+        endpoint: "cat.tasks"
     ]
   end
 
diff --git a/elasticsearch-api/spec/elasticsearch/api/actions/cat/templates_spec.rb b/elasticsearch-api/spec/elasticsearch/api/actions/cat/templates_spec.rb
index 102031870a..62846c06fc 100644
--- a/elasticsearch-api/spec/elasticsearch/api/actions/cat/templates_spec.rb
+++ b/elasticsearch-api/spec/elasticsearch/api/actions/cat/templates_spec.rb
@@ -25,7 +25,9 @@
         '_cat/templates',
         {},
         nil,
-        {}
+        {},
+        path_templates: ["/_cat/templates", "/_cat/templates/{name}"],
+        endpoint: "cat.templates"
     ]
   end
 
diff --git a/elasticsearch-api/spec/elasticsearch/api/actions/cat/thread_pool_spec.rb b/elasticsearch-api/spec/elasticsearch/api/actions/cat/thread_pool_spec.rb
index 7ff9f7c374..29caeb8efa 100644
--- a/elasticsearch-api/spec/elasticsearch/api/actions/cat/thread_pool_spec.rb
+++ b/elasticsearch-api/spec/elasticsearch/api/actions/cat/thread_pool_spec.rb
@@ -25,7 +25,9 @@
         '_cat/thread_pool',
         {},
         nil,
-        {}
+        {},
+        path_templates: ["/_cat/thread_pool", "/_cat/thread_pool/{thread_pool_patterns}"],
+        endpoint: "cat.thread_pool"
     ]
   end
 
diff --git a/elasticsearch-api/spec/opentelemetry_spec.rb b/elasticsearch-api/spec/opentelemetry_spec.rb
new file mode 100644
index 0000000000..2955a96871
--- /dev/null
+++ b/elasticsearch-api/spec/opentelemetry_spec.rb
@@ -0,0 +1,179 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'spec_helper'
+require 'elastic-transport'
+require 'opentelemetry-sdk'
+
+include Elasticsearch::API::EndpointSpecifics
+
+def __full_namespace
+  names = @endpoint_name.split('.')
+  # Return an array to expand 'ccr', 'ilm', 'ml' and 'slm'
+  names.map do |name|
+    name
+      .gsub(/^ml$/, 'machine_learning')
+      .gsub(/^ilm$/, 'index_lifecycle_management')
+      .gsub(/^ccr/, 'cross_cluster_replication')
+      .gsub(/^slm/, 'snapshot_lifecycle_management')
+  end
+end
+
+def __endpoint_parts
+  parts = @spec['url']['paths'].select do |a|
+    a.keys.include?('parts')
+  end.map do |path|
+    path&.[]('parts')
+  end
+  (parts.inject(&:merge) || [])
+end
+
+def __http_method
+  return '_id ? Elasticsearch::API::HTTP_PUT : Elasticsearch::API::HTTP_POST' if @endpoint_name == 'index'
+  return '_name ? Elasticsearch::API::HTTP_PUT : Elasticsearch::API::HTTP_POST' if @method_name == 'create_service_token'
+  return post_and_get if @endpoint_name == 'count'
+
+  default_method = @spec['url']['paths'].map { |a| a['methods'] }.flatten.first
+  if @spec['body'] && default_method == 'GET'
+    # When default method is GET and body is required, we should always use POST
+    if @spec['body']['required']
+      'Elasticsearch::API::HTTP_POST'
+    else
+      post_and_get
+    end
+  else
+    "Elasticsearch::API::HTTP_#{default_method}"
+  end
+end
+
+def __required_parts
+  required = []
+  return required if @endpoint_name == 'tasks.get'
+
+  required << 'body' if (@spec['body'] && @spec['body']['required'])
+  # Get required variables from paths:
+  req_variables = __path_variables.inject(:&) # find intersection
+  required << req_variables unless req_variables.empty?
+  required.flatten
+end
+
+def __path_variables
+  @paths.map do |path|
+    __extract_path_variables(path)
+  end
+end
+
+# extract values that are in the {var} format:
+def __extract_path_variables(path)
+  path.scan(/{(\w+)}/).flatten
+end
+
+def post_and_get
+  # the METHOD is defined after doing arguments.delete(:body), so we need to check for `body`
+  <<~SRC
+    if body
+      Elasticsearch::API::HTTP_POST
+    else
+      Elasticsearch::API::HTTP_GET
+    end
+  SRC
+end
+
+describe 'OpenTelemetry' do
+
+   Elasticsearch::API::FilesHelper.files.each do |filepath|
+   #filepath = Elasticsearch::API::FilesHelper.files[1]
+     @path = Pathname(filepath)
+     @json = MultiJson.load(File.read(@path))
+     @spec = @json.values.first
+
+     @spec['url'] ||= {}
+
+     @endpoint_name    = @json.keys.first
+     @full_namespace   = __full_namespace
+     @namespace_depth  = @full_namespace.size > 0 ? @full_namespace.size - 1 : 0
+     @module_namespace = @full_namespace[0, @namespace_depth]
+
+     # Don't generate code for internal APIs:
+     next if @module_namespace.flatten.first == '_internal'
+
+     @method_name      = @full_namespace.last
+     @parts            = __endpoint_parts
+     @params           = @spec['params'] || {}
+     @specific_params  = specific_params(@module_namespace.first) # See EndpointSpecifics
+     @paths            = @spec['url']['paths'].map { |b| b['path'] }
+     @required_parts   = __required_parts
+
+     @example_paths = @paths.collect { |path| path.gsub(/\{[^\/]+\}/, 'testing')}
+
+     defined_params = @parts.inject({}) do |args, part|
+       args[part[0].to_sym] = 'testing'
+       args
+     end
+
+     args = @required_parts.inject({}) do |arguments, required_part|
+       arguments[required_part.to_sym] = 'testing'
+       arguments
+     end
+
+     namespace = @module_namespace
+     method_name = @method_name
+     endpoint_name = @endpoint_name
+     parts = @parts
+
+     # check request_opts
+     # {:endpoint=>"indices.refresh", :defined_params=>{"index"=>"testing"}}
+
+     let(:client_double) do
+       Class.new { include Elasticsearch::API }.new.tap do |client|
+         expect(client).to receive(:perform_request) do |_, _, _, _, _, request_params|
+           expect(request_params).to eq(expected_params)
+         end
+       end
+     end
+
+     let(:response_double) do
+       double('response', status: 200, body: {}, headers: {})
+     end
+     context(@endpoint_name) do
+
+       let(:expected_params) do
+         params = {endpoint: endpoint_name}
+         params[:defined_params] = defined_params unless defined_params.empty?
+         params
+       end
+
+       if parts.empty?
+         it("passes the endpoint id to the request") do
+           unless namespace.empty?
+             client_double.send(namespace[0]).send(method_name, args.merge(defined_params))
+           else
+             client_double.send(method_name, defined_params)
+           end
+         end
+       else
+         it("passes the right params to the request: #{parts.keys}") do
+           unless namespace.empty?
+             client_double.send(namespace[0]).send(method_name, args.merge(defined_params))
+           else
+             client_double.send(method_name, args.merge(defined_params))
+           end
+         end
+       end
+     end
+   end
+end
\ No newline at end of file
diff --git a/elasticsearch-api/spec/spec_helper.rb b/elasticsearch-api/spec/spec_helper.rb
index 99d6d350a6..38d4fb6a0b 100644
--- a/elasticsearch-api/spec/spec_helper.rb
+++ b/elasticsearch-api/spec/spec_helper.rb
@@ -32,6 +32,8 @@
 require 'elasticsearch-api'
 require 'openssl'
 require 'logger'
+require_relative '../utils/thor/generator/files_helper'
+require_relative '../utils/thor/generator/endpoint_specifics'
 
 tracer = ::Logger.new(STDERR)
 tracer.formatter = lambda { |s, d, p, m| "#{m.gsub(/^.*$/) { |n| '   ' + n } }\n" }
diff --git a/elasticsearch-api/utils/thor/generate_source.rb b/elasticsearch-api/utils/thor/generate_source.rb
index e9c40eb5f2..6d670ba04e 100644
--- a/elasticsearch-api/utils/thor/generate_source.rb
+++ b/elasticsearch-api/utils/thor/generate_source.rb
@@ -40,7 +40,6 @@ module API
     class SourceGenerator < Thor
       namespace 'code'
       include Thor::Actions
-      include EndpointSpecifics
 
       desc 'generate', 'Generate source code and tests from the REST API JSON specification'
       method_option :verbose, type: :boolean, default: false,  desc: 'Output more information'
@@ -59,41 +58,167 @@ def generate
         print_tree if options[:verbose]
       end
 
-      private
-
-      def generate_source
-        @output = FilesHelper.output_dir
-        cleanup_directory!
+      class Spec
+        include EndpointSpecifics
 
-        FilesHelper.files.each do |filepath|
+        def initialize(filepath)
           @path = Pathname(filepath)
-          @json = MultiJson.load(File.read(@path))
-          @spec = @json.values.first
-          say_status 'json', @path, :yellow
+          json = MultiJson.load(File.read(@path))
+          @spec = json.values.first
+          @endpoint_name    = json.keys.first
 
           @spec['url'] ||= {}
-
-          @endpoint_name    = @json.keys.first
           @full_namespace   = __full_namespace
           @namespace_depth  = @full_namespace.size > 0 ? @full_namespace.size - 1 : 0
           @module_namespace = @full_namespace[0, @namespace_depth]
-
-          # Don't generate code for internal APIs:
-          next if @module_namespace.flatten.first == '_internal'
-
           @method_name      = @full_namespace.last
+
           @parts            = __endpoint_parts
           @params           = @spec['params'] || {}
           @specific_params  = specific_params(@module_namespace.first) # See EndpointSpecifics
           @http_method      = __http_method
           @paths            = @spec['url']['paths'].map { |b| b['path'] }
+          @path_params   = __path_variables.flatten.uniq
+          @perform_request_opts = { endpoint: @endpoint_name }
           # Using Ruby's safe operator on array:
           @deprecation_note = @spec['url']['paths'].last&.[]('deprecated')
           @http_path        = __http_path
           @required_parts   = __required_parts
+        end
+
+        attr_reader :module_namespace, :method_name, :path, :namespace_depth
+
+        def module_name_helper(name)
+          return name.upcase if %w[sql ssl].include? name
+
+          name.split('_').map(&:capitalize).map{ |n| n == 'Xpack' ? 'XPack' : n }.join
+        end
+
+        private
+
+        def __full_namespace
+          names = @endpoint_name.split('.')
+          # Return an array to expand 'ccr', 'ilm', 'ml' and 'slm'
+          names.map do |name|
+            name
+              .gsub(/^ml$/, 'machine_learning')
+              .gsub(/^ilm$/, 'index_lifecycle_management')
+              .gsub(/^ccr/, 'cross_cluster_replication')
+              .gsub(/^slm/, 'snapshot_lifecycle_management')
+          end
+        end
+
+        # Extract parts from each path
+        #
+        def __endpoint_parts
+          parts = @spec['url']['paths'].select do |a|
+            a.keys.include?('parts')
+          end.map do |path|
+            path&.[]('parts')
+          end
+          (parts.inject(&:merge) || [])
+        end
+
+        def __http_method
+          return '_id ? Elasticsearch::API::HTTP_PUT : Elasticsearch::API::HTTP_POST' if @endpoint_name == 'index'
+          return '_name ? Elasticsearch::API::HTTP_PUT : Elasticsearch::API::HTTP_POST' if @method_name == 'create_service_token'
+          return post_and_get if @endpoint_name == 'count'
+
+          default_method = @spec['url']['paths'].map { |a| a['methods'] }.flatten.first
+          if @spec['body'] && default_method == 'GET'
+            # When default method is GET and body is required, we should always use POST
+            if @spec['body']['required']
+              'Elasticsearch::API::HTTP_POST'
+            else
+              post_and_get
+            end
+          else
+            "Elasticsearch::API::HTTP_#{default_method}"
+          end
+        end
+
+        def post_and_get
+          # the METHOD is defined after doing arguments.delete(:body), so we need to check for `body`
+          <<~SRC
+          if body
+            Elasticsearch::API::HTTP_POST
+          else
+            Elasticsearch::API::HTTP_GET
+          end
+          SRC
+        end
+
+        def __http_path
+          return "\"#{__parse_path(@paths.first)}\"" if @paths.size == 1
+
+          result = ''
+          anchor_string = []
+          @paths.sort { |a, b| b.length <=> a.length }.each_with_index do |path, i|
+            var_string = __extract_path_variables(path).map { |var| "_#{var}" }.join(' && ')
+            next if anchor_string.include? var_string
+
+            anchor_string << var_string
+            result += if i.zero?
+                        "if #{var_string}\n"
+                      elsif (i == @paths.size - 1) || var_string.empty?
+                        "else\n"
+                      else
+                        "elsif #{var_string}\n"
+                      end
+            result += "\"#{__parse_path(path)}\"\n"
+          end
+          result += 'end'
+          result
+        end
+
+        def __parse_path(path)
+          path.gsub(/^\//, '')
+              .gsub(/\/$/, '')
+              .gsub('{', "\#{Utils.__listify(_")
+              .gsub('}', ')}')
+        end
+
+        def __path_variables
+          @paths.map do |path|
+            __extract_path_variables(path)
+          end
+        end
+
+        # extract values that are in the {var} format:
+        def __extract_path_variables(path)
+          path.scan(/{(\w+)}/).flatten
+        end
 
-          @path_to_file = @output.join(@module_namespace.join('/')).join("#{@method_name}.rb")
-          dir = @output.join(@module_namespace.join('/'))
+        # Find parts that are definitely required and should raise an error if
+        # they're not present
+        #
+        def __required_parts
+          required = []
+          return required if @endpoint_name == 'tasks.get'
+
+          required << 'body' if (@spec['body'] && @spec['body']['required'])
+          # Get required variables from paths:
+          req_variables = __path_variables.inject(:&) # find intersection
+          required << req_variables unless req_variables.empty?
+          required.flatten
+        end
+      end
+
+      private
+
+      def generate_source
+        @output = FilesHelper.output_dir
+        cleanup_directory!
+
+        FilesHelper.files.each do |filepath|
+          @spec = Spec.new(filepath)
+          say_status 'json', @spec.path, :yellow
+
+          # Don't generate code for internal APIs:
+          next if @spec.module_namespace.flatten.first == '_internal'
+
+          @path_to_file = @output.join(@spec.module_namespace.join('/')).join("#{@spec.method_name}.rb")
+          dir = @output.join(@spec.module_namespace.join('/'))
 
           empty_directory(dir, verbose: false)
 
@@ -137,18 +262,6 @@ def original_build_hash
         match[1]
       end
 
-      def __full_namespace
-        names = @endpoint_name.split('.')
-        # Return an array to expand 'ccr', 'ilm', 'ml' and 'slm'
-        names.map do |name|
-          name
-            .gsub(/^ml$/, 'machine_learning')
-            .gsub(/^ilm$/, 'index_lifecycle_management')
-            .gsub(/^ccr/, 'cross_cluster_replication')
-            .gsub(/^slm/, 'snapshot_lifecycle_management')
-        end
-      end
-
       # Create the hierarchy of directories based on API namespaces
       #
       def __create_directories(key, value)
@@ -158,101 +271,6 @@ def __create_directories(key, value)
         create_directory_hierarchy * value.to_a.first
       end
 
-      # Extract parts from each path
-      #
-      def __endpoint_parts
-        parts = @spec['url']['paths'].select do |a|
-          a.keys.include?('parts')
-        end.map do |path|
-          path&.[]('parts')
-        end
-        (parts.inject(&:merge) || [])
-      end
-
-      def __http_method
-        return '_id ? Elasticsearch::API::HTTP_PUT : Elasticsearch::API::HTTP_POST' if @endpoint_name == 'index'
-        return '_name ? Elasticsearch::API::HTTP_PUT : Elasticsearch::API::HTTP_POST' if @method_name == 'create_service_token'
-        return post_and_get if @endpoint_name == 'count'
-
-        default_method = @spec['url']['paths'].map { |a| a['methods'] }.flatten.first
-        if @spec['body'] && default_method == 'GET'
-          # When default method is GET and body is required, we should always use POST
-          if @spec['body']['required']
-            'Elasticsearch::API::HTTP_POST'
-          else
-            post_and_get
-          end
-        else
-          "Elasticsearch::API::HTTP_#{default_method}"
-        end
-      end
-
-      def post_and_get
-        # the METHOD is defined after doing arguments.delete(:body), so we need to check for `body`
-        <<~SRC
-          if body
-            Elasticsearch::API::HTTP_POST
-          else
-            Elasticsearch::API::HTTP_GET
-          end
-        SRC
-      end
-
-      def __http_path
-        return "\"#{__parse_path(@paths.first)}\"" if @paths.size == 1
-
-        result = ''
-        anchor_string = []
-        @paths.sort { |a, b| b.length <=> a.length }.each_with_index do |path, i|
-          var_string = __extract_path_variables(path).map { |var| "_#{var}" }.join(' && ')
-          next if anchor_string.include? var_string
-
-          anchor_string << var_string
-          result += if i.zero?
-                      "if #{var_string}\n"
-                    elsif (i == @paths.size - 1) || var_string.empty?
-                      "else\n"
-                    else
-                      "elsif #{var_string}\n"
-                    end
-          result += "\"#{__parse_path(path)}\"\n"
-        end
-        result += 'end'
-        result
-      end
-
-      def __parse_path(path)
-        path.gsub(/^\//, '')
-          .gsub(/\/$/, '')
-          .gsub('{', "\#{Utils.__listify(_")
-          .gsub('}', ')}')
-      end
-
-      def __path_variables
-        @paths.map do |path|
-          __extract_path_variables(path)
-        end
-      end
-
-      # extract values that are in the {var} format:
-      def __extract_path_variables(path)
-        path.scan(/{(\w+)}/).flatten
-      end
-
-      # Find parts that are definitely required and should raise an error if
-      # they're not present
-      #
-      def __required_parts
-        required = []
-        return required if @endpoint_name == 'tasks.get'
-
-        required << 'body' if (@spec['body'] && @spec['body']['required'])
-        # Get required variables from paths:
-        req_variables = __path_variables.inject(:&) # find intersection
-        required << req_variables unless req_variables.empty?
-        required.flatten
-      end
-
       def docs_helper(name, info)
         info['type'] = 'String' if info['type'] == 'enum' # Rename 'enums' to 'strings'
         info['type'] = 'Integer' if info['type'] == 'int' # Rename 'int' to 'Integer'
diff --git a/elasticsearch-api/utils/thor/generator/endpoint_specifics.rb b/elasticsearch-api/utils/thor/generator/endpoint_specifics.rb
index 013358087e..eca949c5bb 100644
--- a/elasticsearch-api/utils/thor/generator/endpoint_specifics.rb
+++ b/elasticsearch-api/utils/thor/generator/endpoint_specifics.rb
@@ -75,16 +75,10 @@ def needs_complex_ignore_404?(endpoint)
         COMPLEX_IGNORE_404.include? endpoint
       end
 
-      def module_name_helper(name)
-        return name.upcase if %w[sql ssl].include? name
-
-        name.split('_').map(&:capitalize).map{ |n| n == 'Xpack' ? 'XPack' : n }.join
-      end
-
       def ping_perform_request
         <<~SRC
           begin
-            perform_request(method, path, params, body, headers).status == 200 ? true : false
+            perform_request(method, path, params, body, headers, request_opts).status == 200 ? true : false
           rescue Exception => e
             if e.class.to_s =~ /NotFound|ConnectionFailed/ || e.message =~ /Not\s*Found|404|ConnectionFailed/i
               false
diff --git a/elasticsearch-api/utils/thor/templates/_perform_request.erb b/elasticsearch-api/utils/thor/templates/_perform_request.erb
index 0d874ce388..4e017be6c4 100644
--- a/elasticsearch-api/utils/thor/templates/_perform_request.erb
+++ b/elasticsearch-api/utils/thor/templates/_perform_request.erb
@@ -20,30 +20,30 @@
   <%= self.send("#{@method_name}_body_helper".to_s) %>
   headers.merge!("Content-Type" => "application/x-ndjson")
   Elasticsearch::API::Response.new(
-    perform_request(method, path, params, payload, headers)
+    perform_request(method, path, params, payload, headers, request_opts)
   )
 <%- elsif @method_name == 'ping' -%>
   <%= ping_perform_request %>
 <%- else -%>
   <%- if needs_ignore_404?(@endpoint_name) %>
     Utils.__rescue_from_not_found do
-      perform_request(method, path, params, body, headers).status == 200 ? true : false
+      perform_request(method, path, params, body, headers, opts).status == 200 ? true : false
     end
   <%- elsif needs_complex_ignore_404?(@endpoint_name) -%>
     if Array(arguments[:ignore]).include?(404)
     Utils.__rescue_from_not_found {
       Elasticsearch::API::Response.new(
-        perform_request(method, path, params, body, headers)
+        perform_request(method, path, params, body, headers, request_opts)
       )
     }
     else
     Elasticsearch::API::Response.new(
-      perform_request(method, path, params, body, headers)
+      perform_request(method, path, params, body, headers, request_opts)
     )
     end
   <%- else -%>
     Elasticsearch::API::Response.new(
-      perform_request(method, path, params, body, headers)
+      perform_request(method, path, params, body, headers, request_opts)
     )
   <%- end -%>
 <%- end -%>
diff --git a/elasticsearch-api/utils/thor/templates/method.erb b/elasticsearch-api/utils/thor/templates/method.erb
index ee56e4f303..14c04c57af 100644
--- a/elasticsearch-api/utils/thor/templates/method.erb
+++ b/elasticsearch-api/utils/thor/templates/method.erb
@@ -16,33 +16,44 @@
 # under the License.
 #
 module Elasticsearch
-<%= '  '*(@namespace_depth) %>module API
-<%- @module_namespace.each_with_index do |name, i| -%>
-  <%= '  '*i %>module <%= module_name_helper(name) %>
+<%= '  '*(@spec.namespace_depth) %>module API
+<%- @spec.module_namespace.each_with_index do |name, i| -%>
+  <%= '  '*i %>module <%= @spec.module_name_helper(name) %>
 <%- end -%>
-<%= '  '*(@namespace_depth+2) %>module Actions
+<%= '  '*(@spec.namespace_depth+2) %>module Actions
 <%= ERB.new(File.new("./thor/templates/_documentation_top.erb").read, trim_mode: '-').result(binding) -%>
 <%# Method definition -%>
-<%= '  '*(@namespace_depth+3) -%>def <%= @method_name %>(arguments = {})
-<%- if @endpoint_name == 'create' -%>
-  <%= '  '*(@namespace_depth+3) %>if arguments[:id]
-  <%= '  '*(@namespace_depth+3) %>  index arguments.update op_type: 'create'
-  <%= '  '*(@namespace_depth+3) %>else
-  <%= '  '*(@namespace_depth+3) %>  index arguments
-  <%= '  '*(@namespace_depth+3) %>end
-  <%= '  '*(@namespace_depth+2) %>end
+<%= '  '*(@spec.namespace_depth+3) -%>def <%= @method_name %>(arguments = {})
+<%- if @spec.endpoint_name == 'create' -%>
+  <%= '  '*(@spec.namespace_depth+3) %>if arguments[:id]
+  <%= '  '*(@spec.namespace_depth+3) %>  index arguments.update op_type: 'create'
+  <%= '  '*(@spec.namespace_depth+3) %>else
+  <%= '  '*(@spec.namespace_depth+3) %>  index arguments
+  <%= '  '*(@spec.namespace_depth+3) %>end
+  <%= '  '*(@spec.namespace_depth+2) %>end
 <%- else -%>
-  <%- if @method_name == 'get_field_mapping' %>
+  <%- if @spec.method_name == 'get_field_mapping' %>
     arguments = arguments.clone
     _fields = arguments.delete(:field) || arguments.delete(:fields)
     raise ArgumentError, "Required argument 'field' missing" unless _fields
   <%- else -%>
-    <%- @required_parts.each do |required| %><%# Arguments -%>
-      <%= '  '*(@namespace_depth+3) + "raise ArgumentError, \"Required argument '#{required}' missing\" unless arguments[:#{required}]" + "\n" -%>
+    <%- @spec.required_parts.each do |required| %><%# Arguments -%>
+      <%= '  '*(@spec.namespace_depth+3) + "raise ArgumentError, \"Required argument '#{required}' missing\" unless arguments[:#{required}]" + "\n" -%>
     <%- end -%>
     arguments = arguments.clone
     <%- end -%>
     headers = arguments.delete(:headers) || {}
+    request_opts = <%= @spec.perform_request_opts %>
+    <%- unless @spec.path_params.empty? %>
+      defined_params =<%=  @spec.path_params %>.inject({}) do |set_variables, variable|
+        var_sym = variable.to_sym
+        set_variables[var_sym] = arguments[var_sym] if arguments.key?(var_sym)
+        set_variables[var_sym] = arguments[variable] if arguments.key?(variable)
+        set_variables
+      end
+    request_opts[:defined_params] = defined_params unless defined_params.empty?
+    <%- end %>
+    <%-    %>
     <%- #Body %>
     <%= ERB.new(File.new("./thor/templates/_body.erb").read, trim_mode: '-').result(binding) %>
     <%- # Method setup -%>
@@ -50,10 +61,10 @@ module Elasticsearch
     <%- # Perform request -%>
     <%= ERB.new(File.new("./thor/templates/_perform_request.erb").read, trim_mode: '-').result(binding) %>
 <%- end -%>
-<%- if @method_name.match?(/^exists\S*/) -%>
-  alias_method :<%= @method_name %>?, :<%= @method_name %>
+<%- if @spec.method_name.match?(/^exists\S*/) -%>
+  alias_method :<%= @spec.method_name %>?, :<%= @spec.method_name %>
 <%- end -%>
-<%- if @method_name == 'termvectors' %>
+<%- if @spec.method_name == 'termvectors' %>
 
   # Deprecated: Use the plural version, {#termvectors}
   #