diff --git a/CHANGELOG.md b/CHANGELOG.md
index f425e5106..d09907259 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,6 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### Fixed
 - Fixed PHP 8.4 deprecations
 ### Updated APIs
-- Updated opensearch-php APIs to reflect [opensearch-api-specification@07e329e](https://github.com/opensearch-project/opensearch-api-specification/commit/07e329e8d01fd0576de6a0a3c35412fd5a9163db)
 - Updated opensearch-php APIs to reflect [opensearch-api-specification@1db1840](https://github.com/opensearch-project/opensearch-api-specification/commit/1db184063a463c5180a2cc824b1efc1aeebfd5eb)
 - Updated opensearch-php APIs to reflect [opensearch-api-specification@cb320b5](https://github.com/opensearch-project/opensearch-api-specification/commit/cb320b5482551c4f28afa26ff0d1653332699722)
 ### Security
diff --git a/src/OpenSearch/Client.php b/src/OpenSearch/Client.php
index 411ea8f5a..9c0746364 100644
--- a/src/OpenSearch/Client.php
+++ b/src/OpenSearch/Client.php
@@ -55,7 +55,6 @@
 use OpenSearch\Namespaces\SslNamespace;
 use OpenSearch\Namespaces\TasksNamespace;
 use OpenSearch\Namespaces\TransformsNamespace;
-use OpenSearch\Namespaces\WlmNamespace;
 
 /**
  * Class Client
@@ -231,11 +230,6 @@ class Client
      */
     protected $transforms;
 
-    /**
-     * @var WlmNamespace
-     */
-    protected $wlm;
-
 
     /**
      * Client constructor
@@ -277,7 +271,6 @@ public function __construct(Transport $transport, callable $endpoint, array $reg
         $this->ssl = new SslNamespace($transport, $endpoint);
         $this->tasks = new TasksNamespace($transport, $endpoint);
         $this->transforms = new TransformsNamespace($transport, $endpoint);
-        $this->wlm = new WlmNamespace($transport, $endpoint);
 
         $this->registeredNamespaces = $registeredNamespaces;
     }
@@ -1949,13 +1942,6 @@ public function transforms(): TransformsNamespace
     {
         return $this->transforms;
     }
-    /**
-     * Returns the wlm namespace
-     */
-    public function wlm(): WlmNamespace
-    {
-        return $this->wlm;
-    }
 
     /**
      * Catchall for registered namespaces
diff --git a/src/OpenSearch/Endpoints/AsynchronousSearch/Search.php b/src/OpenSearch/Endpoints/AsynchronousSearch/Search.php
index 1d3e4372d..1bdd1757a 100644
--- a/src/OpenSearch/Endpoints/AsynchronousSearch/Search.php
+++ b/src/OpenSearch/Endpoints/AsynchronousSearch/Search.php
@@ -47,7 +47,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Search
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Bulk.php b/src/OpenSearch/Endpoints/Bulk.php
index 65b2c16fe..6376a6fb6 100644
--- a/src/OpenSearch/Endpoints/Bulk.php
+++ b/src/OpenSearch/Endpoints/Bulk.php
@@ -70,7 +70,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Bulk
     {
         if (isset($body) !== true) {
             return $this;
@@ -89,5 +89,4 @@ public function setBody($body): static
         }
         return $this;
     }
-
 }
diff --git a/src/OpenSearch/Endpoints/BulkStream.php b/src/OpenSearch/Endpoints/BulkStream.php
index daa7c7210..64925b661 100644
--- a/src/OpenSearch/Endpoints/BulkStream.php
+++ b/src/OpenSearch/Endpoints/BulkStream.php
@@ -66,7 +66,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): BulkStream
     {
         if (isset($body) !== true) {
             return $this;
@@ -85,5 +85,4 @@ public function setBody($body): static
         }
         return $this;
     }
-
 }
diff --git a/src/OpenSearch/Endpoints/Cat/Aliases.php b/src/OpenSearch/Endpoints/Cat/Aliases.php
index 087899d4e..cee786be3 100644
--- a/src/OpenSearch/Endpoints/Cat/Aliases.php
+++ b/src/OpenSearch/Endpoints/Cat/Aliases.php
@@ -62,7 +62,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setName($name): static
+    public function setName($name): Aliases
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Cat/Allocation.php b/src/OpenSearch/Endpoints/Cat/Allocation.php
index b84717d86..909470026 100644
--- a/src/OpenSearch/Endpoints/Cat/Allocation.php
+++ b/src/OpenSearch/Endpoints/Cat/Allocation.php
@@ -64,7 +64,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setNodeId($node_id): static
+    public function setNodeId($node_id): Allocation
     {
         if (isset($node_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Cat/Fielddata.php b/src/OpenSearch/Endpoints/Cat/Fielddata.php
index 3028f3570..dd48d1562 100644
--- a/src/OpenSearch/Endpoints/Cat/Fielddata.php
+++ b/src/OpenSearch/Endpoints/Cat/Fielddata.php
@@ -62,7 +62,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setFields($fields): static
+    public function setFields($fields): Fielddata
     {
         if (isset($fields) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Cat/PitSegments.php b/src/OpenSearch/Endpoints/Cat/PitSegments.php
index f8aa23f85..af9981b2d 100644
--- a/src/OpenSearch/Endpoints/Cat/PitSegments.php
+++ b/src/OpenSearch/Endpoints/Cat/PitSegments.php
@@ -49,7 +49,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PitSegments
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Cat/Snapshots.php b/src/OpenSearch/Endpoints/Cat/Snapshots.php
index 213bb0f4c..03f0ae527 100644
--- a/src/OpenSearch/Endpoints/Cat/Snapshots.php
+++ b/src/OpenSearch/Endpoints/Cat/Snapshots.php
@@ -64,7 +64,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setRepository($repository): static
+    public function setRepository($repository): Snapshots
     {
         if (isset($repository) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Cat/Templates.php b/src/OpenSearch/Endpoints/Cat/Templates.php
index 116c05f6f..8bf42aa9a 100644
--- a/src/OpenSearch/Endpoints/Cat/Templates.php
+++ b/src/OpenSearch/Endpoints/Cat/Templates.php
@@ -63,7 +63,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setName($name): static
+    public function setName($name): Templates
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Cat/ThreadPool.php b/src/OpenSearch/Endpoints/Cat/ThreadPool.php
index 1338b7579..fcd168c97 100644
--- a/src/OpenSearch/Endpoints/Cat/ThreadPool.php
+++ b/src/OpenSearch/Endpoints/Cat/ThreadPool.php
@@ -64,7 +64,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setThreadPoolPatterns($thread_pool_patterns): static
+    public function setThreadPoolPatterns($thread_pool_patterns): ThreadPool
     {
         if (isset($thread_pool_patterns) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/ClearScroll.php b/src/OpenSearch/Endpoints/ClearScroll.php
index e00ae70ad..190e9be52 100644
--- a/src/OpenSearch/Endpoints/ClearScroll.php
+++ b/src/OpenSearch/Endpoints/ClearScroll.php
@@ -59,7 +59,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setBody($body): static
+    public function setBody($body): ClearScroll
     {
         if (isset($body) !== true) {
             return $this;
@@ -69,7 +69,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setScrollId($scroll_id): static
+    public function setScrollId($scroll_id): ClearScroll
     {
         if (isset($scroll_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Cluster/AllocationExplain.php b/src/OpenSearch/Endpoints/Cluster/AllocationExplain.php
index 0605f258c..0c0c89939 100644
--- a/src/OpenSearch/Endpoints/Cluster/AllocationExplain.php
+++ b/src/OpenSearch/Endpoints/Cluster/AllocationExplain.php
@@ -51,7 +51,7 @@ public function getMethod(): string
         return isset($this->body) ? 'POST' : 'GET';
     }
 
-    public function setBody($body): static
+    public function setBody($body): AllocationExplain
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Cluster/DeleteComponentTemplate.php b/src/OpenSearch/Endpoints/Cluster/DeleteComponentTemplate.php
index 09dbd0567..e8b16bdcd 100644
--- a/src/OpenSearch/Endpoints/Cluster/DeleteComponentTemplate.php
+++ b/src/OpenSearch/Endpoints/Cluster/DeleteComponentTemplate.php
@@ -59,7 +59,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setName($name): static
+    public function setName($name): DeleteComponentTemplate
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Cluster/DeleteWeightedRouting.php b/src/OpenSearch/Endpoints/Cluster/DeleteWeightedRouting.php
index a91cb5315..ab253fcf8 100644
--- a/src/OpenSearch/Endpoints/Cluster/DeleteWeightedRouting.php
+++ b/src/OpenSearch/Endpoints/Cluster/DeleteWeightedRouting.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setBody($body): static
+    public function setBody($body): DeleteWeightedRouting
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Cluster/ExistsComponentTemplate.php b/src/OpenSearch/Endpoints/Cluster/ExistsComponentTemplate.php
index 84ab41734..3146fcc06 100644
--- a/src/OpenSearch/Endpoints/Cluster/ExistsComponentTemplate.php
+++ b/src/OpenSearch/Endpoints/Cluster/ExistsComponentTemplate.php
@@ -59,7 +59,7 @@ public function getMethod(): string
         return 'HEAD';
     }
 
-    public function setName($name): static
+    public function setName($name): ExistsComponentTemplate
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Cluster/GetComponentTemplate.php b/src/OpenSearch/Endpoints/Cluster/GetComponentTemplate.php
index 0d4905178..5d495710e 100644
--- a/src/OpenSearch/Endpoints/Cluster/GetComponentTemplate.php
+++ b/src/OpenSearch/Endpoints/Cluster/GetComponentTemplate.php
@@ -58,7 +58,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setName($name): static
+    public function setName($name): GetComponentTemplate
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Cluster/GetDecommissionAwareness.php b/src/OpenSearch/Endpoints/Cluster/GetDecommissionAwareness.php
index 4b0569b28..66c250c5d 100644
--- a/src/OpenSearch/Endpoints/Cluster/GetDecommissionAwareness.php
+++ b/src/OpenSearch/Endpoints/Cluster/GetDecommissionAwareness.php
@@ -50,7 +50,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setAwarenessAttributeName($awareness_attribute_name): static
+    public function setAwarenessAttributeName($awareness_attribute_name): GetDecommissionAwareness
     {
         if (isset($awareness_attribute_name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Cluster/GetWeightedRouting.php b/src/OpenSearch/Endpoints/Cluster/GetWeightedRouting.php
index dd42bd43c..0890735b6 100644
--- a/src/OpenSearch/Endpoints/Cluster/GetWeightedRouting.php
+++ b/src/OpenSearch/Endpoints/Cluster/GetWeightedRouting.php
@@ -50,7 +50,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setAttribute($attribute): static
+    public function setAttribute($attribute): GetWeightedRouting
     {
         if (isset($attribute) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Cluster/PutComponentTemplate.php b/src/OpenSearch/Endpoints/Cluster/PutComponentTemplate.php
index 86a698162..c79a3db9a 100644
--- a/src/OpenSearch/Endpoints/Cluster/PutComponentTemplate.php
+++ b/src/OpenSearch/Endpoints/Cluster/PutComponentTemplate.php
@@ -60,7 +60,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PutComponentTemplate
     {
         if (isset($body) !== true) {
             return $this;
@@ -70,7 +70,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setName($name): static
+    public function setName($name): PutComponentTemplate
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Cluster/PutDecommissionAwareness.php b/src/OpenSearch/Endpoints/Cluster/PutDecommissionAwareness.php
index 713856003..c80fed513 100644
--- a/src/OpenSearch/Endpoints/Cluster/PutDecommissionAwareness.php
+++ b/src/OpenSearch/Endpoints/Cluster/PutDecommissionAwareness.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setAwarenessAttributeName($awareness_attribute_name): static
+    public function setAwarenessAttributeName($awareness_attribute_name): PutDecommissionAwareness
     {
         if (isset($awareness_attribute_name) !== true) {
             return $this;
@@ -62,7 +62,7 @@ public function setAwarenessAttributeName($awareness_attribute_name): static
         return $this;
     }
 
-    public function setAwarenessAttributeValue($awareness_attribute_value): static
+    public function setAwarenessAttributeValue($awareness_attribute_value): PutDecommissionAwareness
     {
         if (isset($awareness_attribute_value) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Cluster/PutSettings.php b/src/OpenSearch/Endpoints/Cluster/PutSettings.php
index adc67a564..2a78a059e 100644
--- a/src/OpenSearch/Endpoints/Cluster/PutSettings.php
+++ b/src/OpenSearch/Endpoints/Cluster/PutSettings.php
@@ -53,7 +53,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PutSettings
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Cluster/PutWeightedRouting.php b/src/OpenSearch/Endpoints/Cluster/PutWeightedRouting.php
index 4c707f665..2cb8eb3c6 100644
--- a/src/OpenSearch/Endpoints/Cluster/PutWeightedRouting.php
+++ b/src/OpenSearch/Endpoints/Cluster/PutWeightedRouting.php
@@ -50,7 +50,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PutWeightedRouting
     {
         if (isset($body) !== true) {
             return $this;
@@ -60,7 +60,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setAttribute($attribute): static
+    public function setAttribute($attribute): PutWeightedRouting
     {
         if (isset($attribute) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Cluster/Reroute.php b/src/OpenSearch/Endpoints/Cluster/Reroute.php
index 522469177..235e55154 100644
--- a/src/OpenSearch/Endpoints/Cluster/Reroute.php
+++ b/src/OpenSearch/Endpoints/Cluster/Reroute.php
@@ -56,7 +56,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Reroute
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Cluster/State.php b/src/OpenSearch/Endpoints/Cluster/State.php
index 61cf3ba69..a8b7f2ebc 100644
--- a/src/OpenSearch/Endpoints/Cluster/State.php
+++ b/src/OpenSearch/Endpoints/Cluster/State.php
@@ -68,7 +68,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setMetric($metric): static
+    public function setMetric($metric): State
     {
         if (isset($metric) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Cluster/Stats.php b/src/OpenSearch/Endpoints/Cluster/Stats.php
index 8967dd08d..4236808ae 100644
--- a/src/OpenSearch/Endpoints/Cluster/Stats.php
+++ b/src/OpenSearch/Endpoints/Cluster/Stats.php
@@ -57,7 +57,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setNodeId($node_id): static
+    public function setNodeId($node_id): Stats
     {
         if (isset($node_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Count.php b/src/OpenSearch/Endpoints/Count.php
index b83201db1..43abf6b74 100644
--- a/src/OpenSearch/Endpoints/Count.php
+++ b/src/OpenSearch/Endpoints/Count.php
@@ -67,7 +67,7 @@ public function getMethod(): string
         return isset($this->body) ? 'POST' : 'GET';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Count
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Create.php b/src/OpenSearch/Endpoints/Create.php
index 28dac6add..9fd7b60b9 100644
--- a/src/OpenSearch/Endpoints/Create.php
+++ b/src/OpenSearch/Endpoints/Create.php
@@ -69,7 +69,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Create
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/DanglingIndices/DeleteDanglingIndex.php b/src/OpenSearch/Endpoints/DanglingIndices/DeleteDanglingIndex.php
index 7e9a82c7d..bc1e1d8ad 100644
--- a/src/OpenSearch/Endpoints/DanglingIndices/DeleteDanglingIndex.php
+++ b/src/OpenSearch/Endpoints/DanglingIndices/DeleteDanglingIndex.php
@@ -60,7 +60,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setIndexUuid($index_uuid): static
+    public function setIndexUuid($index_uuid): DeleteDanglingIndex
     {
         if (isset($index_uuid) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/DanglingIndices/ImportDanglingIndex.php b/src/OpenSearch/Endpoints/DanglingIndices/ImportDanglingIndex.php
index 595507962..ca86f44d6 100644
--- a/src/OpenSearch/Endpoints/DanglingIndices/ImportDanglingIndex.php
+++ b/src/OpenSearch/Endpoints/DanglingIndices/ImportDanglingIndex.php
@@ -60,7 +60,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setIndexUuid($index_uuid): static
+    public function setIndexUuid($index_uuid): ImportDanglingIndex
     {
         if (isset($index_uuid) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/DeleteByQuery.php b/src/OpenSearch/Endpoints/DeleteByQuery.php
index f01f07cf7..cbcf95eb4 100644
--- a/src/OpenSearch/Endpoints/DeleteByQuery.php
+++ b/src/OpenSearch/Endpoints/DeleteByQuery.php
@@ -89,7 +89,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): DeleteByQuery
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/DeleteByQueryRethrottle.php b/src/OpenSearch/Endpoints/DeleteByQueryRethrottle.php
index 05a53021b..a8cab68c9 100644
--- a/src/OpenSearch/Endpoints/DeleteByQueryRethrottle.php
+++ b/src/OpenSearch/Endpoints/DeleteByQueryRethrottle.php
@@ -59,7 +59,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setTaskId($task_id): static
+    public function setTaskId($task_id): DeleteByQueryRethrottle
     {
         if (isset($task_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/DeletePit.php b/src/OpenSearch/Endpoints/DeletePit.php
index eca440196..df9768d35 100644
--- a/src/OpenSearch/Endpoints/DeletePit.php
+++ b/src/OpenSearch/Endpoints/DeletePit.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setBody($body): static
+    public function setBody($body): DeletePit
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Explain.php b/src/OpenSearch/Endpoints/Explain.php
index 9241ef835..cf5a6f1c2 100644
--- a/src/OpenSearch/Endpoints/Explain.php
+++ b/src/OpenSearch/Endpoints/Explain.php
@@ -74,7 +74,7 @@ public function getMethod(): string
         return isset($this->body) ? 'POST' : 'GET';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Explain
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/FieldCaps.php b/src/OpenSearch/Endpoints/FieldCaps.php
index d6f22027a..93cd37492 100644
--- a/src/OpenSearch/Endpoints/FieldCaps.php
+++ b/src/OpenSearch/Endpoints/FieldCaps.php
@@ -58,7 +58,7 @@ public function getMethod(): string
         return isset($this->body) ? 'POST' : 'GET';
     }
 
-    public function setBody($body): static
+    public function setBody($body): FieldCaps
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/FlowFramework/Create.php b/src/OpenSearch/Endpoints/FlowFramework/Create.php
index 60fbac848..38084e8b0 100644
--- a/src/OpenSearch/Endpoints/FlowFramework/Create.php
+++ b/src/OpenSearch/Endpoints/FlowFramework/Create.php
@@ -48,7 +48,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Create
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/FlowFramework/Delete.php b/src/OpenSearch/Endpoints/FlowFramework/Delete.php
index c1a75384e..2dd15cb76 100644
--- a/src/OpenSearch/Endpoints/FlowFramework/Delete.php
+++ b/src/OpenSearch/Endpoints/FlowFramework/Delete.php
@@ -51,7 +51,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setWorkflowId($workflow_id): static
+    public function setWorkflowId($workflow_id): Delete
     {
         if (isset($workflow_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/FlowFramework/Deprovision.php b/src/OpenSearch/Endpoints/FlowFramework/Deprovision.php
index c9ef2db18..d9429096a 100644
--- a/src/OpenSearch/Endpoints/FlowFramework/Deprovision.php
+++ b/src/OpenSearch/Endpoints/FlowFramework/Deprovision.php
@@ -51,7 +51,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setWorkflowId($workflow_id): static
+    public function setWorkflowId($workflow_id): Deprovision
     {
         if (isset($workflow_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/FlowFramework/Get.php b/src/OpenSearch/Endpoints/FlowFramework/Get.php
index 09226a2fa..f9c6fc9b1 100644
--- a/src/OpenSearch/Endpoints/FlowFramework/Get.php
+++ b/src/OpenSearch/Endpoints/FlowFramework/Get.php
@@ -50,7 +50,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setWorkflowId($workflow_id): static
+    public function setWorkflowId($workflow_id): Get
     {
         if (isset($workflow_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/FlowFramework/GetStatus.php b/src/OpenSearch/Endpoints/FlowFramework/GetStatus.php
index 9576306f7..e00e918e5 100644
--- a/src/OpenSearch/Endpoints/FlowFramework/GetStatus.php
+++ b/src/OpenSearch/Endpoints/FlowFramework/GetStatus.php
@@ -51,7 +51,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setWorkflowId($workflow_id): static
+    public function setWorkflowId($workflow_id): GetStatus
     {
         if (isset($workflow_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/FlowFramework/Provision.php b/src/OpenSearch/Endpoints/FlowFramework/Provision.php
index 9ee121c8f..97479db37 100644
--- a/src/OpenSearch/Endpoints/FlowFramework/Provision.php
+++ b/src/OpenSearch/Endpoints/FlowFramework/Provision.php
@@ -50,7 +50,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Provision
     {
         if (isset($body) !== true) {
             return $this;
@@ -60,7 +60,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setWorkflowId($workflow_id): static
+    public function setWorkflowId($workflow_id): Provision
     {
         if (isset($workflow_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/FlowFramework/Search.php b/src/OpenSearch/Endpoints/FlowFramework/Search.php
index 353287d89..7c584a920 100644
--- a/src/OpenSearch/Endpoints/FlowFramework/Search.php
+++ b/src/OpenSearch/Endpoints/FlowFramework/Search.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return isset($this->body) ? 'POST' : 'GET';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Search
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/FlowFramework/SearchState.php b/src/OpenSearch/Endpoints/FlowFramework/SearchState.php
index d1ee9c7e3..493339c99 100644
--- a/src/OpenSearch/Endpoints/FlowFramework/SearchState.php
+++ b/src/OpenSearch/Endpoints/FlowFramework/SearchState.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return isset($this->body) ? 'POST' : 'GET';
     }
 
-    public function setBody($body): static
+    public function setBody($body): SearchState
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/FlowFramework/Update.php b/src/OpenSearch/Endpoints/FlowFramework/Update.php
index 73fa0e123..3b3479f9d 100644
--- a/src/OpenSearch/Endpoints/FlowFramework/Update.php
+++ b/src/OpenSearch/Endpoints/FlowFramework/Update.php
@@ -55,7 +55,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Update
     {
         if (isset($body) !== true) {
             return $this;
@@ -65,7 +65,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setWorkflowId($workflow_id): static
+    public function setWorkflowId($workflow_id): Update
     {
         if (isset($workflow_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Index.php b/src/OpenSearch/Endpoints/Index.php
index 48ad123c7..abeecc314 100644
--- a/src/OpenSearch/Endpoints/Index.php
+++ b/src/OpenSearch/Endpoints/Index.php
@@ -71,7 +71,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Index
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/AddBlock.php b/src/OpenSearch/Endpoints/Indices/AddBlock.php
index 867c07886..5c878c890 100644
--- a/src/OpenSearch/Endpoints/Indices/AddBlock.php
+++ b/src/OpenSearch/Endpoints/Indices/AddBlock.php
@@ -63,7 +63,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBlock($block): static
+    public function setBlock($block): AddBlock
     {
         if (isset($block) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/Analyze.php b/src/OpenSearch/Endpoints/Indices/Analyze.php
index 63f6612a4..845502ca7 100644
--- a/src/OpenSearch/Endpoints/Indices/Analyze.php
+++ b/src/OpenSearch/Endpoints/Indices/Analyze.php
@@ -54,7 +54,7 @@ public function getMethod(): string
         return isset($this->body) ? 'POST' : 'GET';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Analyze
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/CloneIndices.php b/src/OpenSearch/Endpoints/Indices/CloneIndices.php
index dd92e5344..ca94ac967 100644
--- a/src/OpenSearch/Endpoints/Indices/CloneIndices.php
+++ b/src/OpenSearch/Endpoints/Indices/CloneIndices.php
@@ -63,7 +63,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): CloneIndices
     {
         if (isset($body) !== true) {
             return $this;
@@ -73,7 +73,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setTarget($target): static
+    public function setTarget($target): CloneIndices
     {
         if (isset($target) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/Create.php b/src/OpenSearch/Endpoints/Indices/Create.php
index e0336b805..bf9e3d564 100644
--- a/src/OpenSearch/Endpoints/Indices/Create.php
+++ b/src/OpenSearch/Endpoints/Indices/Create.php
@@ -58,7 +58,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Create
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/CreateDataStream.php b/src/OpenSearch/Endpoints/Indices/CreateDataStream.php
index 97a98880a..0c74c24d0 100644
--- a/src/OpenSearch/Endpoints/Indices/CreateDataStream.php
+++ b/src/OpenSearch/Endpoints/Indices/CreateDataStream.php
@@ -56,7 +56,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): CreateDataStream
     {
         if (isset($body) !== true) {
             return $this;
@@ -66,7 +66,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setName($name): static
+    public function setName($name): CreateDataStream
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/DataStreamsStats.php b/src/OpenSearch/Endpoints/Indices/DataStreamsStats.php
index 49619f240..fc3ee0399 100644
--- a/src/OpenSearch/Endpoints/Indices/DataStreamsStats.php
+++ b/src/OpenSearch/Endpoints/Indices/DataStreamsStats.php
@@ -55,7 +55,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setName($name): static
+    public function setName($name): DataStreamsStats
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/DeleteAlias.php b/src/OpenSearch/Endpoints/Indices/DeleteAlias.php
index 7829f215b..edce99b36 100644
--- a/src/OpenSearch/Endpoints/Indices/DeleteAlias.php
+++ b/src/OpenSearch/Endpoints/Indices/DeleteAlias.php
@@ -67,7 +67,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setName($name): static
+    public function setName($name): DeleteAlias
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/DeleteDataStream.php b/src/OpenSearch/Endpoints/Indices/DeleteDataStream.php
index be9fe5f00..f266b1d81 100644
--- a/src/OpenSearch/Endpoints/Indices/DeleteDataStream.php
+++ b/src/OpenSearch/Endpoints/Indices/DeleteDataStream.php
@@ -56,7 +56,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setName($name): static
+    public function setName($name): DeleteDataStream
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/DeleteIndexTemplate.php b/src/OpenSearch/Endpoints/Indices/DeleteIndexTemplate.php
index a4013a1e1..41f340d19 100644
--- a/src/OpenSearch/Endpoints/Indices/DeleteIndexTemplate.php
+++ b/src/OpenSearch/Endpoints/Indices/DeleteIndexTemplate.php
@@ -59,7 +59,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setName($name): static
+    public function setName($name): DeleteIndexTemplate
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/DeleteTemplate.php b/src/OpenSearch/Endpoints/Indices/DeleteTemplate.php
index f1137aa0a..40f3c92ea 100644
--- a/src/OpenSearch/Endpoints/Indices/DeleteTemplate.php
+++ b/src/OpenSearch/Endpoints/Indices/DeleteTemplate.php
@@ -59,7 +59,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setName($name): static
+    public function setName($name): DeleteTemplate
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/ExistsAlias.php b/src/OpenSearch/Endpoints/Indices/ExistsAlias.php
index e8a7fe6e3..5b391dd17 100644
--- a/src/OpenSearch/Endpoints/Indices/ExistsAlias.php
+++ b/src/OpenSearch/Endpoints/Indices/ExistsAlias.php
@@ -66,7 +66,7 @@ public function getMethod(): string
         return 'HEAD';
     }
 
-    public function setName($name): static
+    public function setName($name): ExistsAlias
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/ExistsIndexTemplate.php b/src/OpenSearch/Endpoints/Indices/ExistsIndexTemplate.php
index e2a57d272..437baf77b 100644
--- a/src/OpenSearch/Endpoints/Indices/ExistsIndexTemplate.php
+++ b/src/OpenSearch/Endpoints/Indices/ExistsIndexTemplate.php
@@ -60,7 +60,7 @@ public function getMethod(): string
         return 'HEAD';
     }
 
-    public function setName($name): static
+    public function setName($name): ExistsIndexTemplate
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/ExistsTemplate.php b/src/OpenSearch/Endpoints/Indices/ExistsTemplate.php
index 16cedd185..023903145 100644
--- a/src/OpenSearch/Endpoints/Indices/ExistsTemplate.php
+++ b/src/OpenSearch/Endpoints/Indices/ExistsTemplate.php
@@ -60,7 +60,7 @@ public function getMethod(): string
         return 'HEAD';
     }
 
-    public function setName($name): static
+    public function setName($name): ExistsTemplate
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/GetAlias.php b/src/OpenSearch/Endpoints/Indices/GetAlias.php
index ef22815f2..1a2cdc76e 100644
--- a/src/OpenSearch/Endpoints/Indices/GetAlias.php
+++ b/src/OpenSearch/Endpoints/Indices/GetAlias.php
@@ -66,7 +66,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setName($name): static
+    public function setName($name): GetAlias
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/GetDataStream.php b/src/OpenSearch/Endpoints/Indices/GetDataStream.php
index 60888c85b..0b34c6570 100644
--- a/src/OpenSearch/Endpoints/Indices/GetDataStream.php
+++ b/src/OpenSearch/Endpoints/Indices/GetDataStream.php
@@ -55,7 +55,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setName($name): static
+    public function setName($name): GetDataStream
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/GetFieldMapping.php b/src/OpenSearch/Endpoints/Indices/GetFieldMapping.php
index fe2575a8a..aa2db2de4 100644
--- a/src/OpenSearch/Endpoints/Indices/GetFieldMapping.php
+++ b/src/OpenSearch/Endpoints/Indices/GetFieldMapping.php
@@ -67,7 +67,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setFields($fields): static
+    public function setFields($fields): GetFieldMapping
     {
         if (isset($fields) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/GetIndexTemplate.php b/src/OpenSearch/Endpoints/Indices/GetIndexTemplate.php
index aad6765bc..84915edd1 100644
--- a/src/OpenSearch/Endpoints/Indices/GetIndexTemplate.php
+++ b/src/OpenSearch/Endpoints/Indices/GetIndexTemplate.php
@@ -59,7 +59,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setName($name): static
+    public function setName($name): GetIndexTemplate
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/GetSettings.php b/src/OpenSearch/Endpoints/Indices/GetSettings.php
index 16b1930ea..6f0aa1b50 100644
--- a/src/OpenSearch/Endpoints/Indices/GetSettings.php
+++ b/src/OpenSearch/Endpoints/Indices/GetSettings.php
@@ -70,7 +70,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setName($name): static
+    public function setName($name): GetSettings
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/GetTemplate.php b/src/OpenSearch/Endpoints/Indices/GetTemplate.php
index e9876dcee..83568eb6b 100644
--- a/src/OpenSearch/Endpoints/Indices/GetTemplate.php
+++ b/src/OpenSearch/Endpoints/Indices/GetTemplate.php
@@ -59,7 +59,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setName($name): static
+    public function setName($name): GetTemplate
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/PutAlias.php b/src/OpenSearch/Endpoints/Indices/PutAlias.php
index eeb8bd5c7..62599f4c6 100644
--- a/src/OpenSearch/Endpoints/Indices/PutAlias.php
+++ b/src/OpenSearch/Endpoints/Indices/PutAlias.php
@@ -65,7 +65,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PutAlias
     {
         if (isset($body) !== true) {
             return $this;
@@ -75,7 +75,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setName($name): static
+    public function setName($name): PutAlias
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/PutIndexTemplate.php b/src/OpenSearch/Endpoints/Indices/PutIndexTemplate.php
index f263c7f7f..527130297 100644
--- a/src/OpenSearch/Endpoints/Indices/PutIndexTemplate.php
+++ b/src/OpenSearch/Endpoints/Indices/PutIndexTemplate.php
@@ -60,7 +60,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PutIndexTemplate
     {
         if (isset($body) !== true) {
             return $this;
@@ -70,7 +70,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setName($name): static
+    public function setName($name): PutIndexTemplate
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/PutMapping.php b/src/OpenSearch/Endpoints/Indices/PutMapping.php
index b3f636260..fd10a8885 100644
--- a/src/OpenSearch/Endpoints/Indices/PutMapping.php
+++ b/src/OpenSearch/Endpoints/Indices/PutMapping.php
@@ -61,7 +61,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PutMapping
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/PutSettings.php b/src/OpenSearch/Endpoints/Indices/PutSettings.php
index 0f66696c0..332b2286e 100644
--- a/src/OpenSearch/Endpoints/Indices/PutSettings.php
+++ b/src/OpenSearch/Endpoints/Indices/PutSettings.php
@@ -61,7 +61,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PutSettings
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/PutTemplate.php b/src/OpenSearch/Endpoints/Indices/PutTemplate.php
index 666d67b38..90c581a39 100644
--- a/src/OpenSearch/Endpoints/Indices/PutTemplate.php
+++ b/src/OpenSearch/Endpoints/Indices/PutTemplate.php
@@ -60,7 +60,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PutTemplate
     {
         if (isset($body) !== true) {
             return $this;
@@ -70,7 +70,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setName($name): static
+    public function setName($name): PutTemplate
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/ResolveIndex.php b/src/OpenSearch/Endpoints/Indices/ResolveIndex.php
index 95604069b..c6d2fec0b 100644
--- a/src/OpenSearch/Endpoints/Indices/ResolveIndex.php
+++ b/src/OpenSearch/Endpoints/Indices/ResolveIndex.php
@@ -57,7 +57,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setName($name): static
+    public function setName($name): ResolveIndex
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/Rollover.php b/src/OpenSearch/Endpoints/Indices/Rollover.php
index 18c1519b6..0f4ec259e 100644
--- a/src/OpenSearch/Endpoints/Indices/Rollover.php
+++ b/src/OpenSearch/Endpoints/Indices/Rollover.php
@@ -68,7 +68,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Rollover
     {
         if (isset($body) !== true) {
             return $this;
@@ -78,7 +78,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setAlias($alias): static
+    public function setAlias($alias): Rollover
     {
         if (isset($alias) !== true) {
             return $this;
@@ -88,7 +88,7 @@ public function setAlias($alias): static
         return $this;
     }
 
-    public function setNewIndex($new_index): static
+    public function setNewIndex($new_index): Rollover
     {
         if (isset($new_index) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/Shrink.php b/src/OpenSearch/Endpoints/Indices/Shrink.php
index c271712bf..8806b7e60 100644
--- a/src/OpenSearch/Endpoints/Indices/Shrink.php
+++ b/src/OpenSearch/Endpoints/Indices/Shrink.php
@@ -64,7 +64,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Shrink
     {
         if (isset($body) !== true) {
             return $this;
@@ -74,7 +74,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setTarget($target): static
+    public function setTarget($target): Shrink
     {
         if (isset($target) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/SimulateIndexTemplate.php b/src/OpenSearch/Endpoints/Indices/SimulateIndexTemplate.php
index 977da3855..cc987ae2f 100644
--- a/src/OpenSearch/Endpoints/Indices/SimulateIndexTemplate.php
+++ b/src/OpenSearch/Endpoints/Indices/SimulateIndexTemplate.php
@@ -60,7 +60,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): SimulateIndexTemplate
     {
         if (isset($body) !== true) {
             return $this;
@@ -70,7 +70,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setName($name): static
+    public function setName($name): SimulateIndexTemplate
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/SimulateTemplate.php b/src/OpenSearch/Endpoints/Indices/SimulateTemplate.php
index 16ec3a9da..8aa2c0ffa 100644
--- a/src/OpenSearch/Endpoints/Indices/SimulateTemplate.php
+++ b/src/OpenSearch/Endpoints/Indices/SimulateTemplate.php
@@ -59,7 +59,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): SimulateTemplate
     {
         if (isset($body) !== true) {
             return $this;
@@ -69,7 +69,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setName($name): static
+    public function setName($name): SimulateTemplate
     {
         if (isset($name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/Split.php b/src/OpenSearch/Endpoints/Indices/Split.php
index 3fff81d37..6559b8818 100644
--- a/src/OpenSearch/Endpoints/Indices/Split.php
+++ b/src/OpenSearch/Endpoints/Indices/Split.php
@@ -64,7 +64,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Split
     {
         if (isset($body) !== true) {
             return $this;
@@ -74,7 +74,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setTarget($target): static
+    public function setTarget($target): Split
     {
         if (isset($target) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/Stats.php b/src/OpenSearch/Endpoints/Indices/Stats.php
index a1f51f4d8..86195e165 100644
--- a/src/OpenSearch/Endpoints/Indices/Stats.php
+++ b/src/OpenSearch/Endpoints/Indices/Stats.php
@@ -71,7 +71,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setMetric($metric): static
+    public function setMetric($metric): Stats
     {
         if (isset($metric) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/UpdateAliases.php b/src/OpenSearch/Endpoints/Indices/UpdateAliases.php
index d7dcbb9f8..fea7b223f 100644
--- a/src/OpenSearch/Endpoints/Indices/UpdateAliases.php
+++ b/src/OpenSearch/Endpoints/Indices/UpdateAliases.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): UpdateAliases
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Indices/ValidateQuery.php b/src/OpenSearch/Endpoints/Indices/ValidateQuery.php
index 008bebfe5..b6d6bda7d 100644
--- a/src/OpenSearch/Endpoints/Indices/ValidateQuery.php
+++ b/src/OpenSearch/Endpoints/Indices/ValidateQuery.php
@@ -65,7 +65,7 @@ public function getMethod(): string
         return isset($this->body) ? 'POST' : 'GET';
     }
 
-    public function setBody($body): static
+    public function setBody($body): ValidateQuery
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Ingest/PutPipeline.php b/src/OpenSearch/Endpoints/Ingest/PutPipeline.php
index 1a4cef432..9205cbc42 100644
--- a/src/OpenSearch/Endpoints/Ingest/PutPipeline.php
+++ b/src/OpenSearch/Endpoints/Ingest/PutPipeline.php
@@ -57,7 +57,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PutPipeline
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Ingest/Simulate.php b/src/OpenSearch/Endpoints/Ingest/Simulate.php
index 44e3ba9d2..afc876231 100644
--- a/src/OpenSearch/Endpoints/Ingest/Simulate.php
+++ b/src/OpenSearch/Endpoints/Ingest/Simulate.php
@@ -54,7 +54,7 @@ public function getMethod(): string
         return isset($this->body) ? 'POST' : 'GET';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Simulate
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Ism/AddPolicy.php b/src/OpenSearch/Endpoints/Ism/AddPolicy.php
index 045768abe..f87d83b68 100644
--- a/src/OpenSearch/Endpoints/Ism/AddPolicy.php
+++ b/src/OpenSearch/Endpoints/Ism/AddPolicy.php
@@ -48,7 +48,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): AddPolicy
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Ism/ChangePolicy.php b/src/OpenSearch/Endpoints/Ism/ChangePolicy.php
index 49dbb9d23..8815ec48a 100644
--- a/src/OpenSearch/Endpoints/Ism/ChangePolicy.php
+++ b/src/OpenSearch/Endpoints/Ism/ChangePolicy.php
@@ -48,7 +48,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): ChangePolicy
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Ism/DeletePolicy.php b/src/OpenSearch/Endpoints/Ism/DeletePolicy.php
index a30b2a258..00e92dbd3 100644
--- a/src/OpenSearch/Endpoints/Ism/DeletePolicy.php
+++ b/src/OpenSearch/Endpoints/Ism/DeletePolicy.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setPolicyId($policy_id): static
+    public function setPolicyId($policy_id): DeletePolicy
     {
         if (isset($policy_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Ism/ExistsPolicy.php b/src/OpenSearch/Endpoints/Ism/ExistsPolicy.php
index 55ea59b58..c7187f999 100644
--- a/src/OpenSearch/Endpoints/Ism/ExistsPolicy.php
+++ b/src/OpenSearch/Endpoints/Ism/ExistsPolicy.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'HEAD';
     }
 
-    public function setPolicyId($policy_id): static
+    public function setPolicyId($policy_id): ExistsPolicy
     {
         if (isset($policy_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Ism/ExplainPolicy.php b/src/OpenSearch/Endpoints/Ism/ExplainPolicy.php
index 35236df6b..80b2bb9a4 100644
--- a/src/OpenSearch/Endpoints/Ism/ExplainPolicy.php
+++ b/src/OpenSearch/Endpoints/Ism/ExplainPolicy.php
@@ -47,7 +47,7 @@ public function getMethod(): string
         return isset($this->body) ? 'POST' : 'GET';
     }
 
-    public function setBody($body): static
+    public function setBody($body): ExplainPolicy
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Ism/GetPolicy.php b/src/OpenSearch/Endpoints/Ism/GetPolicy.php
index 469dc7758..6138c890d 100644
--- a/src/OpenSearch/Endpoints/Ism/GetPolicy.php
+++ b/src/OpenSearch/Endpoints/Ism/GetPolicy.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setPolicyId($policy_id): static
+    public function setPolicyId($policy_id): GetPolicy
     {
         if (isset($policy_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Ism/PutPolicies.php b/src/OpenSearch/Endpoints/Ism/PutPolicies.php
index 5148d8811..8b80ed8e8 100644
--- a/src/OpenSearch/Endpoints/Ism/PutPolicies.php
+++ b/src/OpenSearch/Endpoints/Ism/PutPolicies.php
@@ -46,7 +46,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PutPolicies
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Ism/PutPolicy.php b/src/OpenSearch/Endpoints/Ism/PutPolicy.php
index e93b289b3..253b4d554 100644
--- a/src/OpenSearch/Endpoints/Ism/PutPolicy.php
+++ b/src/OpenSearch/Endpoints/Ism/PutPolicy.php
@@ -54,7 +54,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PutPolicy
     {
         if (isset($body) !== true) {
             return $this;
@@ -64,7 +64,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setPolicyId($policy_id): static
+    public function setPolicyId($policy_id): PutPolicy
     {
         if (isset($policy_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Ism/RetryIndex.php b/src/OpenSearch/Endpoints/Ism/RetryIndex.php
index 1056aab5e..d263e8502 100644
--- a/src/OpenSearch/Endpoints/Ism/RetryIndex.php
+++ b/src/OpenSearch/Endpoints/Ism/RetryIndex.php
@@ -48,7 +48,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): RetryIndex
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Knn/DeleteModel.php b/src/OpenSearch/Endpoints/Knn/DeleteModel.php
index f650a5751..e4afbc057 100644
--- a/src/OpenSearch/Endpoints/Knn/DeleteModel.php
+++ b/src/OpenSearch/Endpoints/Knn/DeleteModel.php
@@ -50,7 +50,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setModelId($model_id): static
+    public function setModelId($model_id): DeleteModel
     {
         if (isset($model_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Knn/GetModel.php b/src/OpenSearch/Endpoints/Knn/GetModel.php
index 410d884b1..c8d2e927b 100644
--- a/src/OpenSearch/Endpoints/Knn/GetModel.php
+++ b/src/OpenSearch/Endpoints/Knn/GetModel.php
@@ -50,7 +50,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setModelId($model_id): static
+    public function setModelId($model_id): GetModel
     {
         if (isset($model_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Knn/SearchModels.php b/src/OpenSearch/Endpoints/Knn/SearchModels.php
index cd25afc58..23e988cd4 100644
--- a/src/OpenSearch/Endpoints/Knn/SearchModels.php
+++ b/src/OpenSearch/Endpoints/Knn/SearchModels.php
@@ -85,7 +85,7 @@ public function getMethod(): string
         return isset($this->body) ? 'POST' : 'GET';
     }
 
-    public function setBody($body): static
+    public function setBody($body): SearchModels
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Knn/Stats.php b/src/OpenSearch/Endpoints/Knn/Stats.php
index a8d17d78a..a5fac1964 100644
--- a/src/OpenSearch/Endpoints/Knn/Stats.php
+++ b/src/OpenSearch/Endpoints/Knn/Stats.php
@@ -58,7 +58,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setNodeId($node_id): static
+    public function setNodeId($node_id): Stats
     {
         if (isset($node_id) !== true) {
             return $this;
@@ -71,7 +71,7 @@ public function setNodeId($node_id): static
         return $this;
     }
 
-    public function setStat($stat): static
+    public function setStat($stat): Stats
     {
         if (isset($stat) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Knn/TrainModel.php b/src/OpenSearch/Endpoints/Knn/TrainModel.php
index cf4cbc3b1..19b8d8074 100644
--- a/src/OpenSearch/Endpoints/Knn/TrainModel.php
+++ b/src/OpenSearch/Endpoints/Knn/TrainModel.php
@@ -50,7 +50,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): TrainModel
     {
         if (isset($body) !== true) {
             return $this;
@@ -60,7 +60,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setModelId($model_id): static
+    public function setModelId($model_id): TrainModel
     {
         if (isset($model_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/MTermVectors.php b/src/OpenSearch/Endpoints/MTermVectors.php
index f76e08807..11afa11e9 100644
--- a/src/OpenSearch/Endpoints/MTermVectors.php
+++ b/src/OpenSearch/Endpoints/MTermVectors.php
@@ -65,7 +65,7 @@ public function getMethod(): string
         return isset($this->body) ? 'POST' : 'GET';
     }
 
-    public function setBody($body): static
+    public function setBody($body): MTermVectors
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Mget.php b/src/OpenSearch/Endpoints/Mget.php
index edd7682f9..e1a57615b 100644
--- a/src/OpenSearch/Endpoints/Mget.php
+++ b/src/OpenSearch/Endpoints/Mget.php
@@ -61,7 +61,7 @@ public function getMethod(): string
         return isset($this->body) ? 'POST' : 'GET';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Mget
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Ml/CreateConnector.php b/src/OpenSearch/Endpoints/Ml/CreateConnector.php
index 887bf9872..6a62bbcb9 100644
--- a/src/OpenSearch/Endpoints/Ml/CreateConnector.php
+++ b/src/OpenSearch/Endpoints/Ml/CreateConnector.php
@@ -41,7 +41,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): CreateConnector
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Ml/DeleteAgent.php b/src/OpenSearch/Endpoints/Ml/DeleteAgent.php
index fb8c46560..759c5a54b 100644
--- a/src/OpenSearch/Endpoints/Ml/DeleteAgent.php
+++ b/src/OpenSearch/Endpoints/Ml/DeleteAgent.php
@@ -50,7 +50,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setAgentId($agent_id): static
+    public function setAgentId($agent_id): DeleteAgent
     {
         if (isset($agent_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Ml/DeleteConnector.php b/src/OpenSearch/Endpoints/Ml/DeleteConnector.php
index 6c28dd276..f457358cf 100644
--- a/src/OpenSearch/Endpoints/Ml/DeleteConnector.php
+++ b/src/OpenSearch/Endpoints/Ml/DeleteConnector.php
@@ -48,7 +48,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setConnectorId($connector_id): static
+    public function setConnectorId($connector_id): DeleteConnector
     {
         if (isset($connector_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Ml/DeleteTask.php b/src/OpenSearch/Endpoints/Ml/DeleteTask.php
index cbff3d87a..6a2a3036c 100644
--- a/src/OpenSearch/Endpoints/Ml/DeleteTask.php
+++ b/src/OpenSearch/Endpoints/Ml/DeleteTask.php
@@ -50,7 +50,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setTaskId($task_id): static
+    public function setTaskId($task_id): DeleteTask
     {
         if (isset($task_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Ml/DeployModel.php b/src/OpenSearch/Endpoints/Ml/DeployModel.php
index e69da6946..0d9cf4cb7 100644
--- a/src/OpenSearch/Endpoints/Ml/DeployModel.php
+++ b/src/OpenSearch/Endpoints/Ml/DeployModel.php
@@ -48,7 +48,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setModelId($model_id): static
+    public function setModelId($model_id): DeployModel
     {
         if (isset($model_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Ml/GetModelGroup.php b/src/OpenSearch/Endpoints/Ml/GetModelGroup.php
index 989f9ae23..f061ea6c6 100644
--- a/src/OpenSearch/Endpoints/Ml/GetModelGroup.php
+++ b/src/OpenSearch/Endpoints/Ml/GetModelGroup.php
@@ -50,7 +50,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setModelGroupId($model_group_id): static
+    public function setModelGroupId($model_group_id): GetModelGroup
     {
         if (isset($model_group_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Ml/RegisterAgents.php b/src/OpenSearch/Endpoints/Ml/RegisterAgents.php
index 11051da16..7c14d852b 100644
--- a/src/OpenSearch/Endpoints/Ml/RegisterAgents.php
+++ b/src/OpenSearch/Endpoints/Ml/RegisterAgents.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): RegisterAgents
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Ml/RegisterModel.php b/src/OpenSearch/Endpoints/Ml/RegisterModel.php
index 49824326a..698659c96 100644
--- a/src/OpenSearch/Endpoints/Ml/RegisterModel.php
+++ b/src/OpenSearch/Endpoints/Ml/RegisterModel.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): RegisterModel
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Ml/RegisterModelGroup.php b/src/OpenSearch/Endpoints/Ml/RegisterModelGroup.php
index ff4943eca..046581e8c 100644
--- a/src/OpenSearch/Endpoints/Ml/RegisterModelGroup.php
+++ b/src/OpenSearch/Endpoints/Ml/RegisterModelGroup.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): RegisterModelGroup
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Ml/SearchModels.php b/src/OpenSearch/Endpoints/Ml/SearchModels.php
index 84512e7c5..a6874ac1f 100644
--- a/src/OpenSearch/Endpoints/Ml/SearchModels.php
+++ b/src/OpenSearch/Endpoints/Ml/SearchModels.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setBody($body): static
+    public function setBody($body): SearchModels
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Ml/UndeployModel.php b/src/OpenSearch/Endpoints/Ml/UndeployModel.php
index 3aff2bad8..2dd63058f 100644
--- a/src/OpenSearch/Endpoints/Ml/UndeployModel.php
+++ b/src/OpenSearch/Endpoints/Ml/UndeployModel.php
@@ -48,7 +48,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setModelId($model_id): static
+    public function setModelId($model_id): UndeployModel
     {
         if (isset($model_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Msearch.php b/src/OpenSearch/Endpoints/Msearch.php
index a7e392857..e2a5fb6e1 100644
--- a/src/OpenSearch/Endpoints/Msearch.php
+++ b/src/OpenSearch/Endpoints/Msearch.php
@@ -68,7 +68,7 @@ public function getMethod(): string
         return isset($this->body) ? 'POST' : 'GET';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Msearch
     {
         if (isset($body) !== true) {
             return $this;
@@ -87,5 +87,4 @@ public function setBody($body): static
         }
         return $this;
     }
-
 }
diff --git a/src/OpenSearch/Endpoints/MsearchTemplate.php b/src/OpenSearch/Endpoints/MsearchTemplate.php
index 247882f7f..560c62d8f 100644
--- a/src/OpenSearch/Endpoints/MsearchTemplate.php
+++ b/src/OpenSearch/Endpoints/MsearchTemplate.php
@@ -66,7 +66,7 @@ public function getMethod(): string
         return isset($this->body) ? 'POST' : 'GET';
     }
 
-    public function setBody($body): static
+    public function setBody($body): MsearchTemplate
     {
         if (isset($body) !== true) {
             return $this;
@@ -85,5 +85,4 @@ public function setBody($body): static
         }
         return $this;
     }
-
 }
diff --git a/src/OpenSearch/Endpoints/Nodes/HotThreads.php b/src/OpenSearch/Endpoints/Nodes/HotThreads.php
index a4854a600..ab4e0a976 100644
--- a/src/OpenSearch/Endpoints/Nodes/HotThreads.php
+++ b/src/OpenSearch/Endpoints/Nodes/HotThreads.php
@@ -61,7 +61,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setNodeId($node_id): static
+    public function setNodeId($node_id): HotThreads
     {
         if (isset($node_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Nodes/Info.php b/src/OpenSearch/Endpoints/Nodes/Info.php
index da403a7c8..b02a894a3 100644
--- a/src/OpenSearch/Endpoints/Nodes/Info.php
+++ b/src/OpenSearch/Endpoints/Nodes/Info.php
@@ -70,7 +70,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setNodeIdOrMetric($node_id_or_metric): static
+    public function setNodeIdOrMetric($node_id_or_metric): Info
     {
         if (isset($node_id_or_metric) !== true) {
             return $this;
@@ -80,7 +80,7 @@ public function setNodeIdOrMetric($node_id_or_metric): static
         return $this;
     }
 
-    public function setMetric($metric): static
+    public function setMetric($metric): Info
     {
         if (isset($metric) !== true) {
             return $this;
@@ -93,7 +93,7 @@ public function setMetric($metric): static
         return $this;
     }
 
-    public function setNodeId($node_id): static
+    public function setNodeId($node_id): Info
     {
         if (isset($node_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Nodes/ReloadSecureSettings.php b/src/OpenSearch/Endpoints/Nodes/ReloadSecureSettings.php
index 6b3a6a140..f858252db 100644
--- a/src/OpenSearch/Endpoints/Nodes/ReloadSecureSettings.php
+++ b/src/OpenSearch/Endpoints/Nodes/ReloadSecureSettings.php
@@ -56,7 +56,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): ReloadSecureSettings
     {
         if (isset($body) !== true) {
             return $this;
@@ -66,7 +66,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setNodeId($node_id): static
+    public function setNodeId($node_id): ReloadSecureSettings
     {
         if (isset($node_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Nodes/Stats.php b/src/OpenSearch/Endpoints/Nodes/Stats.php
index b3d84d198..1758d29f8 100644
--- a/src/OpenSearch/Endpoints/Nodes/Stats.php
+++ b/src/OpenSearch/Endpoints/Nodes/Stats.php
@@ -79,7 +79,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setNodeId($node_id): static
+    public function setNodeId($node_id): Stats
     {
         if (isset($node_id) !== true) {
             return $this;
@@ -92,7 +92,7 @@ public function setNodeId($node_id): static
         return $this;
     }
 
-    public function setMetric($metric): static
+    public function setMetric($metric): Stats
     {
         if (isset($metric) !== true) {
             return $this;
@@ -105,7 +105,7 @@ public function setMetric($metric): static
         return $this;
     }
 
-    public function setIndexMetric($index_metric): static
+    public function setIndexMetric($index_metric): Stats
     {
         if (isset($index_metric) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Nodes/Usage.php b/src/OpenSearch/Endpoints/Nodes/Usage.php
index 18098ada5..3693c5918 100644
--- a/src/OpenSearch/Endpoints/Nodes/Usage.php
+++ b/src/OpenSearch/Endpoints/Nodes/Usage.php
@@ -64,7 +64,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setNodeId($node_id): static
+    public function setNodeId($node_id): Usage
     {
         if (isset($node_id) !== true) {
             return $this;
@@ -77,7 +77,7 @@ public function setNodeId($node_id): static
         return $this;
     }
 
-    public function setMetric($metric): static
+    public function setMetric($metric): Usage
     {
         if (isset($metric) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Notifications/CreateConfig.php b/src/OpenSearch/Endpoints/Notifications/CreateConfig.php
index a21b3c4ce..72ddf5931 100644
--- a/src/OpenSearch/Endpoints/Notifications/CreateConfig.php
+++ b/src/OpenSearch/Endpoints/Notifications/CreateConfig.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): CreateConfig
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Notifications/DeleteConfig.php b/src/OpenSearch/Endpoints/Notifications/DeleteConfig.php
index 6bab9ea4f..afe39ff2e 100644
--- a/src/OpenSearch/Endpoints/Notifications/DeleteConfig.php
+++ b/src/OpenSearch/Endpoints/Notifications/DeleteConfig.php
@@ -50,7 +50,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setConfigId($config_id): static
+    public function setConfigId($config_id): DeleteConfig
     {
         if (isset($config_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Notifications/GetConfig.php b/src/OpenSearch/Endpoints/Notifications/GetConfig.php
index 444dfb10c..ded17c039 100644
--- a/src/OpenSearch/Endpoints/Notifications/GetConfig.php
+++ b/src/OpenSearch/Endpoints/Notifications/GetConfig.php
@@ -50,7 +50,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setConfigId($config_id): static
+    public function setConfigId($config_id): GetConfig
     {
         if (isset($config_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Notifications/GetConfigs.php b/src/OpenSearch/Endpoints/Notifications/GetConfigs.php
index 22d250e16..95bdfbde1 100644
--- a/src/OpenSearch/Endpoints/Notifications/GetConfigs.php
+++ b/src/OpenSearch/Endpoints/Notifications/GetConfigs.php
@@ -83,7 +83,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setBody($body): static
+    public function setBody($body): GetConfigs
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Notifications/SendTest.php b/src/OpenSearch/Endpoints/Notifications/SendTest.php
index 2ff691812..2066781c1 100644
--- a/src/OpenSearch/Endpoints/Notifications/SendTest.php
+++ b/src/OpenSearch/Endpoints/Notifications/SendTest.php
@@ -50,7 +50,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setConfigId($config_id): static
+    public function setConfigId($config_id): SendTest
     {
         if (isset($config_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Notifications/UpdateConfig.php b/src/OpenSearch/Endpoints/Notifications/UpdateConfig.php
index 55fa55758..d493a5c78 100644
--- a/src/OpenSearch/Endpoints/Notifications/UpdateConfig.php
+++ b/src/OpenSearch/Endpoints/Notifications/UpdateConfig.php
@@ -50,7 +50,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): UpdateConfig
     {
         if (isset($body) !== true) {
             return $this;
@@ -60,7 +60,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setConfigId($config_id): static
+    public function setConfigId($config_id): UpdateConfig
     {
         if (isset($config_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Observability/CreateObject.php b/src/OpenSearch/Endpoints/Observability/CreateObject.php
index a88377e5c..47494884c 100644
--- a/src/OpenSearch/Endpoints/Observability/CreateObject.php
+++ b/src/OpenSearch/Endpoints/Observability/CreateObject.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): CreateObject
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Observability/DeleteObject.php b/src/OpenSearch/Endpoints/Observability/DeleteObject.php
index 308d4da41..cc600211f 100644
--- a/src/OpenSearch/Endpoints/Observability/DeleteObject.php
+++ b/src/OpenSearch/Endpoints/Observability/DeleteObject.php
@@ -50,7 +50,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setObjectId($object_id): static
+    public function setObjectId($object_id): DeleteObject
     {
         if (isset($object_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Observability/GetObject.php b/src/OpenSearch/Endpoints/Observability/GetObject.php
index ed967f9bc..e2cea7a87 100644
--- a/src/OpenSearch/Endpoints/Observability/GetObject.php
+++ b/src/OpenSearch/Endpoints/Observability/GetObject.php
@@ -50,7 +50,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setObjectId($object_id): static
+    public function setObjectId($object_id): GetObject
     {
         if (isset($object_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Observability/UpdateObject.php b/src/OpenSearch/Endpoints/Observability/UpdateObject.php
index 69d44e46f..a1c07f46d 100644
--- a/src/OpenSearch/Endpoints/Observability/UpdateObject.php
+++ b/src/OpenSearch/Endpoints/Observability/UpdateObject.php
@@ -50,7 +50,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): UpdateObject
     {
         if (isset($body) !== true) {
             return $this;
@@ -60,7 +60,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setObjectId($object_id): static
+    public function setObjectId($object_id): UpdateObject
     {
         if (isset($object_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Ppl/Explain.php b/src/OpenSearch/Endpoints/Ppl/Explain.php
index 4e1c04683..708526b7d 100644
--- a/src/OpenSearch/Endpoints/Ppl/Explain.php
+++ b/src/OpenSearch/Endpoints/Ppl/Explain.php
@@ -45,7 +45,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Explain
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Ppl/PostStats.php b/src/OpenSearch/Endpoints/Ppl/PostStats.php
index e7763bdce..5efac6f39 100644
--- a/src/OpenSearch/Endpoints/Ppl/PostStats.php
+++ b/src/OpenSearch/Endpoints/Ppl/PostStats.php
@@ -45,7 +45,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PostStats
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Ppl/Query.php b/src/OpenSearch/Endpoints/Ppl/Query.php
index 47c31e35e..bb544c862 100644
--- a/src/OpenSearch/Endpoints/Ppl/Query.php
+++ b/src/OpenSearch/Endpoints/Ppl/Query.php
@@ -45,7 +45,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Query
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/PutScript.php b/src/OpenSearch/Endpoints/PutScript.php
index 43323828b..5615c7806 100644
--- a/src/OpenSearch/Endpoints/PutScript.php
+++ b/src/OpenSearch/Endpoints/PutScript.php
@@ -66,7 +66,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PutScript
     {
         if (isset($body) !== true) {
             return $this;
@@ -76,7 +76,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setContext($context): static
+    public function setContext($context): PutScript
     {
         if (isset($context) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Query/DatasourceDelete.php b/src/OpenSearch/Endpoints/Query/DatasourceDelete.php
index 717019ba4..fac161964 100644
--- a/src/OpenSearch/Endpoints/Query/DatasourceDelete.php
+++ b/src/OpenSearch/Endpoints/Query/DatasourceDelete.php
@@ -50,7 +50,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setDatasourceName($datasource_name): static
+    public function setDatasourceName($datasource_name): DatasourceDelete
     {
         if (isset($datasource_name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Query/DatasourceRetrieve.php b/src/OpenSearch/Endpoints/Query/DatasourceRetrieve.php
index e04725583..f45d1adb9 100644
--- a/src/OpenSearch/Endpoints/Query/DatasourceRetrieve.php
+++ b/src/OpenSearch/Endpoints/Query/DatasourceRetrieve.php
@@ -50,7 +50,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setDatasourceName($datasource_name): static
+    public function setDatasourceName($datasource_name): DatasourceRetrieve
     {
         if (isset($datasource_name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Query/DatasourcesCreate.php b/src/OpenSearch/Endpoints/Query/DatasourcesCreate.php
index 9f1c2d4e2..b2a478816 100644
--- a/src/OpenSearch/Endpoints/Query/DatasourcesCreate.php
+++ b/src/OpenSearch/Endpoints/Query/DatasourcesCreate.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): DatasourcesCreate
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Query/DatasourcesUpdate.php b/src/OpenSearch/Endpoints/Query/DatasourcesUpdate.php
index 6836d7261..4da38b367 100644
--- a/src/OpenSearch/Endpoints/Query/DatasourcesUpdate.php
+++ b/src/OpenSearch/Endpoints/Query/DatasourcesUpdate.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): DatasourcesUpdate
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/RankEval.php b/src/OpenSearch/Endpoints/RankEval.php
index 4b1b23de1..ee92c79f0 100644
--- a/src/OpenSearch/Endpoints/RankEval.php
+++ b/src/OpenSearch/Endpoints/RankEval.php
@@ -57,7 +57,7 @@ public function getMethod(): string
         return isset($this->body) ? 'POST' : 'GET';
     }
 
-    public function setBody($body): static
+    public function setBody($body): RankEval
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Reindex.php b/src/OpenSearch/Endpoints/Reindex.php
index 85b19007d..8aacbcda6 100644
--- a/src/OpenSearch/Endpoints/Reindex.php
+++ b/src/OpenSearch/Endpoints/Reindex.php
@@ -57,7 +57,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Reindex
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/ReindexRethrottle.php b/src/OpenSearch/Endpoints/ReindexRethrottle.php
index fbbdb5290..50d7bc457 100644
--- a/src/OpenSearch/Endpoints/ReindexRethrottle.php
+++ b/src/OpenSearch/Endpoints/ReindexRethrottle.php
@@ -59,7 +59,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setTaskId($task_id): static
+    public function setTaskId($task_id): ReindexRethrottle
     {
         if (isset($task_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/RemoteStore/Restore.php b/src/OpenSearch/Endpoints/RemoteStore/Restore.php
index fb4c6c415..d1c4630fc 100644
--- a/src/OpenSearch/Endpoints/RemoteStore/Restore.php
+++ b/src/OpenSearch/Endpoints/RemoteStore/Restore.php
@@ -45,7 +45,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Restore
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/RenderSearchTemplate.php b/src/OpenSearch/Endpoints/RenderSearchTemplate.php
index 48e320423..80bea800e 100644
--- a/src/OpenSearch/Endpoints/RenderSearchTemplate.php
+++ b/src/OpenSearch/Endpoints/RenderSearchTemplate.php
@@ -53,7 +53,7 @@ public function getMethod(): string
         return isset($this->body) ? 'POST' : 'GET';
     }
 
-    public function setBody($body): static
+    public function setBody($body): RenderSearchTemplate
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Rollups/Put.php b/src/OpenSearch/Endpoints/Rollups/Put.php
index dc8ec8458..6aa63aaf8 100644
--- a/src/OpenSearch/Endpoints/Rollups/Put.php
+++ b/src/OpenSearch/Endpoints/Rollups/Put.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Put
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/ScriptsPainlessExecute.php b/src/OpenSearch/Endpoints/ScriptsPainlessExecute.php
index 1e3ecef26..5a6b8b71d 100644
--- a/src/OpenSearch/Endpoints/ScriptsPainlessExecute.php
+++ b/src/OpenSearch/Endpoints/ScriptsPainlessExecute.php
@@ -49,7 +49,7 @@ public function getMethod(): string
         return isset($this->body) ? 'POST' : 'GET';
     }
 
-    public function setBody($body): static
+    public function setBody($body): ScriptsPainlessExecute
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Scroll.php b/src/OpenSearch/Endpoints/Scroll.php
index f4042d833..907a555dc 100644
--- a/src/OpenSearch/Endpoints/Scroll.php
+++ b/src/OpenSearch/Endpoints/Scroll.php
@@ -62,7 +62,7 @@ public function getMethod(): string
         return isset($this->body) ? 'POST' : 'GET';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Scroll
     {
         if (isset($body) !== true) {
             return $this;
@@ -72,7 +72,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setScrollId($scroll_id): static
+    public function setScrollId($scroll_id): Scroll
     {
         if (isset($scroll_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Search.php b/src/OpenSearch/Endpoints/Search.php
index 8380e3f5b..0bbdf51cf 100644
--- a/src/OpenSearch/Endpoints/Search.php
+++ b/src/OpenSearch/Endpoints/Search.php
@@ -99,7 +99,7 @@ public function getMethod(): string
         return isset($this->body) ? 'POST' : 'GET';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Search
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/SearchPipeline/Put.php b/src/OpenSearch/Endpoints/SearchPipeline/Put.php
index dc0332a52..c194a59d4 100644
--- a/src/OpenSearch/Endpoints/SearchPipeline/Put.php
+++ b/src/OpenSearch/Endpoints/SearchPipeline/Put.php
@@ -50,7 +50,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Put
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/SearchTemplate.php b/src/OpenSearch/Endpoints/SearchTemplate.php
index e52369161..f297b183c 100644
--- a/src/OpenSearch/Endpoints/SearchTemplate.php
+++ b/src/OpenSearch/Endpoints/SearchTemplate.php
@@ -66,7 +66,7 @@ public function getMethod(): string
         return isset($this->body) ? 'POST' : 'GET';
     }
 
-    public function setBody($body): static
+    public function setBody($body): SearchTemplate
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/ChangePassword.php b/src/OpenSearch/Endpoints/Security/ChangePassword.php
index 494921f5c..12d2f7df4 100644
--- a/src/OpenSearch/Endpoints/Security/ChangePassword.php
+++ b/src/OpenSearch/Endpoints/Security/ChangePassword.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): ChangePassword
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/ConfigUpgradePerform.php b/src/OpenSearch/Endpoints/Security/ConfigUpgradePerform.php
index cc68e11fa..ad049f472 100644
--- a/src/OpenSearch/Endpoints/Security/ConfigUpgradePerform.php
+++ b/src/OpenSearch/Endpoints/Security/ConfigUpgradePerform.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): ConfigUpgradePerform
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/CreateActionGroup.php b/src/OpenSearch/Endpoints/Security/CreateActionGroup.php
index dfb844c02..22424f366 100644
--- a/src/OpenSearch/Endpoints/Security/CreateActionGroup.php
+++ b/src/OpenSearch/Endpoints/Security/CreateActionGroup.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): CreateActionGroup
     {
         if (isset($body) !== true) {
             return $this;
@@ -62,7 +62,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setActionGroup($action_group): static
+    public function setActionGroup($action_group): CreateActionGroup
     {
         if (isset($action_group) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/CreateAllowlist.php b/src/OpenSearch/Endpoints/Security/CreateAllowlist.php
index 1cccd618d..7562eb98d 100644
--- a/src/OpenSearch/Endpoints/Security/CreateAllowlist.php
+++ b/src/OpenSearch/Endpoints/Security/CreateAllowlist.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): CreateAllowlist
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/CreateRole.php b/src/OpenSearch/Endpoints/Security/CreateRole.php
index 5bf8a7b58..7402b3e95 100644
--- a/src/OpenSearch/Endpoints/Security/CreateRole.php
+++ b/src/OpenSearch/Endpoints/Security/CreateRole.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): CreateRole
     {
         if (isset($body) !== true) {
             return $this;
@@ -62,7 +62,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setRole($role): static
+    public function setRole($role): CreateRole
     {
         if (isset($role) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/CreateRoleMapping.php b/src/OpenSearch/Endpoints/Security/CreateRoleMapping.php
index 7acbb7925..6fcd61b92 100644
--- a/src/OpenSearch/Endpoints/Security/CreateRoleMapping.php
+++ b/src/OpenSearch/Endpoints/Security/CreateRoleMapping.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): CreateRoleMapping
     {
         if (isset($body) !== true) {
             return $this;
@@ -62,7 +62,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setRole($role): static
+    public function setRole($role): CreateRoleMapping
     {
         if (isset($role) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/CreateTenant.php b/src/OpenSearch/Endpoints/Security/CreateTenant.php
index 5463d44da..54ce0ee09 100644
--- a/src/OpenSearch/Endpoints/Security/CreateTenant.php
+++ b/src/OpenSearch/Endpoints/Security/CreateTenant.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): CreateTenant
     {
         if (isset($body) !== true) {
             return $this;
@@ -62,7 +62,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setTenant($tenant): static
+    public function setTenant($tenant): CreateTenant
     {
         if (isset($tenant) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/CreateUpdateTenancyConfig.php b/src/OpenSearch/Endpoints/Security/CreateUpdateTenancyConfig.php
index 15574d10c..3d60632f4 100644
--- a/src/OpenSearch/Endpoints/Security/CreateUpdateTenancyConfig.php
+++ b/src/OpenSearch/Endpoints/Security/CreateUpdateTenancyConfig.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): CreateUpdateTenancyConfig
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/CreateUser.php b/src/OpenSearch/Endpoints/Security/CreateUser.php
index a43677385..b69347047 100644
--- a/src/OpenSearch/Endpoints/Security/CreateUser.php
+++ b/src/OpenSearch/Endpoints/Security/CreateUser.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): CreateUser
     {
         if (isset($body) !== true) {
             return $this;
@@ -62,7 +62,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setUsername($username): static
+    public function setUsername($username): CreateUser
     {
         if (isset($username) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/CreateUserLegacy.php b/src/OpenSearch/Endpoints/Security/CreateUserLegacy.php
index 4e2bd51fb..e3f5ea21e 100644
--- a/src/OpenSearch/Endpoints/Security/CreateUserLegacy.php
+++ b/src/OpenSearch/Endpoints/Security/CreateUserLegacy.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): CreateUserLegacy
     {
         if (isset($body) !== true) {
             return $this;
@@ -62,7 +62,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setUsername($username): static
+    public function setUsername($username): CreateUserLegacy
     {
         if (isset($username) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/DeleteActionGroup.php b/src/OpenSearch/Endpoints/Security/DeleteActionGroup.php
index 9645e761d..4257f964c 100644
--- a/src/OpenSearch/Endpoints/Security/DeleteActionGroup.php
+++ b/src/OpenSearch/Endpoints/Security/DeleteActionGroup.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setActionGroup($action_group): static
+    public function setActionGroup($action_group): DeleteActionGroup
     {
         if (isset($action_group) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/DeleteDistinguishedName.php b/src/OpenSearch/Endpoints/Security/DeleteDistinguishedName.php
index f80c7e9c3..8e8920729 100644
--- a/src/OpenSearch/Endpoints/Security/DeleteDistinguishedName.php
+++ b/src/OpenSearch/Endpoints/Security/DeleteDistinguishedName.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setClusterName($cluster_name): static
+    public function setClusterName($cluster_name): DeleteDistinguishedName
     {
         if (isset($cluster_name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/DeleteRole.php b/src/OpenSearch/Endpoints/Security/DeleteRole.php
index aa906d66f..cea84504d 100644
--- a/src/OpenSearch/Endpoints/Security/DeleteRole.php
+++ b/src/OpenSearch/Endpoints/Security/DeleteRole.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setRole($role): static
+    public function setRole($role): DeleteRole
     {
         if (isset($role) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/DeleteRoleMapping.php b/src/OpenSearch/Endpoints/Security/DeleteRoleMapping.php
index 67b6d54a4..d1ec1f134 100644
--- a/src/OpenSearch/Endpoints/Security/DeleteRoleMapping.php
+++ b/src/OpenSearch/Endpoints/Security/DeleteRoleMapping.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setRole($role): static
+    public function setRole($role): DeleteRoleMapping
     {
         if (isset($role) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/DeleteTenant.php b/src/OpenSearch/Endpoints/Security/DeleteTenant.php
index d2e4d89e1..be3a5d840 100644
--- a/src/OpenSearch/Endpoints/Security/DeleteTenant.php
+++ b/src/OpenSearch/Endpoints/Security/DeleteTenant.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setTenant($tenant): static
+    public function setTenant($tenant): DeleteTenant
     {
         if (isset($tenant) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/DeleteUser.php b/src/OpenSearch/Endpoints/Security/DeleteUser.php
index 10c3b5937..639dc4a99 100644
--- a/src/OpenSearch/Endpoints/Security/DeleteUser.php
+++ b/src/OpenSearch/Endpoints/Security/DeleteUser.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setUsername($username): static
+    public function setUsername($username): DeleteUser
     {
         if (isset($username) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/DeleteUserLegacy.php b/src/OpenSearch/Endpoints/Security/DeleteUserLegacy.php
index cdaf73156..590494f46 100644
--- a/src/OpenSearch/Endpoints/Security/DeleteUserLegacy.php
+++ b/src/OpenSearch/Endpoints/Security/DeleteUserLegacy.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setUsername($username): static
+    public function setUsername($username): DeleteUserLegacy
     {
         if (isset($username) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/GenerateOboToken.php b/src/OpenSearch/Endpoints/Security/GenerateOboToken.php
index 503d30219..d9855ae2b 100644
--- a/src/OpenSearch/Endpoints/Security/GenerateOboToken.php
+++ b/src/OpenSearch/Endpoints/Security/GenerateOboToken.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): GenerateOboToken
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/GenerateUserToken.php b/src/OpenSearch/Endpoints/Security/GenerateUserToken.php
index 16d214569..476d259df 100644
--- a/src/OpenSearch/Endpoints/Security/GenerateUserToken.php
+++ b/src/OpenSearch/Endpoints/Security/GenerateUserToken.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setUsername($username): static
+    public function setUsername($username): GenerateUserToken
     {
         if (isset($username) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/GenerateUserTokenLegacy.php b/src/OpenSearch/Endpoints/Security/GenerateUserTokenLegacy.php
index 4ebdfecdf..b62ecc6e8 100644
--- a/src/OpenSearch/Endpoints/Security/GenerateUserTokenLegacy.php
+++ b/src/OpenSearch/Endpoints/Security/GenerateUserTokenLegacy.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setUsername($username): static
+    public function setUsername($username): GenerateUserTokenLegacy
     {
         if (isset($username) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/GetActionGroup.php b/src/OpenSearch/Endpoints/Security/GetActionGroup.php
index c0c51c547..2e117de73 100644
--- a/src/OpenSearch/Endpoints/Security/GetActionGroup.php
+++ b/src/OpenSearch/Endpoints/Security/GetActionGroup.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setActionGroup($action_group): static
+    public function setActionGroup($action_group): GetActionGroup
     {
         if (isset($action_group) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/GetDistinguishedName.php b/src/OpenSearch/Endpoints/Security/GetDistinguishedName.php
index e7dd3ee05..29ebf9fac 100644
--- a/src/OpenSearch/Endpoints/Security/GetDistinguishedName.php
+++ b/src/OpenSearch/Endpoints/Security/GetDistinguishedName.php
@@ -53,7 +53,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setClusterName($cluster_name): static
+    public function setClusterName($cluster_name): GetDistinguishedName
     {
         if (isset($cluster_name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/GetNodeCertificates.php b/src/OpenSearch/Endpoints/Security/GetNodeCertificates.php
index a0013349f..7d66df31e 100644
--- a/src/OpenSearch/Endpoints/Security/GetNodeCertificates.php
+++ b/src/OpenSearch/Endpoints/Security/GetNodeCertificates.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setNodeId($node_id): static
+    public function setNodeId($node_id): GetNodeCertificates
     {
         if (isset($node_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/GetRole.php b/src/OpenSearch/Endpoints/Security/GetRole.php
index de9dfc71c..21db28ce8 100644
--- a/src/OpenSearch/Endpoints/Security/GetRole.php
+++ b/src/OpenSearch/Endpoints/Security/GetRole.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setRole($role): static
+    public function setRole($role): GetRole
     {
         if (isset($role) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/GetRoleMapping.php b/src/OpenSearch/Endpoints/Security/GetRoleMapping.php
index b58d74ecb..34656ac79 100644
--- a/src/OpenSearch/Endpoints/Security/GetRoleMapping.php
+++ b/src/OpenSearch/Endpoints/Security/GetRoleMapping.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setRole($role): static
+    public function setRole($role): GetRoleMapping
     {
         if (isset($role) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/GetTenant.php b/src/OpenSearch/Endpoints/Security/GetTenant.php
index dcfd3c002..bbb46f22c 100644
--- a/src/OpenSearch/Endpoints/Security/GetTenant.php
+++ b/src/OpenSearch/Endpoints/Security/GetTenant.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setTenant($tenant): static
+    public function setTenant($tenant): GetTenant
     {
         if (isset($tenant) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/GetUser.php b/src/OpenSearch/Endpoints/Security/GetUser.php
index ec67393ae..71616462f 100644
--- a/src/OpenSearch/Endpoints/Security/GetUser.php
+++ b/src/OpenSearch/Endpoints/Security/GetUser.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setUsername($username): static
+    public function setUsername($username): GetUser
     {
         if (isset($username) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/GetUserLegacy.php b/src/OpenSearch/Endpoints/Security/GetUserLegacy.php
index f58bdf4d1..285bb3535 100644
--- a/src/OpenSearch/Endpoints/Security/GetUserLegacy.php
+++ b/src/OpenSearch/Endpoints/Security/GetUserLegacy.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setUsername($username): static
+    public function setUsername($username): GetUserLegacy
     {
         if (isset($username) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/PatchActionGroup.php b/src/OpenSearch/Endpoints/Security/PatchActionGroup.php
index 35e737aa9..23a7ae15d 100644
--- a/src/OpenSearch/Endpoints/Security/PatchActionGroup.php
+++ b/src/OpenSearch/Endpoints/Security/PatchActionGroup.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'PATCH';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PatchActionGroup
     {
         if (isset($body) !== true) {
             return $this;
@@ -62,7 +62,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setActionGroup($action_group): static
+    public function setActionGroup($action_group): PatchActionGroup
     {
         if (isset($action_group) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/PatchActionGroups.php b/src/OpenSearch/Endpoints/Security/PatchActionGroups.php
index 53e84258c..1934ff7bb 100644
--- a/src/OpenSearch/Endpoints/Security/PatchActionGroups.php
+++ b/src/OpenSearch/Endpoints/Security/PatchActionGroups.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'PATCH';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PatchActionGroups
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/PatchAllowlist.php b/src/OpenSearch/Endpoints/Security/PatchAllowlist.php
index bbd76c6fe..1bf9c04fb 100644
--- a/src/OpenSearch/Endpoints/Security/PatchAllowlist.php
+++ b/src/OpenSearch/Endpoints/Security/PatchAllowlist.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'PATCH';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PatchAllowlist
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/PatchAuditConfiguration.php b/src/OpenSearch/Endpoints/Security/PatchAuditConfiguration.php
index 3bcd2b91a..b20b9d438 100644
--- a/src/OpenSearch/Endpoints/Security/PatchAuditConfiguration.php
+++ b/src/OpenSearch/Endpoints/Security/PatchAuditConfiguration.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'PATCH';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PatchAuditConfiguration
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/PatchConfiguration.php b/src/OpenSearch/Endpoints/Security/PatchConfiguration.php
index 7fb935e2f..a1ab9a697 100644
--- a/src/OpenSearch/Endpoints/Security/PatchConfiguration.php
+++ b/src/OpenSearch/Endpoints/Security/PatchConfiguration.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'PATCH';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PatchConfiguration
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/PatchDistinguishedName.php b/src/OpenSearch/Endpoints/Security/PatchDistinguishedName.php
index 419d22cb0..2a25baab0 100644
--- a/src/OpenSearch/Endpoints/Security/PatchDistinguishedName.php
+++ b/src/OpenSearch/Endpoints/Security/PatchDistinguishedName.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'PATCH';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PatchDistinguishedName
     {
         if (isset($body) !== true) {
             return $this;
@@ -62,7 +62,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setClusterName($cluster_name): static
+    public function setClusterName($cluster_name): PatchDistinguishedName
     {
         if (isset($cluster_name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/PatchDistinguishedNames.php b/src/OpenSearch/Endpoints/Security/PatchDistinguishedNames.php
index 280dd322b..26e488a3c 100644
--- a/src/OpenSearch/Endpoints/Security/PatchDistinguishedNames.php
+++ b/src/OpenSearch/Endpoints/Security/PatchDistinguishedNames.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'PATCH';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PatchDistinguishedNames
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/PatchRole.php b/src/OpenSearch/Endpoints/Security/PatchRole.php
index 432817e7b..5d285ec3a 100644
--- a/src/OpenSearch/Endpoints/Security/PatchRole.php
+++ b/src/OpenSearch/Endpoints/Security/PatchRole.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'PATCH';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PatchRole
     {
         if (isset($body) !== true) {
             return $this;
@@ -62,7 +62,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setRole($role): static
+    public function setRole($role): PatchRole
     {
         if (isset($role) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/PatchRoleMapping.php b/src/OpenSearch/Endpoints/Security/PatchRoleMapping.php
index b593f2bc6..f1e9bf4f5 100644
--- a/src/OpenSearch/Endpoints/Security/PatchRoleMapping.php
+++ b/src/OpenSearch/Endpoints/Security/PatchRoleMapping.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'PATCH';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PatchRoleMapping
     {
         if (isset($body) !== true) {
             return $this;
@@ -62,7 +62,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setRole($role): static
+    public function setRole($role): PatchRoleMapping
     {
         if (isset($role) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/PatchRoleMappings.php b/src/OpenSearch/Endpoints/Security/PatchRoleMappings.php
index 29ef48b5b..0282e9135 100644
--- a/src/OpenSearch/Endpoints/Security/PatchRoleMappings.php
+++ b/src/OpenSearch/Endpoints/Security/PatchRoleMappings.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'PATCH';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PatchRoleMappings
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/PatchRoles.php b/src/OpenSearch/Endpoints/Security/PatchRoles.php
index cb1bb3b46..66c129624 100644
--- a/src/OpenSearch/Endpoints/Security/PatchRoles.php
+++ b/src/OpenSearch/Endpoints/Security/PatchRoles.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'PATCH';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PatchRoles
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/PatchTenant.php b/src/OpenSearch/Endpoints/Security/PatchTenant.php
index a3902d56d..b7efa65d6 100644
--- a/src/OpenSearch/Endpoints/Security/PatchTenant.php
+++ b/src/OpenSearch/Endpoints/Security/PatchTenant.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'PATCH';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PatchTenant
     {
         if (isset($body) !== true) {
             return $this;
@@ -62,7 +62,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setTenant($tenant): static
+    public function setTenant($tenant): PatchTenant
     {
         if (isset($tenant) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/PatchTenants.php b/src/OpenSearch/Endpoints/Security/PatchTenants.php
index 1f6b71a83..41a3dbc2b 100644
--- a/src/OpenSearch/Endpoints/Security/PatchTenants.php
+++ b/src/OpenSearch/Endpoints/Security/PatchTenants.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'PATCH';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PatchTenants
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/PatchUser.php b/src/OpenSearch/Endpoints/Security/PatchUser.php
index b15e8471e..147384652 100644
--- a/src/OpenSearch/Endpoints/Security/PatchUser.php
+++ b/src/OpenSearch/Endpoints/Security/PatchUser.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'PATCH';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PatchUser
     {
         if (isset($body) !== true) {
             return $this;
@@ -62,7 +62,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setUsername($username): static
+    public function setUsername($username): PatchUser
     {
         if (isset($username) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/PatchUsers.php b/src/OpenSearch/Endpoints/Security/PatchUsers.php
index 8b61f6585..dafff0a40 100644
--- a/src/OpenSearch/Endpoints/Security/PatchUsers.php
+++ b/src/OpenSearch/Endpoints/Security/PatchUsers.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'PATCH';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PatchUsers
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/UpdateAuditConfiguration.php b/src/OpenSearch/Endpoints/Security/UpdateAuditConfiguration.php
index c5e6824a7..00ff896f8 100644
--- a/src/OpenSearch/Endpoints/Security/UpdateAuditConfiguration.php
+++ b/src/OpenSearch/Endpoints/Security/UpdateAuditConfiguration.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): UpdateAuditConfiguration
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/UpdateConfiguration.php b/src/OpenSearch/Endpoints/Security/UpdateConfiguration.php
index b0862fd1b..b805d6d57 100644
--- a/src/OpenSearch/Endpoints/Security/UpdateConfiguration.php
+++ b/src/OpenSearch/Endpoints/Security/UpdateConfiguration.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): UpdateConfiguration
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Security/UpdateDistinguishedName.php b/src/OpenSearch/Endpoints/Security/UpdateDistinguishedName.php
index 25d8f1384..b78551c65 100644
--- a/src/OpenSearch/Endpoints/Security/UpdateDistinguishedName.php
+++ b/src/OpenSearch/Endpoints/Security/UpdateDistinguishedName.php
@@ -52,7 +52,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): UpdateDistinguishedName
     {
         if (isset($body) !== true) {
             return $this;
@@ -62,7 +62,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setClusterName($cluster_name): static
+    public function setClusterName($cluster_name): UpdateDistinguishedName
     {
         if (isset($cluster_name) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Snapshot/CleanupRepository.php b/src/OpenSearch/Endpoints/Snapshot/CleanupRepository.php
index 33800a060..4f7b5d723 100644
--- a/src/OpenSearch/Endpoints/Snapshot/CleanupRepository.php
+++ b/src/OpenSearch/Endpoints/Snapshot/CleanupRepository.php
@@ -59,7 +59,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setRepository($repository): static
+    public function setRepository($repository): CleanupRepository
     {
         if (isset($repository) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Snapshot/CloneSnapshot.php b/src/OpenSearch/Endpoints/Snapshot/CloneSnapshot.php
index 2d4523301..9808f55ca 100644
--- a/src/OpenSearch/Endpoints/Snapshot/CloneSnapshot.php
+++ b/src/OpenSearch/Endpoints/Snapshot/CloneSnapshot.php
@@ -62,7 +62,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): CloneSnapshot
     {
         if (isset($body) !== true) {
             return $this;
@@ -72,7 +72,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setRepository($repository): static
+    public function setRepository($repository): CloneSnapshot
     {
         if (isset($repository) !== true) {
             return $this;
@@ -82,7 +82,7 @@ public function setRepository($repository): static
         return $this;
     }
 
-    public function setSnapshot($snapshot): static
+    public function setSnapshot($snapshot): CloneSnapshot
     {
         if (isset($snapshot) !== true) {
             return $this;
@@ -92,7 +92,7 @@ public function setSnapshot($snapshot): static
         return $this;
     }
 
-    public function setTargetSnapshot($target_snapshot): static
+    public function setTargetSnapshot($target_snapshot): CloneSnapshot
     {
         if (isset($target_snapshot) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Snapshot/Create.php b/src/OpenSearch/Endpoints/Snapshot/Create.php
index 63c5ea70f..e46cbd481 100644
--- a/src/OpenSearch/Endpoints/Snapshot/Create.php
+++ b/src/OpenSearch/Endpoints/Snapshot/Create.php
@@ -61,7 +61,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Create
     {
         if (isset($body) !== true) {
             return $this;
@@ -71,7 +71,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setRepository($repository): static
+    public function setRepository($repository): Create
     {
         if (isset($repository) !== true) {
             return $this;
@@ -81,7 +81,7 @@ public function setRepository($repository): static
         return $this;
     }
 
-    public function setSnapshot($snapshot): static
+    public function setSnapshot($snapshot): Create
     {
         if (isset($snapshot) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Snapshot/CreateRepository.php b/src/OpenSearch/Endpoints/Snapshot/CreateRepository.php
index 5d5f7ef6e..1fef0bed0 100644
--- a/src/OpenSearch/Endpoints/Snapshot/CreateRepository.php
+++ b/src/OpenSearch/Endpoints/Snapshot/CreateRepository.php
@@ -60,7 +60,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): CreateRepository
     {
         if (isset($body) !== true) {
             return $this;
@@ -70,7 +70,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setRepository($repository): static
+    public function setRepository($repository): CreateRepository
     {
         if (isset($repository) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Snapshot/Delete.php b/src/OpenSearch/Endpoints/Snapshot/Delete.php
index 9dd2492ac..f543d1a6c 100644
--- a/src/OpenSearch/Endpoints/Snapshot/Delete.php
+++ b/src/OpenSearch/Endpoints/Snapshot/Delete.php
@@ -60,7 +60,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setRepository($repository): static
+    public function setRepository($repository): Delete
     {
         if (isset($repository) !== true) {
             return $this;
@@ -70,7 +70,7 @@ public function setRepository($repository): static
         return $this;
     }
 
-    public function setSnapshot($snapshot): static
+    public function setSnapshot($snapshot): Delete
     {
         if (isset($snapshot) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Snapshot/DeleteRepository.php b/src/OpenSearch/Endpoints/Snapshot/DeleteRepository.php
index 8e84c4888..b4f7bd36a 100644
--- a/src/OpenSearch/Endpoints/Snapshot/DeleteRepository.php
+++ b/src/OpenSearch/Endpoints/Snapshot/DeleteRepository.php
@@ -59,7 +59,7 @@ public function getMethod(): string
         return 'DELETE';
     }
 
-    public function setRepository($repository): static
+    public function setRepository($repository): DeleteRepository
     {
         if (isset($repository) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Snapshot/Get.php b/src/OpenSearch/Endpoints/Snapshot/Get.php
index 6951e15f8..77facdeed 100644
--- a/src/OpenSearch/Endpoints/Snapshot/Get.php
+++ b/src/OpenSearch/Endpoints/Snapshot/Get.php
@@ -62,7 +62,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setRepository($repository): static
+    public function setRepository($repository): Get
     {
         if (isset($repository) !== true) {
             return $this;
@@ -72,7 +72,7 @@ public function setRepository($repository): static
         return $this;
     }
 
-    public function setSnapshot($snapshot): static
+    public function setSnapshot($snapshot): Get
     {
         if (isset($snapshot) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Snapshot/GetRepository.php b/src/OpenSearch/Endpoints/Snapshot/GetRepository.php
index c4603a28e..d9b3442f1 100644
--- a/src/OpenSearch/Endpoints/Snapshot/GetRepository.php
+++ b/src/OpenSearch/Endpoints/Snapshot/GetRepository.php
@@ -58,7 +58,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setRepository($repository): static
+    public function setRepository($repository): GetRepository
     {
         if (isset($repository) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Snapshot/Restore.php b/src/OpenSearch/Endpoints/Snapshot/Restore.php
index 9c30e67aa..575cc3430 100644
--- a/src/OpenSearch/Endpoints/Snapshot/Restore.php
+++ b/src/OpenSearch/Endpoints/Snapshot/Restore.php
@@ -61,7 +61,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Restore
     {
         if (isset($body) !== true) {
             return $this;
@@ -71,7 +71,7 @@ public function setBody($body): static
         return $this;
     }
 
-    public function setRepository($repository): static
+    public function setRepository($repository): Restore
     {
         if (isset($repository) !== true) {
             return $this;
@@ -81,7 +81,7 @@ public function setRepository($repository): static
         return $this;
     }
 
-    public function setSnapshot($snapshot): static
+    public function setSnapshot($snapshot): Restore
     {
         if (isset($snapshot) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Snapshot/Status.php b/src/OpenSearch/Endpoints/Snapshot/Status.php
index d894ce8c4..183272cb6 100644
--- a/src/OpenSearch/Endpoints/Snapshot/Status.php
+++ b/src/OpenSearch/Endpoints/Snapshot/Status.php
@@ -63,7 +63,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setRepository($repository): static
+    public function setRepository($repository): Status
     {
         if (isset($repository) !== true) {
             return $this;
@@ -73,7 +73,7 @@ public function setRepository($repository): static
         return $this;
     }
 
-    public function setSnapshot($snapshot): static
+    public function setSnapshot($snapshot): Status
     {
         if (isset($snapshot) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Snapshot/VerifyRepository.php b/src/OpenSearch/Endpoints/Snapshot/VerifyRepository.php
index 4c8b0f871..6203bc299 100644
--- a/src/OpenSearch/Endpoints/Snapshot/VerifyRepository.php
+++ b/src/OpenSearch/Endpoints/Snapshot/VerifyRepository.php
@@ -59,7 +59,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setRepository($repository): static
+    public function setRepository($repository): VerifyRepository
     {
         if (isset($repository) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Sql/Close.php b/src/OpenSearch/Endpoints/Sql/Close.php
index dd9f8d32e..2ef15e00e 100644
--- a/src/OpenSearch/Endpoints/Sql/Close.php
+++ b/src/OpenSearch/Endpoints/Sql/Close.php
@@ -45,7 +45,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Close
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Sql/Explain.php b/src/OpenSearch/Endpoints/Sql/Explain.php
index c7380165c..6291c3b39 100644
--- a/src/OpenSearch/Endpoints/Sql/Explain.php
+++ b/src/OpenSearch/Endpoints/Sql/Explain.php
@@ -45,7 +45,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Explain
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Sql/PostStats.php b/src/OpenSearch/Endpoints/Sql/PostStats.php
index 4e1073ddc..744ae997b 100644
--- a/src/OpenSearch/Endpoints/Sql/PostStats.php
+++ b/src/OpenSearch/Endpoints/Sql/PostStats.php
@@ -45,7 +45,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): PostStats
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Sql/Query.php b/src/OpenSearch/Endpoints/Sql/Query.php
index 47d3699e2..c92970e0c 100644
--- a/src/OpenSearch/Endpoints/Sql/Query.php
+++ b/src/OpenSearch/Endpoints/Sql/Query.php
@@ -45,7 +45,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Query
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Sql/Settings.php b/src/OpenSearch/Endpoints/Sql/Settings.php
index 5872d364d..782898267 100644
--- a/src/OpenSearch/Endpoints/Sql/Settings.php
+++ b/src/OpenSearch/Endpoints/Sql/Settings.php
@@ -44,7 +44,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Settings
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Tasks/Cancel.php b/src/OpenSearch/Endpoints/Tasks/Cancel.php
index 2d578c53b..83deffe9f 100644
--- a/src/OpenSearch/Endpoints/Tasks/Cancel.php
+++ b/src/OpenSearch/Endpoints/Tasks/Cancel.php
@@ -59,7 +59,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setTaskId($task_id): static
+    public function setTaskId($task_id): Cancel
     {
         if (isset($task_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Tasks/Get.php b/src/OpenSearch/Endpoints/Tasks/Get.php
index 198941aba..df8e113df 100644
--- a/src/OpenSearch/Endpoints/Tasks/Get.php
+++ b/src/OpenSearch/Endpoints/Tasks/Get.php
@@ -58,7 +58,7 @@ public function getMethod(): string
         return 'GET';
     }
 
-    public function setTaskId($task_id): static
+    public function setTaskId($task_id): Get
     {
         if (isset($task_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/TermVectors.php b/src/OpenSearch/Endpoints/TermVectors.php
index 7a35caf12..c06aefdbe 100644
--- a/src/OpenSearch/Endpoints/TermVectors.php
+++ b/src/OpenSearch/Endpoints/TermVectors.php
@@ -71,7 +71,7 @@ public function getMethod(): string
         return isset($this->body) ? 'POST' : 'GET';
     }
 
-    public function setBody($body): static
+    public function setBody($body): TermVectors
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Transforms/Preview.php b/src/OpenSearch/Endpoints/Transforms/Preview.php
index 167422e50..ad9dc44ae 100644
--- a/src/OpenSearch/Endpoints/Transforms/Preview.php
+++ b/src/OpenSearch/Endpoints/Transforms/Preview.php
@@ -43,7 +43,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Preview
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Transforms/Put.php b/src/OpenSearch/Endpoints/Transforms/Put.php
index 5230fc884..68c371910 100644
--- a/src/OpenSearch/Endpoints/Transforms/Put.php
+++ b/src/OpenSearch/Endpoints/Transforms/Put.php
@@ -50,7 +50,7 @@ public function getMethod(): string
         return 'PUT';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Put
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/Update.php b/src/OpenSearch/Endpoints/Update.php
index a45d4ee22..eedb30196 100644
--- a/src/OpenSearch/Endpoints/Update.php
+++ b/src/OpenSearch/Endpoints/Update.php
@@ -74,7 +74,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): Update
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/UpdateByQuery.php b/src/OpenSearch/Endpoints/UpdateByQuery.php
index 627176dd9..f08a450ee 100644
--- a/src/OpenSearch/Endpoints/UpdateByQuery.php
+++ b/src/OpenSearch/Endpoints/UpdateByQuery.php
@@ -90,7 +90,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setBody($body): static
+    public function setBody($body): UpdateByQuery
     {
         if (isset($body) !== true) {
             return $this;
diff --git a/src/OpenSearch/Endpoints/UpdateByQueryRethrottle.php b/src/OpenSearch/Endpoints/UpdateByQueryRethrottle.php
index 1281a1ab7..37d8f7ff9 100644
--- a/src/OpenSearch/Endpoints/UpdateByQueryRethrottle.php
+++ b/src/OpenSearch/Endpoints/UpdateByQueryRethrottle.php
@@ -59,7 +59,7 @@ public function getMethod(): string
         return 'POST';
     }
 
-    public function setTaskId($task_id): static
+    public function setTaskId($task_id): UpdateByQueryRethrottle
     {
         if (isset($task_id) !== true) {
             return $this;
diff --git a/src/OpenSearch/Namespaces/WlmNamespace.php b/src/OpenSearch/Namespaces/WlmNamespace.php
deleted file mode 100644
index 220fe0262..000000000
--- a/src/OpenSearch/Namespaces/WlmNamespace.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * SPDX-License-Identifier: Apache-2.0
- *
- * The OpenSearch Contributors require contributions made to
- * this file be licensed under the Apache-2.0 license or a
- * compatible open source license.
- *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
- */
-
-namespace OpenSearch\Namespaces;
-
-use OpenSearch\Namespaces\AbstractNamespace;
-
-/**
- * Class WlmNamespace
- *
- * NOTE: This file is autogenerated using util/GenerateEndpoints.php
- */
-class WlmNamespace extends AbstractNamespace
-{
-    /**
-     * Creates the specified query group.
-     *
-     * $params['pretty']      = (boolean) Whether to pretty format the returned JSON response.
-     * $params['human']       = (boolean) Whether to return human readable values for statistics.
-     * $params['error_trace'] = (boolean) Whether to include the stack trace of returned errors.
-     * $params['source']      = (string) The URL-encoded request definition. Useful for libraries that do not accept a request body for non-POST requests.
-     * $params['filter_path'] = (any) Used to reduce the response. This parameter takes a comma-separated list of filters. It supports using wildcards to match any field or part of a field’s name. You can also exclude fields with "-".
-     *
-     * @param array $params Associative array of parameters
-     * @return array
-     */
-    public function createQueryGroup(array $params = [])
-    {
-        $body = $this->extractArgument($params, 'body');
-
-        $endpointBuilder = $this->endpoints;
-        $endpoint = $endpointBuilder('Wlm\CreateQueryGroup');
-        $endpoint->setParams($params);
-        $endpoint->setBody($body);
-
-        return $this->performRequest($endpoint);
-    }
-    /**
-     * Deletes the specified QueryGroup.
-     *
-     * $params['name']        = (string) QueryGroup name.
-     * $params['pretty']      = (boolean) Whether to pretty format the returned JSON response.
-     * $params['human']       = (boolean) Whether to return human readable values for statistics.
-     * $params['error_trace'] = (boolean) Whether to include the stack trace of returned errors.
-     * $params['source']      = (string) The URL-encoded request definition. Useful for libraries that do not accept a request body for non-POST requests.
-     * $params['filter_path'] = (any) Used to reduce the response. This parameter takes a comma-separated list of filters. It supports using wildcards to match any field or part of a field’s name. You can also exclude fields with "-".
-     *
-     * @param array $params Associative array of parameters
-     * @return array
-     */
-    public function deleteQueryGroup(array $params = [])
-    {
-        $name = $this->extractArgument($params, 'name');
-
-        $endpointBuilder = $this->endpoints;
-        $endpoint = $endpointBuilder('Wlm\DeleteQueryGroup');
-        $endpoint->setParams($params);
-        $endpoint->setName($name);
-
-        return $this->performRequest($endpoint);
-    }
-    /**
-     * Gets the specified QueryGroup or get all if no name is provided.
-     *
-     * $params['name']        = (string) QueryGroup name.
-     * $params['pretty']      = (boolean) Whether to pretty format the returned JSON response.
-     * $params['human']       = (boolean) Whether to return human readable values for statistics.
-     * $params['error_trace'] = (boolean) Whether to include the stack trace of returned errors.
-     * $params['source']      = (string) The URL-encoded request definition. Useful for libraries that do not accept a request body for non-POST requests.
-     * $params['filter_path'] = (any) Used to reduce the response. This parameter takes a comma-separated list of filters. It supports using wildcards to match any field or part of a field’s name. You can also exclude fields with "-".
-     *
-     * @param array $params Associative array of parameters
-     * @return array
-     */
-    public function getQueryGroup(array $params = [])
-    {
-        $name = $this->extractArgument($params, 'name');
-
-        $endpointBuilder = $this->endpoints;
-        $endpoint = $endpointBuilder('Wlm\GetQueryGroup');
-        $endpoint->setParams($params);
-        $endpoint->setName($name);
-
-        return $this->performRequest($endpoint);
-    }
-    /**
-     * Updates the specified query group.
-     *
-     * $params['name']        = (string) QueryGroup name.
-     * $params['pretty']      = (boolean) Whether to pretty format the returned JSON response.
-     * $params['human']       = (boolean) Whether to return human readable values for statistics.
-     * $params['error_trace'] = (boolean) Whether to include the stack trace of returned errors.
-     * $params['source']      = (string) The URL-encoded request definition. Useful for libraries that do not accept a request body for non-POST requests.
-     * $params['filter_path'] = (any) Used to reduce the response. This parameter takes a comma-separated list of filters. It supports using wildcards to match any field or part of a field’s name. You can also exclude fields with "-".
-     *
-     * @param array $params Associative array of parameters
-     * @return array
-     */
-    public function updateQueryGroup(array $params = [])
-    {
-        $name = $this->extractArgument($params, 'name');
-        $body = $this->extractArgument($params, 'body');
-
-        $endpointBuilder = $this->endpoints;
-        $endpoint = $endpointBuilder('Wlm\UpdateQueryGroup');
-        $endpoint->setParams($params);
-        $endpoint->setName($name);
-        $endpoint->setBody($body);
-
-        return $this->performRequest($endpoint);
-    }
-}