diff --git a/src/ApiGenerator/Configuration/CodeConfiguration.cs b/src/ApiGenerator/Configuration/CodeConfiguration.cs
index b09c34bb95..7be3540059 100644
--- a/src/ApiGenerator/Configuration/CodeConfiguration.cs
+++ b/src/ApiGenerator/Configuration/CodeConfiguration.cs
@@ -41,6 +41,19 @@ public static class CodeConfiguration
 		{
 			new("{create,delete}_pit"),
 			new("{delete,get}_all_pits"),
+            
+			new("cat.aliases"),
+			new("cat.allocation"),
+			new("cat.cluster_manager"),
+			new("cat.count"),
+			new("cat.fielddata"),
+			new("cat.health"),
+			new("cat.help"),
+			new("cat.indices"),
+			new("cat.master"),
+			new("cat.nodeattrs"),
+			new("cat.nodes"),
+			new("cat.pending_tasks"),
 
 			new("cluster.*"),
 			new("dangling_indices.*"),
diff --git a/src/ApiGenerator/OpenSearch.openapi.json b/src/ApiGenerator/OpenSearch.openapi.json
index fe1126c5e3..924d029be3 100644
--- a/src/ApiGenerator/OpenSearch.openapi.json
+++ b/src/ApiGenerator/OpenSearch.openapi.json
@@ -1323,7 +1323,7 @@
                     }
                 },
                 "x-operation-group": "cat.cluster_manager",
-                "x-version-added": "1.0"
+                "x-version-added": "2.0"
             }
         },
         "/_cat/count": {
@@ -2239,7 +2239,7 @@
                 "x-deprecation-message": "To promote inclusive language, please use '/_cat/cluster_manager' instead.",
                 "x-operation-group": "cat.master",
                 "x-version-added": "1.0",
-                "x-version-deprecated": "1.0"
+                "x-version-deprecated": "2.0"
             }
         },
         "/_cat/nodeattrs": {
diff --git a/src/OpenSearch.Client/ApiUrlsLookup.cs b/src/OpenSearch.Client/ApiUrlsLookup.cs
index 1d8ba9ee50..dba4eda9d9 100644
--- a/src/OpenSearch.Client/ApiUrlsLookup.cs
+++ b/src/OpenSearch.Client/ApiUrlsLookup.cs
@@ -46,20 +46,6 @@ namespace OpenSearch.Client
 	internal static partial class ApiUrlsLookups
 	{
 		internal static ApiUrls NoNamespaceBulk = new ApiUrls(new[]{"_bulk", "{index}/_bulk"});
-		internal static ApiUrls CatAliases = new ApiUrls(new[]{"_cat/aliases", "_cat/aliases/{name}"});
-		internal static ApiUrls CatAllocation = new ApiUrls(new[]{"_cat/allocation", "_cat/allocation/{node_id}"});
-		internal static ApiUrls CatCount = new ApiUrls(new[]{"_cat/count", "_cat/count/{index}"});
-		///<remarks>Introduced in OpenSearch 2.0 instead of <see cref="CatMaster"/></remarks>
-		internal static ApiUrls CatClusterManager = new ApiUrls(new[]{"_cat/cluster_manager"});
-		internal static ApiUrls CatFielddata = new ApiUrls(new[]{"_cat/fielddata", "_cat/fielddata/{fields}"});
-		internal static ApiUrls CatHealth = new ApiUrls(new[]{"_cat/health"});
-		internal static ApiUrls CatHelp = new ApiUrls(new[]{"_cat"});
-		internal static ApiUrls CatIndices = new ApiUrls(new[]{"_cat/indices", "_cat/indices/{index}"});
-		///<remarks>Deprecated as of OpenSearch 2.0, use <see cref="CatClusterManager"/> instead</remarks>
-		internal static ApiUrls CatMaster = new ApiUrls(new[]{"_cat/master"});
-		internal static ApiUrls CatNodeAttributes = new ApiUrls(new[]{"_cat/nodeattrs"});
-		internal static ApiUrls CatNodes = new ApiUrls(new[]{"_cat/nodes"});
-		internal static ApiUrls CatPendingTasks = new ApiUrls(new[]{"_cat/pending_tasks"});
 		internal static ApiUrls CatPlugins = new ApiUrls(new[]{"_cat/plugins"});
 		internal static ApiUrls CatRecovery = new ApiUrls(new[]{"_cat/recovery", "_cat/recovery/{index}"});
 		internal static ApiUrls CatRepositories = new ApiUrls(new[]{"_cat/repositories"});
diff --git a/src/OpenSearch.Client/Descriptors.Cat.cs b/src/OpenSearch.Client/Descriptors.Cat.cs
index f2d3ed6224..94a072c8b9 100644
--- a/src/OpenSearch.Client/Descriptors.Cat.cs
+++ b/src/OpenSearch.Client/Descriptors.Cat.cs
@@ -57,370 +57,6 @@
 // ReSharper disable RedundantNameQualifier
 namespace OpenSearch.Client
 {
-	///<summary>Descriptor for Aliases <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-aliases/</para></summary>
-	public partial class CatAliasesDescriptor : RequestDescriptorBase<CatAliasesDescriptor, CatAliasesRequestParameters, ICatAliasesRequest>, ICatAliasesRequest
-	{
-		internal override ApiUrls ApiUrls => ApiUrlsLookups.CatAliases;
-		///<summary>/_cat/aliases</summary>
-		public CatAliasesDescriptor(): base()
-		{
-		}
-
-		///<summary>/_cat/aliases/{name}</summary>
-		///<param name = "name">Optional, accepts null</param>
-		public CatAliasesDescriptor(Names name): base(r => r.Optional("name", name))
-		{
-		}
-
-		// values part of the url path
-		Names ICatAliasesRequest.Name => Self.RouteValues.Get<Names>("name");
-		///<summary>A comma-separated list of alias names to return</summary>
-		public CatAliasesDescriptor Name(Names name) => Assign(name, (a, v) => a.RouteValues.Optional("name", v));
-		// Request parameters
-		///<summary>Whether to expand wildcard expression to concrete indices that are open, closed or both.</summary>
-		public CatAliasesDescriptor ExpandWildcards(ExpandWildcards? expandwildcards) => Qs("expand_wildcards", expandwildcards);
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public CatAliasesDescriptor Format(string format) => Qs("format", format);
-		///<summary>Comma-separated list of column names to display</summary>
-		public CatAliasesDescriptor Headers(params string[] headers) => Qs("h", headers);
-		///<summary>Return help information</summary>
-		public CatAliasesDescriptor Help(bool? help = true) => Qs("help", help);
-		///<summary>Return local information, do not retrieve the state from cluster_manager node (default: false)</summary>
-		public CatAliasesDescriptor Local(bool? local = true) => Qs("local", local);
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public CatAliasesDescriptor SortByColumns(params string[] sortbycolumns) => Qs("s", sortbycolumns);
-		///<summary>Verbose mode. Display column headers</summary>
-		public CatAliasesDescriptor Verbose(bool? verbose = true) => Qs("v", verbose);
-	}
-
-	///<summary>Descriptor for Allocation <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-allocation/</para></summary>
-	public partial class CatAllocationDescriptor : RequestDescriptorBase<CatAllocationDescriptor, CatAllocationRequestParameters, ICatAllocationRequest>, ICatAllocationRequest
-	{
-		internal override ApiUrls ApiUrls => ApiUrlsLookups.CatAllocation;
-		///<summary>/_cat/allocation</summary>
-		public CatAllocationDescriptor(): base()
-		{
-		}
-
-		///<summary>/_cat/allocation/{node_id}</summary>
-		///<param name = "nodeId">Optional, accepts null</param>
-		public CatAllocationDescriptor(NodeIds nodeId): base(r => r.Optional("node_id", nodeId))
-		{
-		}
-
-		// values part of the url path
-		NodeIds ICatAllocationRequest.NodeId => Self.RouteValues.Get<NodeIds>("node_id");
-		///<summary>A comma-separated list of node IDs or names to limit the returned information</summary>
-		public CatAllocationDescriptor NodeId(NodeIds nodeId) => Assign(nodeId, (a, v) => a.RouteValues.Optional("node_id", v));
-		// Request parameters
-		///<summary>The unit in which to display byte values</summary>
-		public CatAllocationDescriptor Bytes(Bytes? bytes) => Qs("bytes", bytes);
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public CatAllocationDescriptor Format(string format) => Qs("format", format);
-		///<summary>Comma-separated list of column names to display</summary>
-		public CatAllocationDescriptor Headers(params string[] headers) => Qs("h", headers);
-		///<summary>Return help information</summary>
-		public CatAllocationDescriptor Help(bool? help = true) => Qs("help", help);
-		///<summary>Return local information, do not retrieve the state from cluster_manager node (default: false)</summary>
-		public CatAllocationDescriptor Local(bool? local = true) => Qs("local", local);
-		///<summary>Explicit operation timeout for connection to master node</summary>
-		///<remarks>Deprecated as of OpenSearch 2.0, use <see cref="ClusterManagerTimeout"/> instead</remarks>
-		public CatAllocationDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout);
-		///<summary>Explicit operation timeout for connection to cluster_manager node</summary>
-		///<remarks>Introduced in OpenSearch 2.0 instead of <see cref="MasterTimeout"/></remarks>
-		public CatAllocationDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout);
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public CatAllocationDescriptor SortByColumns(params string[] sortbycolumns) => Qs("s", sortbycolumns);
-		///<summary>Verbose mode. Display column headers</summary>
-		public CatAllocationDescriptor Verbose(bool? verbose = true) => Qs("v", verbose);
-	}
-
-	///<summary>Descriptor for Count <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-count/</para></summary>
-	public partial class CatCountDescriptor : RequestDescriptorBase<CatCountDescriptor, CatCountRequestParameters, ICatCountRequest>, ICatCountRequest
-	{
-		internal override ApiUrls ApiUrls => ApiUrlsLookups.CatCount;
-		///<summary>/_cat/count</summary>
-		public CatCountDescriptor(): base()
-		{
-		}
-
-		///<summary>/_cat/count/{index}</summary>
-		///<param name = "index">Optional, accepts null</param>
-		public CatCountDescriptor(Indices index): base(r => r.Optional("index", index))
-		{
-		}
-
-		// values part of the url path
-		Indices ICatCountRequest.Index => Self.RouteValues.Get<Indices>("index");
-		///<summary>A comma-separated list of index names to limit the returned information</summary>
-		public CatCountDescriptor Index(Indices index) => Assign(index, (a, v) => a.RouteValues.Optional("index", v));
-		///<summary>a shortcut into calling Index(typeof(TOther))</summary>
-		public CatCountDescriptor Index<TOther>()
-			where TOther : class => Assign(typeof(TOther), (a, v) => a.RouteValues.Optional("index", (Indices)v));
-		///<summary>A shortcut into calling Index(Indices.All)</summary>
-		public CatCountDescriptor AllIndices() => Index(Indices.All);
-		// Request parameters
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public CatCountDescriptor Format(string format) => Qs("format", format);
-		///<summary>Comma-separated list of column names to display</summary>
-		public CatCountDescriptor Headers(params string[] headers) => Qs("h", headers);
-		///<summary>Return help information</summary>
-		public CatCountDescriptor Help(bool? help = true) => Qs("help", help);
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public CatCountDescriptor SortByColumns(params string[] sortbycolumns) => Qs("s", sortbycolumns);
-		///<summary>Verbose mode. Display column headers</summary>
-		public CatCountDescriptor Verbose(bool? verbose = true) => Qs("v", verbose);
-	}
-
-	///<summary>Descriptor for Fielddata <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-field-data/</para></summary>
-	public partial class CatFielddataDescriptor : RequestDescriptorBase<CatFielddataDescriptor, CatFielddataRequestParameters, ICatFielddataRequest>, ICatFielddataRequest
-	{
-		internal override ApiUrls ApiUrls => ApiUrlsLookups.CatFielddata;
-		///<summary>/_cat/fielddata</summary>
-		public CatFielddataDescriptor(): base()
-		{
-		}
-
-		///<summary>/_cat/fielddata/{fields}</summary>
-		///<param name = "fields">Optional, accepts null</param>
-		public CatFielddataDescriptor(Fields fields): base(r => r.Optional("fields", fields))
-		{
-		}
-
-		// values part of the url path
-		Fields ICatFielddataRequest.Fields => Self.RouteValues.Get<Fields>("fields");
-		///<summary>A comma-separated list of fields to return the fielddata size</summary>
-		public CatFielddataDescriptor Fields(Fields fields) => Assign(fields, (a, v) => a.RouteValues.Optional("fields", v));
-		///<summary>A comma-separated list of fields to return the fielddata size</summary>
-		public CatFielddataDescriptor Fields<T>(params Expression<Func<T, object>>[] fields) => Assign(fields, (a, v) => a.RouteValues.Optional("fields", (Fields)v));
-		// Request parameters
-		///<summary>The unit in which to display byte values</summary>
-		public CatFielddataDescriptor Bytes(Bytes? bytes) => Qs("bytes", bytes);
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public CatFielddataDescriptor Format(string format) => Qs("format", format);
-		///<summary>Comma-separated list of column names to display</summary>
-		public CatFielddataDescriptor Headers(params string[] headers) => Qs("h", headers);
-		///<summary>Return help information</summary>
-		public CatFielddataDescriptor Help(bool? help = true) => Qs("help", help);
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public CatFielddataDescriptor SortByColumns(params string[] sortbycolumns) => Qs("s", sortbycolumns);
-		///<summary>Verbose mode. Display column headers</summary>
-		public CatFielddataDescriptor Verbose(bool? verbose = true) => Qs("v", verbose);
-	}
-
-	///<summary>Descriptor for Health <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-health/</para></summary>
-	public partial class CatHealthDescriptor : RequestDescriptorBase<CatHealthDescriptor, CatHealthRequestParameters, ICatHealthRequest>, ICatHealthRequest
-	{
-		internal override ApiUrls ApiUrls => ApiUrlsLookups.CatHealth;
-		// values part of the url path
-		// Request parameters
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public CatHealthDescriptor Format(string format) => Qs("format", format);
-		///<summary>Comma-separated list of column names to display</summary>
-		public CatHealthDescriptor Headers(params string[] headers) => Qs("h", headers);
-		///<summary>Return help information</summary>
-		public CatHealthDescriptor Help(bool? help = true) => Qs("help", help);
-		///<summary>Set to false to disable timestamping</summary>
-		public CatHealthDescriptor IncludeTimestamp(bool? includetimestamp = true) => Qs("ts", includetimestamp);
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public CatHealthDescriptor SortByColumns(params string[] sortbycolumns) => Qs("s", sortbycolumns);
-		///<summary>Verbose mode. Display column headers</summary>
-		public CatHealthDescriptor Verbose(bool? verbose = true) => Qs("v", verbose);
-	}
-
-	///<summary>Descriptor for Help <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/index/</para></summary>
-	public partial class CatHelpDescriptor : RequestDescriptorBase<CatHelpDescriptor, CatHelpRequestParameters, ICatHelpRequest>, ICatHelpRequest
-	{
-		internal override ApiUrls ApiUrls => ApiUrlsLookups.CatHelp;
-		// values part of the url path
-		// Request parameters
-		///<summary>Return help information</summary>
-		public CatHelpDescriptor Help(bool? help = true) => Qs("help", help);
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public CatHelpDescriptor SortByColumns(params string[] sortbycolumns) => Qs("s", sortbycolumns);
-	}
-
-	///<summary>Descriptor for Indices <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-indices/</para></summary>
-	public partial class CatIndicesDescriptor : RequestDescriptorBase<CatIndicesDescriptor, CatIndicesRequestParameters, ICatIndicesRequest>, ICatIndicesRequest
-	{
-		internal override ApiUrls ApiUrls => ApiUrlsLookups.CatIndices;
-		///<summary>/_cat/indices</summary>
-		public CatIndicesDescriptor(): base()
-		{
-		}
-
-		///<summary>/_cat/indices/{index}</summary>
-		///<param name = "index">Optional, accepts null</param>
-		public CatIndicesDescriptor(Indices index): base(r => r.Optional("index", index))
-		{
-		}
-
-		// values part of the url path
-		Indices ICatIndicesRequest.Index => Self.RouteValues.Get<Indices>("index");
-		///<summary>A comma-separated list of index names to limit the returned information</summary>
-		public CatIndicesDescriptor Index(Indices index) => Assign(index, (a, v) => a.RouteValues.Optional("index", v));
-		///<summary>a shortcut into calling Index(typeof(TOther))</summary>
-		public CatIndicesDescriptor Index<TOther>()
-			where TOther : class => Assign(typeof(TOther), (a, v) => a.RouteValues.Optional("index", (Indices)v));
-		///<summary>A shortcut into calling Index(Indices.All)</summary>
-		public CatIndicesDescriptor AllIndices() => Index(Indices.All);
-		// Request parameters
-		///<summary>The unit in which to display byte values</summary>
-		public CatIndicesDescriptor Bytes(Bytes? bytes) => Qs("bytes", bytes);
-		///<summary>Whether to expand wildcard expression to concrete indices that are open, closed or both.</summary>
-		public CatIndicesDescriptor ExpandWildcards(ExpandWildcards? expandwildcards) => Qs("expand_wildcards", expandwildcards);
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public CatIndicesDescriptor Format(string format) => Qs("format", format);
-		///<summary>Comma-separated list of column names to display</summary>
-		public CatIndicesDescriptor Headers(params string[] headers) => Qs("h", headers);
-		///<summary>A health status ("green", "yellow", or "red" to filter only indices matching the specified health status</summary>
-		public CatIndicesDescriptor Health(Health? health) => Qs("health", health);
-		///<summary>Return help information</summary>
-		public CatIndicesDescriptor Help(bool? help = true) => Qs("help", help);
-		///<summary>If set to true segment stats will include stats for segments that are not currently loaded into memory</summary>
-		public CatIndicesDescriptor IncludeUnloadedSegments(bool? includeunloadedsegments = true) => Qs("include_unloaded_segments", includeunloadedsegments);
-		///<summary>Return local information, do not retrieve the state from cluster_manager node (default: false)</summary>
-		public CatIndicesDescriptor Local(bool? local = true) => Qs("local", local);
-		///<summary>Explicit operation timeout for connection to master node</summary>
-		///<remarks>Deprecated as of OpenSearch 2.0, use <see cref="ClusterManagerTimeout"/> instead</remarks>
-		public CatIndicesDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout);
-		///<summary>Explicit operation timeout for connection to cluster_manager node</summary>
-		///<remarks>Introduced in OpenSearch 2.0 instead of <see cref="MasterTimeout"/></remarks>
-		public CatIndicesDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout);
-		///<summary>Set to true to return stats only for primary shards</summary>
-		public CatIndicesDescriptor Pri(bool? pri = true) => Qs("pri", pri);
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public CatIndicesDescriptor SortByColumns(params string[] sortbycolumns) => Qs("s", sortbycolumns);
-		///<summary>Verbose mode. Display column headers</summary>
-		public CatIndicesDescriptor Verbose(bool? verbose = true) => Qs("v", verbose);
-	}
-
-	///<summary>Descriptor for Master <para>https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/</para></summary>
-	///<remarks>Deprecated as of OpenSearch 2.0, use <see cref="CatClusterManagerDescriptor"/> instead</remarks>
-	public partial class CatMasterDescriptor : RequestDescriptorBase<CatMasterDescriptor, CatMasterRequestParameters, ICatMasterRequest>, ICatMasterRequest
-	{
-		internal override ApiUrls ApiUrls => ApiUrlsLookups.CatMaster;
-		// values part of the url path
-		// Request parameters
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public CatMasterDescriptor Format(string format) => Qs("format", format);
-		///<summary>Comma-separated list of column names to display</summary>
-		public CatMasterDescriptor Headers(params string[] headers) => Qs("h", headers);
-		///<summary>Return help information</summary>
-		public CatMasterDescriptor Help(bool? help = true) => Qs("help", help);
-		///<summary>Return local information, do not retrieve the state from cluster_manager node (default: false)</summary>
-		public CatMasterDescriptor Local(bool? local = true) => Qs("local", local);
-		///<summary>Explicit operation timeout for connection to master node</summary>
-		public CatMasterDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout);
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public CatMasterDescriptor SortByColumns(params string[] sortbycolumns) => Qs("s", sortbycolumns);
-		///<summary>Verbose mode. Display column headers</summary>
-		public CatMasterDescriptor Verbose(bool? verbose = true) => Qs("v", verbose);
-	}
-
-	///<summary>Descriptor for Master <para>https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/</para></summary>
-	///<remarks>Introduced in OpenSearch 2.0 instead of <see cref="CatMasterDescriptor"/></remarks>
-	public partial class CatClusterManagerDescriptor : RequestDescriptorBase<CatClusterManagerDescriptor, CatClusterManagerRequestParameters, ICatClusterManagerRequest>, ICatClusterManagerRequest
-	{
-		internal override ApiUrls ApiUrls => ApiUrlsLookups.CatClusterManager;
-		// values part of the url path
-		// Request parameters
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public CatClusterManagerDescriptor Format(string format) => Qs("format", format);
-		///<summary>Comma-separated list of column names to display</summary>
-		public CatClusterManagerDescriptor Headers(params string[] headers) => Qs("h", headers);
-		///<summary>Return help information</summary>
-		public CatClusterManagerDescriptor Help(bool? help = true) => Qs("help", help);
-		///<summary>Return local information, do not retrieve the state from cluster_manager node (default: false)</summary>
-		public CatClusterManagerDescriptor Local(bool? local = true) => Qs("local", local);
-		///<summary>Explicit operation timeout for connection to cluster_manager node</summary>
-		public CatClusterManagerDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout);
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public CatClusterManagerDescriptor SortByColumns(params string[] sortbycolumns) => Qs("s", sortbycolumns);
-		///<summary>Verbose mode. Display column headers</summary>
-		public CatClusterManagerDescriptor Verbose(bool? verbose = true) => Qs("v", verbose);
-	}
-
-	///<summary>Descriptor for NodeAttributes <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodeattrs/</para></summary>
-	public partial class CatNodeAttributesDescriptor : RequestDescriptorBase<CatNodeAttributesDescriptor, CatNodeAttributesRequestParameters, ICatNodeAttributesRequest>, ICatNodeAttributesRequest
-	{
-		internal override ApiUrls ApiUrls => ApiUrlsLookups.CatNodeAttributes;
-		// values part of the url path
-		// Request parameters
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public CatNodeAttributesDescriptor Format(string format) => Qs("format", format);
-		///<summary>Comma-separated list of column names to display</summary>
-		public CatNodeAttributesDescriptor Headers(params string[] headers) => Qs("h", headers);
-		///<summary>Return help information</summary>
-		public CatNodeAttributesDescriptor Help(bool? help = true) => Qs("help", help);
-		///<summary>Return local information, do not retrieve the state from cluster_manager node (default: false)</summary>
-		public CatNodeAttributesDescriptor Local(bool? local = true) => Qs("local", local);
-		///<summary>Explicit operation timeout for connection to master node</summary>
-		///<remarks>Deprecated as of OpenSearch 2.0, use <see cref="ClusterManagerTimeout"/> instead</remarks>
-		public CatNodeAttributesDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout);
-		///<summary>Explicit operation timeout for connection to cluster_manager node</summary>
-		///<remarks>Introduced in OpenSearch 2.0 instead of <see cref="MasterTimeout"/></remarks>
-		public CatNodeAttributesDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout);
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public CatNodeAttributesDescriptor SortByColumns(params string[] sortbycolumns) => Qs("s", sortbycolumns);
-		///<summary>Verbose mode. Display column headers</summary>
-		public CatNodeAttributesDescriptor Verbose(bool? verbose = true) => Qs("v", verbose);
-	}
-
-	///<summary>Descriptor for Nodes <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodes/</para></summary>
-	public partial class CatNodesDescriptor : RequestDescriptorBase<CatNodesDescriptor, CatNodesRequestParameters, ICatNodesRequest>, ICatNodesRequest
-	{
-		internal override ApiUrls ApiUrls => ApiUrlsLookups.CatNodes;
-		// values part of the url path
-		// Request parameters
-		///<summary>The unit in which to display byte values</summary>
-		public CatNodesDescriptor Bytes(Bytes? bytes) => Qs("bytes", bytes);
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public CatNodesDescriptor Format(string format) => Qs("format", format);
-		///<summary>Return the full node ID instead of the shortened version (default: false)</summary>
-		public CatNodesDescriptor FullId(bool? fullid = true) => Qs("full_id", fullid);
-		///<summary>Comma-separated list of column names to display</summary>
-		public CatNodesDescriptor Headers(params string[] headers) => Qs("h", headers);
-		///<summary>Return help information</summary>
-		public CatNodesDescriptor Help(bool? help = true) => Qs("help", help);
-		///<summary>Explicit operation timeout for connection to master node</summary>
-		///<remarks>Deprecated as of OpenSearch 2.0, use <see cref="ClusterManagerTimeout"/> instead</remarks>
-		public CatNodesDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout);
-		///<summary>Explicit operation timeout for connection to cluster_manager node</summary>
-		///<remarks>Introduced in OpenSearch 2.0 instead of <see cref="MasterTimeout"/></remarks>
-		public CatNodesDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout);
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public CatNodesDescriptor SortByColumns(params string[] sortbycolumns) => Qs("s", sortbycolumns);
-		///<summary>Verbose mode. Display column headers</summary>
-		public CatNodesDescriptor Verbose(bool? verbose = true) => Qs("v", verbose);
-	}
-
-	///<summary>Descriptor for PendingTasks <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-pending-tasks/</para></summary>
-	public partial class CatPendingTasksDescriptor : RequestDescriptorBase<CatPendingTasksDescriptor, CatPendingTasksRequestParameters, ICatPendingTasksRequest>, ICatPendingTasksRequest
-	{
-		internal override ApiUrls ApiUrls => ApiUrlsLookups.CatPendingTasks;
-		// values part of the url path
-		// Request parameters
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public CatPendingTasksDescriptor Format(string format) => Qs("format", format);
-		///<summary>Comma-separated list of column names to display</summary>
-		public CatPendingTasksDescriptor Headers(params string[] headers) => Qs("h", headers);
-		///<summary>Return help information</summary>
-		public CatPendingTasksDescriptor Help(bool? help = true) => Qs("help", help);
-		///<summary>Return local information, do not retrieve the state from cluster_manager node (default: false)</summary>
-		public CatPendingTasksDescriptor Local(bool? local = true) => Qs("local", local);
-		///<summary>Explicit operation timeout for connection to master node</summary>
-		///<remarks>Deprecated as of OpenSearch 2.0, use <see cref="ClusterManagerTimeout"/> instead</remarks>
-		public CatPendingTasksDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout);
-		///<summary>Explicit operation timeout for connection to cluster_manager node</summary>
-		///<remarks>Introduced in OpenSearch 2.0 instead of <see cref="MasterTimeout"/></remarks>
-		public CatPendingTasksDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout);
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public CatPendingTasksDescriptor SortByColumns(params string[] sortbycolumns) => Qs("s", sortbycolumns);
-		///<summary>Verbose mode. Display column headers</summary>
-		public CatPendingTasksDescriptor Verbose(bool? verbose = true) => Qs("v", verbose);
-	}
-
 	///<summary>Descriptor for Plugins <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-plugins/</para></summary>
 	public partial class CatPluginsDescriptor : RequestDescriptorBase<CatPluginsDescriptor, CatPluginsRequestParameters, ICatPluginsRequest>, ICatPluginsRequest
 	{
diff --git a/src/OpenSearch.Client/IOpenSearchClient.Generated.cs b/src/OpenSearch.Client/IOpenSearchClient.Generated.cs
index c582459651..1d895c73e6 100644
--- a/src/OpenSearch.Client/IOpenSearchClient.Generated.cs
+++ b/src/OpenSearch.Client/IOpenSearchClient.Generated.cs
@@ -64,12 +64,6 @@ namespace OpenSearch.Client
 	///</summary>
 	public partial interface IOpenSearchClient
 	{
-		///<summary>Cat APIs</summary>
-		CatNamespace Cat
-		{
-			get;
-		}
-
 		/// <summary>
 		/// <c>POST</c> request to the <c>bulk</c> API, read more about this API online:
 		/// <para></para>
diff --git a/src/OpenSearch.Client/OpenSearchClient.Cat.cs b/src/OpenSearch.Client/OpenSearchClient.Cat.cs
index ebf3fa065d..e34740a232 100644
--- a/src/OpenSearch.Client/OpenSearchClient.Cat.cs
+++ b/src/OpenSearch.Client/OpenSearchClient.Cat.cs
@@ -57,308 +57,8 @@ namespace OpenSearch.Client.Specification.CatApi
 	/// on <see cref = "IOpenSearchClient"/>.
 	///</para>
 	///</summary>
-	public class CatNamespace : NamespacedClientProxy
+	public partial class CatNamespace : NamespacedClientProxy
 	{
-		internal CatNamespace(OpenSearchClient client): base(client)
-		{
-		}
-
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.aliases</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-aliases/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-aliases/</a>
-		/// </summary>
-		public CatResponse<CatAliasesRecord> Aliases(Func<CatAliasesDescriptor, ICatAliasesRequest> selector = null) => Aliases(selector.InvokeOrDefault(new CatAliasesDescriptor()));
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.aliases</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-aliases/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-aliases/</a>
-		/// </summary>
-		public Task<CatResponse<CatAliasesRecord>> AliasesAsync(Func<CatAliasesDescriptor, ICatAliasesRequest> selector = null, CancellationToken ct = default) => AliasesAsync(selector.InvokeOrDefault(new CatAliasesDescriptor()), ct);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.aliases</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-aliases/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-aliases/</a>
-		/// </summary>
-		public CatResponse<CatAliasesRecord> Aliases(ICatAliasesRequest request) => DoCat<ICatAliasesRequest, CatAliasesRequestParameters, CatAliasesRecord>(request);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.aliases</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-aliases/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-aliases/</a>
-		/// </summary>
-		public Task<CatResponse<CatAliasesRecord>> AliasesAsync(ICatAliasesRequest request, CancellationToken ct = default) => DoCatAsync<ICatAliasesRequest, CatAliasesRequestParameters, CatAliasesRecord>(request, ct);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.allocation</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-allocation/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-allocation/</a>
-		/// </summary>
-		public CatResponse<CatAllocationRecord> Allocation(Func<CatAllocationDescriptor, ICatAllocationRequest> selector = null) => Allocation(selector.InvokeOrDefault(new CatAllocationDescriptor()));
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.allocation</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-allocation/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-allocation/</a>
-		/// </summary>
-		public Task<CatResponse<CatAllocationRecord>> AllocationAsync(Func<CatAllocationDescriptor, ICatAllocationRequest> selector = null, CancellationToken ct = default) => AllocationAsync(selector.InvokeOrDefault(new CatAllocationDescriptor()), ct);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.allocation</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-allocation/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-allocation/</a>
-		/// </summary>
-		public CatResponse<CatAllocationRecord> Allocation(ICatAllocationRequest request) => DoCat<ICatAllocationRequest, CatAllocationRequestParameters, CatAllocationRecord>(request);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.allocation</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-allocation/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-allocation/</a>
-		/// </summary>
-		public Task<CatResponse<CatAllocationRecord>> AllocationAsync(ICatAllocationRequest request, CancellationToken ct = default) => DoCatAsync<ICatAllocationRequest, CatAllocationRequestParameters, CatAllocationRecord>(request, ct);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.count</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-count/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-count/</a>
-		/// </summary>
-		public CatResponse<CatCountRecord> Count(Func<CatCountDescriptor, ICatCountRequest> selector = null) => Count(selector.InvokeOrDefault(new CatCountDescriptor()));
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.count</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-count/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-count/</a>
-		/// </summary>
-		public Task<CatResponse<CatCountRecord>> CountAsync(Func<CatCountDescriptor, ICatCountRequest> selector = null, CancellationToken ct = default) => CountAsync(selector.InvokeOrDefault(new CatCountDescriptor()), ct);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.count</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-count/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-count/</a>
-		/// </summary>
-		public CatResponse<CatCountRecord> Count(ICatCountRequest request) => DoCat<ICatCountRequest, CatCountRequestParameters, CatCountRecord>(request);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.count</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-count/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-count/</a>
-		/// </summary>
-		public Task<CatResponse<CatCountRecord>> CountAsync(ICatCountRequest request, CancellationToken ct = default) => DoCatAsync<ICatCountRequest, CatCountRequestParameters, CatCountRecord>(request, ct);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.fielddata</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-field-data/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-field-data/</a>
-		/// </summary>
-		public CatResponse<CatFielddataRecord> Fielddata(Func<CatFielddataDescriptor, ICatFielddataRequest> selector = null) => Fielddata(selector.InvokeOrDefault(new CatFielddataDescriptor()));
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.fielddata</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-field-data/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-field-data/</a>
-		/// </summary>
-		public Task<CatResponse<CatFielddataRecord>> FielddataAsync(Func<CatFielddataDescriptor, ICatFielddataRequest> selector = null, CancellationToken ct = default) => FielddataAsync(selector.InvokeOrDefault(new CatFielddataDescriptor()), ct);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.fielddata</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-field-data/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-field-data/</a>
-		/// </summary>
-		public CatResponse<CatFielddataRecord> Fielddata(ICatFielddataRequest request) => DoCat<ICatFielddataRequest, CatFielddataRequestParameters, CatFielddataRecord>(request);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.fielddata</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-field-data/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-field-data/</a>
-		/// </summary>
-		public Task<CatResponse<CatFielddataRecord>> FielddataAsync(ICatFielddataRequest request, CancellationToken ct = default) => DoCatAsync<ICatFielddataRequest, CatFielddataRequestParameters, CatFielddataRecord>(request, ct);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.health</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-health/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-health/</a>
-		/// </summary>
-		public CatResponse<CatHealthRecord> Health(Func<CatHealthDescriptor, ICatHealthRequest> selector = null) => Health(selector.InvokeOrDefault(new CatHealthDescriptor()));
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.health</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-health/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-health/</a>
-		/// </summary>
-		public Task<CatResponse<CatHealthRecord>> HealthAsync(Func<CatHealthDescriptor, ICatHealthRequest> selector = null, CancellationToken ct = default) => HealthAsync(selector.InvokeOrDefault(new CatHealthDescriptor()), ct);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.health</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-health/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-health/</a>
-		/// </summary>
-		public CatResponse<CatHealthRecord> Health(ICatHealthRequest request) => DoCat<ICatHealthRequest, CatHealthRequestParameters, CatHealthRecord>(request);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.health</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-health/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-health/</a>
-		/// </summary>
-		public Task<CatResponse<CatHealthRecord>> HealthAsync(ICatHealthRequest request, CancellationToken ct = default) => DoCatAsync<ICatHealthRequest, CatHealthRequestParameters, CatHealthRecord>(request, ct);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.help</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/index/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/index/</a>
-		/// </summary>
-		public CatResponse<CatHelpRecord> Help(Func<CatHelpDescriptor, ICatHelpRequest> selector = null) => Help(selector.InvokeOrDefault(new CatHelpDescriptor()));
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.help</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/index/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/index/</a>
-		/// </summary>
-		public Task<CatResponse<CatHelpRecord>> HelpAsync(Func<CatHelpDescriptor, ICatHelpRequest> selector = null, CancellationToken ct = default) => HelpAsync(selector.InvokeOrDefault(new CatHelpDescriptor()), ct);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.help</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/index/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/index/</a>
-		/// </summary>
-		public CatResponse<CatHelpRecord> Help(ICatHelpRequest request) => DoCat<ICatHelpRequest, CatHelpRequestParameters, CatHelpRecord>(request);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.help</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/index/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/index/</a>
-		/// </summary>
-		public Task<CatResponse<CatHelpRecord>> HelpAsync(ICatHelpRequest request, CancellationToken ct = default) => DoCatAsync<ICatHelpRequest, CatHelpRequestParameters, CatHelpRecord>(request, ct);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.indices</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-indices/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-indices/</a>
-		/// </summary>
-		public CatResponse<CatIndicesRecord> Indices(Func<CatIndicesDescriptor, ICatIndicesRequest> selector = null) => Indices(selector.InvokeOrDefault(new CatIndicesDescriptor()));
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.indices</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-indices/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-indices/</a>
-		/// </summary>
-		public Task<CatResponse<CatIndicesRecord>> IndicesAsync(Func<CatIndicesDescriptor, ICatIndicesRequest> selector = null, CancellationToken ct = default) => IndicesAsync(selector.InvokeOrDefault(new CatIndicesDescriptor()), ct);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.indices</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-indices/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-indices/</a>
-		/// </summary>
-		public CatResponse<CatIndicesRecord> Indices(ICatIndicesRequest request) => DoCat<ICatIndicesRequest, CatIndicesRequestParameters, CatIndicesRecord>(request);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.indices</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-indices/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-indices/</a>
-		/// </summary>
-		public Task<CatResponse<CatIndicesRecord>> IndicesAsync(ICatIndicesRequest request, CancellationToken ct = default) => DoCatAsync<ICatIndicesRequest, CatIndicesRequestParameters, CatIndicesRecord>(request, ct);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.master</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/">https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/</a>
-		/// <remarks>Deprecated as of OpenSearch 2.0, use <see cref="ClusterManager(Func&lt;CatClusterManagerDescriptor, ICatClusterManagerRequest&gt;)"/> instead</remarks>
-		/// </summary>
-		public CatResponse<CatMasterRecord> Master(Func<CatMasterDescriptor, ICatMasterRequest> selector = null) => Master(selector.InvokeOrDefault(new CatMasterDescriptor()));
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.master</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/">https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/</a>
-		/// <remarks>Deprecated as of OpenSearch 2.0, use <see cref="ClusterManagerAsync(Func&lt;CatClusterManagerDescriptor, ICatClusterManagerRequest&gt;, CancellationToken)"/> instead</remarks>
-		/// </summary>
-		public Task<CatResponse<CatMasterRecord>> MasterAsync(Func<CatMasterDescriptor, ICatMasterRequest> selector = null, CancellationToken ct = default) => MasterAsync(selector.InvokeOrDefault(new CatMasterDescriptor()), ct);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.master</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/">https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/</a>
-		/// <remarks>Deprecated as of OpenSearch 2.0, use <see cref="ClusterManager(ICatClusterManagerRequest)"/> instead</remarks>
-		/// </summary>
-		public CatResponse<CatMasterRecord> Master(ICatMasterRequest request) => DoCat<ICatMasterRequest, CatMasterRequestParameters, CatMasterRecord>(request);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.master</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/">https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/</a>
-		/// <remarks>Deprecated as of OpenSearch 2.0, use <see cref="ClusterManagerAsync(ICatClusterManagerRequest, CancellationToken)"/> instead</remarks>
-		/// </summary>
-		public Task<CatResponse<CatMasterRecord>> MasterAsync(ICatMasterRequest request, CancellationToken ct = default) => DoCatAsync<ICatMasterRequest, CatMasterRequestParameters, CatMasterRecord>(request, ct);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.cluster_manager</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/2.0/opensearch/rest-api/cat/cat-cluster_manager/">https://opensearch.org/docs/2.0/opensearch/rest-api/cat/cat-cluster_manager/</a>
-		/// <remarks>Introduced in OpenSearch 2.0 instead of <see cref="Master(Func&lt;CatMasterDescriptor, ICatMasterRequest&gt;)"/></remarks>
-		/// </summary>
-		public CatResponse<CatClusterManagerRecord> ClusterManager(Func<CatClusterManagerDescriptor, ICatClusterManagerRequest> selector = null) => ClusterManager(selector.InvokeOrDefault(new CatClusterManagerDescriptor()));
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.cluster_manager</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/2.0/opensearch/rest-api/cat/cat-cluster_manager/">https://opensearch.org/docs/2.0/opensearch/rest-api/cat/cat-cluster_manager/</a>
-		/// <remarks>Introduced in OpenSearch 2.0 instead of <see cref="MasterAsync(Func&lt;CatMasterDescriptor, ICatMasterRequest&gt;, CancellationToken)"/></remarks>
-		/// </summary>
-		public Task<CatResponse<CatClusterManagerRecord>> ClusterManagerAsync(Func<CatClusterManagerDescriptor, ICatClusterManagerRequest> selector = null, CancellationToken ct = default) => ClusterManagerAsync(selector.InvokeOrDefault(new CatClusterManagerDescriptor()), ct);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.cluster_manager</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/2.0/opensearch/rest-api/cat/cat-cluster_manager/">https://opensearch.org/docs/2.0/opensearch/rest-api/cat/cat-cluster_manager/</a>
-		/// <remarks>Introduced in OpenSearch 2.0 instead of <see cref="Master(ICatMasterRequest)"/></remarks>
-		/// </summary>
-		public CatResponse<CatClusterManagerRecord> ClusterManager(ICatClusterManagerRequest request) => DoCat<ICatClusterManagerRequest, CatClusterManagerRequestParameters, CatClusterManagerRecord>(request);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.cluster_manager</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/2.0/opensearch/rest-api/cat/cat-cluster_manager/">https://opensearch.org/docs/2.0/opensearch/rest-api/cat/cat-cluster_manager/</a>
-		/// <remarks>Introduced in OpenSearch 2.0 instead of <see cref="MasterAsync(ICatMasterRequest, CancellationToken)"/></remarks>
-		/// </summary>
-		public Task<CatResponse<CatClusterManagerRecord>> ClusterManagerAsync(ICatClusterManagerRequest request, CancellationToken ct = default) => DoCatAsync<ICatClusterManagerRequest, CatClusterManagerRequestParameters, CatClusterManagerRecord>(request, ct);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.nodeattrs</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodeattrs/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodeattrs/</a>
-		/// </summary>
-		public CatResponse<CatNodeAttributesRecord> NodeAttributes(Func<CatNodeAttributesDescriptor, ICatNodeAttributesRequest> selector = null) => NodeAttributes(selector.InvokeOrDefault(new CatNodeAttributesDescriptor()));
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.nodeattrs</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodeattrs/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodeattrs/</a>
-		/// </summary>
-		public Task<CatResponse<CatNodeAttributesRecord>> NodeAttributesAsync(Func<CatNodeAttributesDescriptor, ICatNodeAttributesRequest> selector = null, CancellationToken ct = default) => NodeAttributesAsync(selector.InvokeOrDefault(new CatNodeAttributesDescriptor()), ct);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.nodeattrs</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodeattrs/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodeattrs/</a>
-		/// </summary>
-		public CatResponse<CatNodeAttributesRecord> NodeAttributes(ICatNodeAttributesRequest request) => DoCat<ICatNodeAttributesRequest, CatNodeAttributesRequestParameters, CatNodeAttributesRecord>(request);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.nodeattrs</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodeattrs/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodeattrs/</a>
-		/// </summary>
-		public Task<CatResponse<CatNodeAttributesRecord>> NodeAttributesAsync(ICatNodeAttributesRequest request, CancellationToken ct = default) => DoCatAsync<ICatNodeAttributesRequest, CatNodeAttributesRequestParameters, CatNodeAttributesRecord>(request, ct);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.nodes</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodes/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodes/</a>
-		/// </summary>
-		public CatResponse<CatNodesRecord> Nodes(Func<CatNodesDescriptor, ICatNodesRequest> selector = null) => Nodes(selector.InvokeOrDefault(new CatNodesDescriptor()));
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.nodes</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodes/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodes/</a>
-		/// </summary>
-		public Task<CatResponse<CatNodesRecord>> NodesAsync(Func<CatNodesDescriptor, ICatNodesRequest> selector = null, CancellationToken ct = default) => NodesAsync(selector.InvokeOrDefault(new CatNodesDescriptor()), ct);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.nodes</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodes/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodes/</a>
-		/// </summary>
-		public CatResponse<CatNodesRecord> Nodes(ICatNodesRequest request) => DoCat<ICatNodesRequest, CatNodesRequestParameters, CatNodesRecord>(request);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.nodes</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodes/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodes/</a>
-		/// </summary>
-		public Task<CatResponse<CatNodesRecord>> NodesAsync(ICatNodesRequest request, CancellationToken ct = default) => DoCatAsync<ICatNodesRequest, CatNodesRequestParameters, CatNodesRecord>(request, ct);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.pending_tasks</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-pending-tasks/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-pending-tasks/</a>
-		/// </summary>
-		public CatResponse<CatPendingTasksRecord> PendingTasks(Func<CatPendingTasksDescriptor, ICatPendingTasksRequest> selector = null) => PendingTasks(selector.InvokeOrDefault(new CatPendingTasksDescriptor()));
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.pending_tasks</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-pending-tasks/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-pending-tasks/</a>
-		/// </summary>
-		public Task<CatResponse<CatPendingTasksRecord>> PendingTasksAsync(Func<CatPendingTasksDescriptor, ICatPendingTasksRequest> selector = null, CancellationToken ct = default) => PendingTasksAsync(selector.InvokeOrDefault(new CatPendingTasksDescriptor()), ct);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.pending_tasks</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-pending-tasks/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-pending-tasks/</a>
-		/// </summary>
-		public CatResponse<CatPendingTasksRecord> PendingTasks(ICatPendingTasksRequest request) => DoCat<ICatPendingTasksRequest, CatPendingTasksRequestParameters, CatPendingTasksRecord>(request);
-		/// <summary>
-		/// <c>GET</c> request to the <c>cat.pending_tasks</c> API, read more about this API online:
-		/// <para></para>
-		/// <a href = "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-pending-tasks/">https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-pending-tasks/</a>
-		/// </summary>
-		public Task<CatResponse<CatPendingTasksRecord>> PendingTasksAsync(ICatPendingTasksRequest request, CancellationToken ct = default) => DoCatAsync<ICatPendingTasksRequest, CatPendingTasksRequestParameters, CatPendingTasksRecord>(request, ct);
 		/// <summary>
 		/// <c>GET</c> request to the <c>cat.plugins</c> API, read more about this API online:
 		/// <para></para>
diff --git a/src/OpenSearch.Client/OpenSearchClient.NoNamespace.cs b/src/OpenSearch.Client/OpenSearchClient.NoNamespace.cs
index 6d2d7b0f71..6a7caf1e77 100644
--- a/src/OpenSearch.Client/OpenSearchClient.NoNamespace.cs
+++ b/src/OpenSearch.Client/OpenSearchClient.NoNamespace.cs
@@ -63,15 +63,6 @@ namespace OpenSearch.Client
 	///</summary>
 	public partial class OpenSearchClient : IOpenSearchClient
 	{
-		///<summary>Cat APIs</summary>
-		public CatNamespace Cat
-		{
-			get;
-			private set;
-		}
-
-		partial void SetupNamespaces() => Cat = new CatNamespace(this);
-
 		/// <summary>
 		/// <c>POST</c> request to the <c>bulk</c> API, read more about this API online:
 		/// <para></para>
diff --git a/src/OpenSearch.Client/Requests.Cat.cs b/src/OpenSearch.Client/Requests.Cat.cs
index 77d8241f9e..58769013d6 100644
--- a/src/OpenSearch.Client/Requests.Cat.cs
+++ b/src/OpenSearch.Client/Requests.Cat.cs
@@ -58,917 +58,6 @@
 // ReSharper disable RedundantNameQualifier
 namespace OpenSearch.Client
 {
-	[InterfaceDataContract]
-	public partial interface ICatAliasesRequest : IRequest<CatAliasesRequestParameters>
-	{
-		[IgnoreDataMember]
-		Names Name
-		{
-			get;
-		}
-	}
-
-	///<summary>Request for Aliases <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-aliases/</para></summary>
-	public partial class CatAliasesRequest : PlainRequestBase<CatAliasesRequestParameters>, ICatAliasesRequest
-	{
-		protected ICatAliasesRequest Self => this;
-		internal override ApiUrls ApiUrls => ApiUrlsLookups.CatAliases;
-		///<summary>/_cat/aliases</summary>
-		public CatAliasesRequest(): base()
-		{
-		}
-
-		///<summary>/_cat/aliases/{name}</summary>
-		///<param name = "name">Optional, accepts null</param>
-		public CatAliasesRequest(Names name): base(r => r.Optional("name", name))
-		{
-		}
-
-		// values part of the url path
-		[IgnoreDataMember]
-		Names ICatAliasesRequest.Name => Self.RouteValues.Get<Names>("name");
-		// Request parameters
-		///<summary>Whether to expand wildcard expression to concrete indices that are open, closed or both.</summary>
-		public ExpandWildcards? ExpandWildcards
-		{
-			get => Q<ExpandWildcards? >("expand_wildcards");
-			set => Q("expand_wildcards", value);
-		}
-
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public string Format
-		{
-			get => Q<string>("format");
-			set
-			{
-				Q("format", value);
-				SetAcceptHeader(value);
-			}
-		}
-
-		///<summary>Comma-separated list of column names to display</summary>
-		public string[] Headers
-		{
-			get => Q<string[]>("h");
-			set => Q("h", value);
-		}
-
-		///<summary>Return help information</summary>
-		public bool? Help
-		{
-			get => Q<bool? >("help");
-			set => Q("help", value);
-		}
-
-		///<summary>Return local information, do not retrieve the state from cluster_manager node (default: false)</summary>
-		public bool? Local
-		{
-			get => Q<bool? >("local");
-			set => Q("local", value);
-		}
-
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public string[] SortByColumns
-		{
-			get => Q<string[]>("s");
-			set => Q("s", value);
-		}
-
-		///<summary>Verbose mode. Display column headers</summary>
-		public bool? Verbose
-		{
-			get => Q<bool? >("v");
-			set => Q("v", value);
-		}
-	}
-
-	[InterfaceDataContract]
-	public partial interface ICatAllocationRequest : IRequest<CatAllocationRequestParameters>
-	{
-		[IgnoreDataMember]
-		NodeIds NodeId
-		{
-			get;
-		}
-	}
-
-	///<summary>Request for Allocation <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-allocation/</para></summary>
-	public partial class CatAllocationRequest : PlainRequestBase<CatAllocationRequestParameters>, ICatAllocationRequest
-	{
-		protected ICatAllocationRequest Self => this;
-		internal override ApiUrls ApiUrls => ApiUrlsLookups.CatAllocation;
-		///<summary>/_cat/allocation</summary>
-		public CatAllocationRequest(): base()
-		{
-		}
-
-		///<summary>/_cat/allocation/{node_id}</summary>
-		///<param name = "nodeId">Optional, accepts null</param>
-		public CatAllocationRequest(NodeIds nodeId): base(r => r.Optional("node_id", nodeId))
-		{
-		}
-
-		// values part of the url path
-		[IgnoreDataMember]
-		NodeIds ICatAllocationRequest.NodeId => Self.RouteValues.Get<NodeIds>("node_id");
-		// Request parameters
-		///<summary>The unit in which to display byte values</summary>
-		public Bytes? Bytes
-		{
-			get => Q<Bytes? >("bytes");
-			set => Q("bytes", value);
-		}
-
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public string Format
-		{
-			get => Q<string>("format");
-			set
-			{
-				Q("format", value);
-				SetAcceptHeader(value);
-			}
-		}
-
-		///<summary>Comma-separated list of column names to display</summary>
-		public string[] Headers
-		{
-			get => Q<string[]>("h");
-			set => Q("h", value);
-		}
-
-		///<summary>Return help information</summary>
-		public bool? Help
-		{
-			get => Q<bool? >("help");
-			set => Q("help", value);
-		}
-
-		///<summary>Return local information, do not retrieve the state from cluster_manager node (default: false)</summary>
-		public bool? Local
-		{
-			get => Q<bool? >("local");
-			set => Q("local", value);
-		}
-
-		///<summary>Explicit operation timeout for connection to master node</summary>
-		///<remarks>Deprecated as of OpenSearch 2.0, use <see cref="ClusterManagerTimeout"/> instead</remarks>
-		public Time MasterTimeout
-		{
-			get => Q<Time>("master_timeout");
-			set => Q("master_timeout", value);
-		}
-
-		///<summary>Explicit operation timeout for connection to cluster_manager node</summary>
-		///<remarks>Introduced in OpenSearch 2.0 instead of <see cref="MasterTimeout"/></remarks>
-		public Time ClusterManagerTimeout
-		{
-			get => Q<Time>("cluster_manager_timeout");
-			set => Q("cluster_manager_timeout", value);
-		}
-
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public string[] SortByColumns
-		{
-			get => Q<string[]>("s");
-			set => Q("s", value);
-		}
-
-		///<summary>Verbose mode. Display column headers</summary>
-		public bool? Verbose
-		{
-			get => Q<bool? >("v");
-			set => Q("v", value);
-		}
-	}
-
-	[InterfaceDataContract]
-	public partial interface ICatCountRequest : IRequest<CatCountRequestParameters>
-	{
-		[IgnoreDataMember]
-		Indices Index
-		{
-			get;
-		}
-	}
-
-	///<summary>Request for Count <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-count/</para></summary>
-	public partial class CatCountRequest : PlainRequestBase<CatCountRequestParameters>, ICatCountRequest
-	{
-		protected ICatCountRequest Self => this;
-		internal override ApiUrls ApiUrls => ApiUrlsLookups.CatCount;
-		///<summary>/_cat/count</summary>
-		public CatCountRequest(): base()
-		{
-		}
-
-		///<summary>/_cat/count/{index}</summary>
-		///<param name = "index">Optional, accepts null</param>
-		public CatCountRequest(Indices index): base(r => r.Optional("index", index))
-		{
-		}
-
-		// values part of the url path
-		[IgnoreDataMember]
-		Indices ICatCountRequest.Index => Self.RouteValues.Get<Indices>("index");
-		// Request parameters
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public string Format
-		{
-			get => Q<string>("format");
-			set
-			{
-				Q("format", value);
-				SetAcceptHeader(value);
-			}
-		}
-
-		///<summary>Comma-separated list of column names to display</summary>
-		public string[] Headers
-		{
-			get => Q<string[]>("h");
-			set => Q("h", value);
-		}
-
-		///<summary>Return help information</summary>
-		public bool? Help
-		{
-			get => Q<bool? >("help");
-			set => Q("help", value);
-		}
-
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public string[] SortByColumns
-		{
-			get => Q<string[]>("s");
-			set => Q("s", value);
-		}
-
-		///<summary>Verbose mode. Display column headers</summary>
-		public bool? Verbose
-		{
-			get => Q<bool? >("v");
-			set => Q("v", value);
-		}
-	}
-
-	[InterfaceDataContract]
-	public partial interface ICatFielddataRequest : IRequest<CatFielddataRequestParameters>
-	{
-		[IgnoreDataMember]
-		Fields Fields
-		{
-			get;
-		}
-	}
-
-	///<summary>Request for Fielddata <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-field-data/</para></summary>
-	public partial class CatFielddataRequest : PlainRequestBase<CatFielddataRequestParameters>, ICatFielddataRequest
-	{
-		protected ICatFielddataRequest Self => this;
-		internal override ApiUrls ApiUrls => ApiUrlsLookups.CatFielddata;
-		///<summary>/_cat/fielddata</summary>
-		public CatFielddataRequest(): base()
-		{
-		}
-
-		///<summary>/_cat/fielddata/{fields}</summary>
-		///<param name = "fields">Optional, accepts null</param>
-		public CatFielddataRequest(Fields fields): base(r => r.Optional("fields", fields))
-		{
-		}
-
-		// values part of the url path
-		[IgnoreDataMember]
-		Fields ICatFielddataRequest.Fields => Self.RouteValues.Get<Fields>("fields");
-		// Request parameters
-		///<summary>The unit in which to display byte values</summary>
-		public Bytes? Bytes
-		{
-			get => Q<Bytes? >("bytes");
-			set => Q("bytes", value);
-		}
-
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public string Format
-		{
-			get => Q<string>("format");
-			set
-			{
-				Q("format", value);
-				SetAcceptHeader(value);
-			}
-		}
-
-		///<summary>Comma-separated list of column names to display</summary>
-		public string[] Headers
-		{
-			get => Q<string[]>("h");
-			set => Q("h", value);
-		}
-
-		///<summary>Return help information</summary>
-		public bool? Help
-		{
-			get => Q<bool? >("help");
-			set => Q("help", value);
-		}
-
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public string[] SortByColumns
-		{
-			get => Q<string[]>("s");
-			set => Q("s", value);
-		}
-
-		///<summary>Verbose mode. Display column headers</summary>
-		public bool? Verbose
-		{
-			get => Q<bool? >("v");
-			set => Q("v", value);
-		}
-	}
-
-	[InterfaceDataContract]
-	public partial interface ICatHealthRequest : IRequest<CatHealthRequestParameters>
-	{
-	}
-
-	///<summary>Request for Health <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-health/</para></summary>
-	public partial class CatHealthRequest : PlainRequestBase<CatHealthRequestParameters>, ICatHealthRequest
-	{
-		protected ICatHealthRequest Self => this;
-		internal override ApiUrls ApiUrls => ApiUrlsLookups.CatHealth;
-		// values part of the url path
-		// Request parameters
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public string Format
-		{
-			get => Q<string>("format");
-			set
-			{
-				Q("format", value);
-				SetAcceptHeader(value);
-			}
-		}
-
-		///<summary>Comma-separated list of column names to display</summary>
-		public string[] Headers
-		{
-			get => Q<string[]>("h");
-			set => Q("h", value);
-		}
-
-		///<summary>Return help information</summary>
-		public bool? Help
-		{
-			get => Q<bool? >("help");
-			set => Q("help", value);
-		}
-
-		///<summary>Set to false to disable timestamping</summary>
-		public bool? IncludeTimestamp
-		{
-			get => Q<bool? >("ts");
-			set => Q("ts", value);
-		}
-
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public string[] SortByColumns
-		{
-			get => Q<string[]>("s");
-			set => Q("s", value);
-		}
-
-		///<summary>Verbose mode. Display column headers</summary>
-		public bool? Verbose
-		{
-			get => Q<bool? >("v");
-			set => Q("v", value);
-		}
-	}
-
-	[InterfaceDataContract]
-	public partial interface ICatHelpRequest : IRequest<CatHelpRequestParameters>
-	{
-	}
-
-	///<summary>Request for Help <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/index/</para></summary>
-	public partial class CatHelpRequest : PlainRequestBase<CatHelpRequestParameters>, ICatHelpRequest
-	{
-		protected ICatHelpRequest Self => this;
-		internal override ApiUrls ApiUrls => ApiUrlsLookups.CatHelp;
-		// values part of the url path
-		// Request parameters
-		///<summary>Return help information</summary>
-		public bool? Help
-		{
-			get => Q<bool? >("help");
-			set => Q("help", value);
-		}
-
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public string[] SortByColumns
-		{
-			get => Q<string[]>("s");
-			set => Q("s", value);
-		}
-	}
-
-	[InterfaceDataContract]
-	public partial interface ICatIndicesRequest : IRequest<CatIndicesRequestParameters>
-	{
-		[IgnoreDataMember]
-		Indices Index
-		{
-			get;
-		}
-	}
-
-	///<summary>Request for Indices <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-indices/</para></summary>
-	public partial class CatIndicesRequest : PlainRequestBase<CatIndicesRequestParameters>, ICatIndicesRequest
-	{
-		protected ICatIndicesRequest Self => this;
-		internal override ApiUrls ApiUrls => ApiUrlsLookups.CatIndices;
-		///<summary>/_cat/indices</summary>
-		public CatIndicesRequest(): base()
-		{
-		}
-
-		///<summary>/_cat/indices/{index}</summary>
-		///<param name = "index">Optional, accepts null</param>
-		public CatIndicesRequest(Indices index): base(r => r.Optional("index", index))
-		{
-		}
-
-		// values part of the url path
-		[IgnoreDataMember]
-		Indices ICatIndicesRequest.Index => Self.RouteValues.Get<Indices>("index");
-		// Request parameters
-		///<summary>The unit in which to display byte values</summary>
-		public Bytes? Bytes
-		{
-			get => Q<Bytes? >("bytes");
-			set => Q("bytes", value);
-		}
-
-		///<summary>Whether to expand wildcard expression to concrete indices that are open, closed or both.</summary>
-		public ExpandWildcards? ExpandWildcards
-		{
-			get => Q<ExpandWildcards? >("expand_wildcards");
-			set => Q("expand_wildcards", value);
-		}
-
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public string Format
-		{
-			get => Q<string>("format");
-			set
-			{
-				Q("format", value);
-				SetAcceptHeader(value);
-			}
-		}
-
-		///<summary>Comma-separated list of column names to display</summary>
-		public string[] Headers
-		{
-			get => Q<string[]>("h");
-			set => Q("h", value);
-		}
-
-		///<summary>A health status ("green", "yellow", or "red" to filter only indices matching the specified health status</summary>
-		public Health? Health
-		{
-			get => Q<Health? >("health");
-			set => Q("health", value);
-		}
-
-		///<summary>Return help information</summary>
-		public bool? Help
-		{
-			get => Q<bool? >("help");
-			set => Q("help", value);
-		}
-
-		///<summary>If set to true segment stats will include stats for segments that are not currently loaded into memory</summary>
-		public bool? IncludeUnloadedSegments
-		{
-			get => Q<bool? >("include_unloaded_segments");
-			set => Q("include_unloaded_segments", value);
-		}
-
-		///<summary>Return local information, do not retrieve the state from cluster_manager node (default: false)</summary>
-		public bool? Local
-		{
-			get => Q<bool? >("local");
-			set => Q("local", value);
-		}
-
-		///<summary>Explicit operation timeout for connection to master node</summary>
-		///<remarks>Deprecated as of OpenSearch 2.0, use <see cref="ClusterManagerTimeout"/> instead</remarks>
-		public Time MasterTimeout
-		{
-			get => Q<Time>("master_timeout");
-			set => Q("master_timeout", value);
-		}
-
-		///<summary>Explicit operation timeout for connection to cluster_manager node</summary>
-		///<remarks>Introduced in OpenSearch 2.0 instead of <see cref="MasterTimeout"/></remarks>
-		public Time ClusterManagerTimeout
-		{
-			get => Q<Time>("cluster_manager_timeout");
-			set => Q("cluster_manager_timeout", value);
-		}
-
-		///<summary>Set to true to return stats only for primary shards</summary>
-		public bool? Pri
-		{
-			get => Q<bool? >("pri");
-			set => Q("pri", value);
-		}
-
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public string[] SortByColumns
-		{
-			get => Q<string[]>("s");
-			set => Q("s", value);
-		}
-
-		///<summary>Verbose mode. Display column headers</summary>
-		public bool? Verbose
-		{
-			get => Q<bool? >("v");
-			set => Q("v", value);
-		}
-	}
-
-	[InterfaceDataContract]
-	public partial interface ICatMasterRequest : IRequest<CatMasterRequestParameters>
-	{
-	}
-
-	///<summary>Request for Master <para>https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/</para></summary>
-	///<remarks>Deprecated as of OpenSearch 2.0, use <see cref="CatClusterManagerRequest"/> instead</remarks>
-	public partial class CatMasterRequest : PlainRequestBase<CatMasterRequestParameters>, ICatMasterRequest
-	{
-		protected ICatMasterRequest Self => this;
-		internal override ApiUrls ApiUrls => ApiUrlsLookups.CatMaster;
-		// values part of the url path
-		// Request parameters
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public string Format
-		{
-			get => Q<string>("format");
-			set
-			{
-				Q("format", value);
-				SetAcceptHeader(value);
-			}
-		}
-
-		///<summary>Comma-separated list of column names to display</summary>
-		public string[] Headers
-		{
-			get => Q<string[]>("h");
-			set => Q("h", value);
-		}
-
-		///<summary>Return help information</summary>
-		public bool? Help
-		{
-			get => Q<bool? >("help");
-			set => Q("help", value);
-		}
-
-		///<summary>Return local information, do not retrieve the state from cluster_manager node (default: false)</summary>
-		public bool? Local
-		{
-			get => Q<bool? >("local");
-			set => Q("local", value);
-		}
-
-		///<summary>Explicit operation timeout for connection to master node</summary>
-		public Time MasterTimeout
-		{
-			get => Q<Time>("master_timeout");
-			set => Q("master_timeout", value);
-		}
-
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public string[] SortByColumns
-		{
-			get => Q<string[]>("s");
-			set => Q("s", value);
-		}
-
-		///<summary>Verbose mode. Display column headers</summary>
-		public bool? Verbose
-		{
-			get => Q<bool? >("v");
-			set => Q("v", value);
-		}
-	}
-
-	[InterfaceDataContract]
-	public partial interface ICatClusterManagerRequest : IRequest<CatClusterManagerRequestParameters>
-	{
-	}
-
-	///<summary>Request for ClusterManager <para>https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/</para></summary>
-	///<remarks>Introduced in OpenSearch 2.0 instead of <see cref="CatMasterRequest"/></remarks>
-	public partial class CatClusterManagerRequest : PlainRequestBase<CatClusterManagerRequestParameters>, ICatClusterManagerRequest
-	{
-		protected ICatClusterManagerRequest Self => this;
-		internal override ApiUrls ApiUrls => ApiUrlsLookups.CatClusterManager;
-		// values part of the url path
-		// Request parameters
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public string Format
-		{
-			get => Q<string>("format");
-			set
-			{
-				Q("format", value);
-				SetAcceptHeader(value);
-			}
-		}
-
-		///<summary>Comma-separated list of column names to display</summary>
-		public string[] Headers
-		{
-			get => Q<string[]>("h");
-			set => Q("h", value);
-		}
-
-		///<summary>Return help information</summary>
-		public bool? Help
-		{
-			get => Q<bool? >("help");
-			set => Q("help", value);
-		}
-
-		///<summary>Return local information, do not retrieve the state from cluster_manager node (default: false)</summary>
-		public bool? Local
-		{
-			get => Q<bool? >("local");
-			set => Q("local", value);
-		}
-
-		///<summary>Explicit operation timeout for connection to cluster_manager node</summary>
-		public Time ClusterManagerTimeout
-		{
-			get => Q<Time>("cluster_manager_timeout");
-			set => Q("cluster_manager_timeout", value);
-		}
-
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public string[] SortByColumns
-		{
-			get => Q<string[]>("s");
-			set => Q("s", value);
-		}
-
-		///<summary>Verbose mode. Display column headers</summary>
-		public bool? Verbose
-		{
-			get => Q<bool? >("v");
-			set => Q("v", value);
-		}
-	}
-
-	[InterfaceDataContract]
-	public partial interface ICatNodeAttributesRequest : IRequest<CatNodeAttributesRequestParameters>
-	{
-	}
-
-	///<summary>Request for NodeAttributes <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodeattrs/</para></summary>
-	public partial class CatNodeAttributesRequest : PlainRequestBase<CatNodeAttributesRequestParameters>, ICatNodeAttributesRequest
-	{
-		protected ICatNodeAttributesRequest Self => this;
-		internal override ApiUrls ApiUrls => ApiUrlsLookups.CatNodeAttributes;
-		// values part of the url path
-		// Request parameters
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public string Format
-		{
-			get => Q<string>("format");
-			set
-			{
-				Q("format", value);
-				SetAcceptHeader(value);
-			}
-		}
-
-		///<summary>Comma-separated list of column names to display</summary>
-		public string[] Headers
-		{
-			get => Q<string[]>("h");
-			set => Q("h", value);
-		}
-
-		///<summary>Return help information</summary>
-		public bool? Help
-		{
-			get => Q<bool? >("help");
-			set => Q("help", value);
-		}
-
-		///<summary>Return local information, do not retrieve the state from cluster_manager node (default: false)</summary>
-		public bool? Local
-		{
-			get => Q<bool? >("local");
-			set => Q("local", value);
-		}
-
-		///<summary>Explicit operation timeout for connection to master node</summary>
-		///<remarks>Deprecated as of OpenSearch 2.0, use <see cref="ClusterManagerTimeout"/> instead</remarks>
-		public Time MasterTimeout
-		{
-			get => Q<Time>("master_timeout");
-			set => Q("master_timeout", value);
-		}
-
-		///<summary>Explicit operation timeout for connection to cluster_manager node</summary>
-		///<remarks>Introduced in OpenSearch 2.0 instead of <see cref="MasterTimeout"/></remarks>
-		public Time ClusterManagerTimeout
-		{
-			get => Q<Time>("cluster_manager_timeout");
-			set => Q("cluster_manager_timeout", value);
-		}
-
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public string[] SortByColumns
-		{
-			get => Q<string[]>("s");
-			set => Q("s", value);
-		}
-
-		///<summary>Verbose mode. Display column headers</summary>
-		public bool? Verbose
-		{
-			get => Q<bool? >("v");
-			set => Q("v", value);
-		}
-	}
-
-	[InterfaceDataContract]
-	public partial interface ICatNodesRequest : IRequest<CatNodesRequestParameters>
-	{
-	}
-
-	///<summary>Request for Nodes <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodes/</para></summary>
-	public partial class CatNodesRequest : PlainRequestBase<CatNodesRequestParameters>, ICatNodesRequest
-	{
-		protected ICatNodesRequest Self => this;
-		internal override ApiUrls ApiUrls => ApiUrlsLookups.CatNodes;
-		// values part of the url path
-		// Request parameters
-		///<summary>The unit in which to display byte values</summary>
-		public Bytes? Bytes
-		{
-			get => Q<Bytes? >("bytes");
-			set => Q("bytes", value);
-		}
-
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public string Format
-		{
-			get => Q<string>("format");
-			set
-			{
-				Q("format", value);
-				SetAcceptHeader(value);
-			}
-		}
-
-		///<summary>Return the full node ID instead of the shortened version (default: false)</summary>
-		public bool? FullId
-		{
-			get => Q<bool? >("full_id");
-			set => Q("full_id", value);
-		}
-
-		///<summary>Comma-separated list of column names to display</summary>
-		public string[] Headers
-		{
-			get => Q<string[]>("h");
-			set => Q("h", value);
-		}
-
-		///<summary>Return help information</summary>
-		public bool? Help
-		{
-			get => Q<bool? >("help");
-			set => Q("help", value);
-		}
-
-		///<summary>Explicit operation timeout for connection to master node</summary>
-		///<remarks>Deprecated as of OpenSearch 2.0, use <see cref="ClusterManagerTimeout"/> instead</remarks>
-		public Time MasterTimeout
-		{
-			get => Q<Time>("master_timeout");
-			set => Q("master_timeout", value);
-		}
-
-		///<summary>Explicit operation timeout for connection to cluster_manager node</summary>
-		///<remarks>Introduced in OpenSearch 2.0 instead of <see cref="MasterTimeout"/></remarks>
-		public Time ClusterManagerTimeout
-		{
-			get => Q<Time>("cluster_manager_timeout");
-			set => Q("cluster_manager_timeout", value);
-		}
-
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public string[] SortByColumns
-		{
-			get => Q<string[]>("s");
-			set => Q("s", value);
-		}
-
-		///<summary>Verbose mode. Display column headers</summary>
-		public bool? Verbose
-		{
-			get => Q<bool? >("v");
-			set => Q("v", value);
-		}
-	}
-
-	[InterfaceDataContract]
-	public partial interface ICatPendingTasksRequest : IRequest<CatPendingTasksRequestParameters>
-	{
-	}
-
-	///<summary>Request for PendingTasks <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-pending-tasks/</para></summary>
-	public partial class CatPendingTasksRequest : PlainRequestBase<CatPendingTasksRequestParameters>, ICatPendingTasksRequest
-	{
-		protected ICatPendingTasksRequest Self => this;
-		internal override ApiUrls ApiUrls => ApiUrlsLookups.CatPendingTasks;
-		// values part of the url path
-		// Request parameters
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public string Format
-		{
-			get => Q<string>("format");
-			set
-			{
-				Q("format", value);
-				SetAcceptHeader(value);
-			}
-		}
-
-		///<summary>Comma-separated list of column names to display</summary>
-		public string[] Headers
-		{
-			get => Q<string[]>("h");
-			set => Q("h", value);
-		}
-
-		///<summary>Return help information</summary>
-		public bool? Help
-		{
-			get => Q<bool? >("help");
-			set => Q("help", value);
-		}
-
-		///<summary>Return local information, do not retrieve the state from cluster_manager node (default: false)</summary>
-		public bool? Local
-		{
-			get => Q<bool? >("local");
-			set => Q("local", value);
-		}
-
-		///<summary>Explicit operation timeout for connection to master node</summary>
-		///<remarks>Deprecated as of OpenSearch 2.0, use <see cref="ClusterManagerTimeout"/> instead</remarks>
-		public Time MasterTimeout
-		{
-			get => Q<Time>("master_timeout");
-			set => Q("master_timeout", value);
-		}
-
-		///<summary>Explicit operation timeout for connection to cluster_manager node</summary>
-		///<remarks>Introduced in OpenSearch 2.0 instead of <see cref="MasterTimeout"/></remarks>
-		public Time ClusterManagerTimeout
-		{
-			get => Q<Time>("cluster_manager_timeout");
-			set => Q("cluster_manager_timeout", value);
-		}
-
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public string[] SortByColumns
-		{
-			get => Q<string[]>("s");
-			set => Q("s", value);
-		}
-
-		///<summary>Verbose mode. Display column headers</summary>
-		public bool? Verbose
-		{
-			get => Q<bool? >("v");
-			set => Q("v", value);
-		}
-	}
-
 	[InterfaceDataContract]
 	public partial interface ICatPluginsRequest : IRequest<CatPluginsRequestParameters>
 	{
diff --git a/src/OpenSearch.Client/_Generated/ApiUrlsLookup.cs b/src/OpenSearch.Client/_Generated/ApiUrlsLookup.cs
index 3455575bce..56452e5d6b 100644
--- a/src/OpenSearch.Client/_Generated/ApiUrlsLookup.cs
+++ b/src/OpenSearch.Client/_Generated/ApiUrlsLookup.cs
@@ -45,6 +45,35 @@ namespace OpenSearch.Client
 {
     internal static partial class ApiUrlsLookups
     {
+        internal static readonly ApiUrls CatAliases =
+            new(new[] { "_cat/aliases", "_cat/aliases/{name}" });
+
+        internal static readonly ApiUrls CatAllocation =
+            new(new[] { "_cat/allocation", "_cat/allocation/{node_id}" });
+
+        internal static readonly ApiUrls CatClusterManager = new(new[] { "_cat/cluster_manager" });
+
+        internal static readonly ApiUrls CatCount =
+            new(new[] { "_cat/count", "_cat/count/{index}" });
+
+        internal static readonly ApiUrls CatFielddata =
+            new(new[] { "_cat/fielddata", "_cat/fielddata/{fields}" });
+
+        internal static readonly ApiUrls CatHealth = new(new[] { "_cat/health" });
+
+        internal static readonly ApiUrls CatHelp = new(new[] { "_cat" });
+
+        internal static readonly ApiUrls CatIndices =
+            new(new[] { "_cat/indices", "_cat/indices/{index}" });
+
+        internal static readonly ApiUrls CatMaster = new(new[] { "_cat/master" });
+
+        internal static readonly ApiUrls CatNodeAttributes = new(new[] { "_cat/nodeattrs" });
+
+        internal static readonly ApiUrls CatNodes = new(new[] { "_cat/nodes" });
+
+        internal static readonly ApiUrls CatPendingTasks = new(new[] { "_cat/pending_tasks" });
+
         internal static readonly ApiUrls ClusterAllocationExplain =
             new(new[] { "_cluster/allocation/explain" });
 
diff --git a/src/OpenSearch.Client/_Generated/Descriptors.Cat.cs b/src/OpenSearch.Client/_Generated/Descriptors.Cat.cs
new file mode 100644
index 0000000000..170d29dc0d
--- /dev/null
+++ b/src/OpenSearch.Client/_Generated/Descriptors.Cat.cs
@@ -0,0 +1,633 @@
+/* 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.
+*
+*  Licensed to Elasticsearch B.V. under one or more contributor
+*  license agreements. See the NOTICE file distributed with
+*  this work for additional information regarding copyright
+*  ownership. Elasticsearch B.V. licenses this file to you under
+*  the Apache License, Version 2.0 (the "License"); you may
+*  not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing,
+*  software distributed under the License is distributed on an
+*  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+*  KIND, either express or implied.  See the License for the
+*  specific language governing permissions and limitations
+*  under the License.
+*/
+// ███╗   ██╗ ██████╗ ████████╗██╗ ██████╗███████╗
+// ████╗  ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝
+// ██╔██╗ ██║██║   ██║   ██║   ██║██║     █████╗
+// ██║╚██╗██║██║   ██║   ██║   ██║██║     ██╔══╝
+// ██║ ╚████║╚██████╔╝   ██║   ██║╚██████╗███████╗
+// ╚═╝  ╚═══╝ ╚═════╝    ╚═╝   ╚═╝ ╚═════╝╚══════╝
+// -----------------------------------------------
+//
+// This file is automatically generated
+// Please do not edit these files manually
+// Run the following in the root of the repos:
+//
+//      *NIX        :   ./build.sh codegen
+//      Windows     :   build.bat codegen
+//
+// -----------------------------------------------
+// ReSharper disable RedundantUsingDirective
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using OpenSearch.Net;
+using OpenSearch.Net.Specification.CatApi;
+using OpenSearch.Net.Utf8Json;
+
+// ReSharper disable RedundantBaseConstructorCall
+// ReSharper disable UnusedTypeParameter
+// ReSharper disable PartialMethodWithSinglePart
+// ReSharper disable RedundantNameQualifier
+namespace OpenSearch.Client
+{
+    /// <summary>Descriptor for Aliases <para>https://opensearch.org/docs/latest/api-reference/cat/cat-aliases/</para></summary>
+    public partial class CatAliasesDescriptor
+        : RequestDescriptorBase<
+            CatAliasesDescriptor,
+            CatAliasesRequestParameters,
+            ICatAliasesRequest
+        >,
+            ICatAliasesRequest
+    {
+        internal override ApiUrls ApiUrls => ApiUrlsLookups.CatAliases;
+
+        /// <summary>/_cat/aliases</summary>
+        public CatAliasesDescriptor()
+            : base() { }
+
+        /// <summary>/_cat/aliases/{name}</summary>
+        /// <param name="name">Optional, accepts null</param>
+        public CatAliasesDescriptor(Names name)
+            : base(r => r.Optional("name", name)) { }
+
+        // values part of the url path
+        Names ICatAliasesRequest.Name => Self.RouteValues.Get<Names>("name");
+
+        /// <summary>Comma-separated list of alias names.</summary>
+        public CatAliasesDescriptor Name(Names name) =>
+            Assign(name, (a, v) => a.RouteValues.Optional("name", v));
+
+        // Request parameters
+        /// <summary>Whether to expand wildcard expression to concrete indices that are open, closed or both.</summary>
+        public CatAliasesDescriptor ExpandWildcards(ExpandWildcards? expandwildcards) =>
+            Qs("expand_wildcards", expandwildcards);
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public CatAliasesDescriptor Format(string format) => Qs("format", format);
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public CatAliasesDescriptor Headers(params string[] headers) => Qs("h", headers);
+
+        /// <summary>Return help information.</summary>
+        public CatAliasesDescriptor Help(bool? help = true) => Qs("help", help);
+
+        /// <summary>Return local information, do not retrieve the state from cluster-manager node.</summary>
+        public CatAliasesDescriptor Local(bool? local = true) => Qs("local", local);
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public CatAliasesDescriptor SortByColumns(params string[] sortbycolumns) =>
+            Qs("s", sortbycolumns);
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public CatAliasesDescriptor Verbose(bool? verbose = true) => Qs("v", verbose);
+    }
+
+    /// <summary>Descriptor for Allocation <para>https://opensearch.org/docs/latest/api-reference/cat/cat-allocation/</para></summary>
+    public partial class CatAllocationDescriptor
+        : RequestDescriptorBase<
+            CatAllocationDescriptor,
+            CatAllocationRequestParameters,
+            ICatAllocationRequest
+        >,
+            ICatAllocationRequest
+    {
+        internal override ApiUrls ApiUrls => ApiUrlsLookups.CatAllocation;
+
+        /// <summary>/_cat/allocation</summary>
+        public CatAllocationDescriptor()
+            : base() { }
+
+        /// <summary>/_cat/allocation/{node_id}</summary>
+        /// <param name="nodeId">Optional, accepts null</param>
+        public CatAllocationDescriptor(NodeIds nodeId)
+            : base(r => r.Optional("node_id", nodeId)) { }
+
+        // values part of the url path
+        NodeIds ICatAllocationRequest.NodeId => Self.RouteValues.Get<NodeIds>("node_id");
+
+        /// <summary>Comma-separated list of node IDs or names to limit the returned information.</summary>
+        public CatAllocationDescriptor NodeId(NodeIds nodeId) =>
+            Assign(nodeId, (a, v) => a.RouteValues.Optional("node_id", v));
+
+        // Request parameters
+        /// <summary>The unit in which to display byte values.</summary>
+        public CatAllocationDescriptor Bytes(Bytes? bytes) => Qs("bytes", bytes);
+
+        /// <summary>Operation timeout for connection to cluster-manager node.</summary>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public CatAllocationDescriptor ClusterManagerTimeout(Time clustermanagertimeout) =>
+            Qs("cluster_manager_timeout", clustermanagertimeout);
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public CatAllocationDescriptor Format(string format) => Qs("format", format);
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public CatAllocationDescriptor Headers(params string[] headers) => Qs("h", headers);
+
+        /// <summary>Return help information.</summary>
+        public CatAllocationDescriptor Help(bool? help = true) => Qs("help", help);
+
+        /// <summary>Return local information, do not retrieve the state from cluster-manager node.</summary>
+        public CatAllocationDescriptor Local(bool? local = true) => Qs("local", local);
+
+        /// <summary>Operation timeout for connection to master node.</summary>
+        [Obsolete(
+            "Deprecated as of: 2.0.0, reason: To promote inclusive language, use 'cluster_manager_timeout' instead."
+        )]
+        public CatAllocationDescriptor MasterTimeout(Time mastertimeout) =>
+            Qs("master_timeout", mastertimeout);
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public CatAllocationDescriptor SortByColumns(params string[] sortbycolumns) =>
+            Qs("s", sortbycolumns);
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public CatAllocationDescriptor Verbose(bool? verbose = true) => Qs("v", verbose);
+    }
+
+    /// <summary>Descriptor for ClusterManager <para>https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/</para></summary>
+    public partial class CatClusterManagerDescriptor
+        : RequestDescriptorBase<
+            CatClusterManagerDescriptor,
+            CatClusterManagerRequestParameters,
+            ICatClusterManagerRequest
+        >,
+            ICatClusterManagerRequest
+    {
+        internal override ApiUrls ApiUrls => ApiUrlsLookups.CatClusterManager;
+
+        // values part of the url path
+        // Request parameters
+        /// <summary>Operation timeout for connection to cluster-manager node.</summary>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public CatClusterManagerDescriptor ClusterManagerTimeout(Time clustermanagertimeout) =>
+            Qs("cluster_manager_timeout", clustermanagertimeout);
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public CatClusterManagerDescriptor Format(string format) => Qs("format", format);
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public CatClusterManagerDescriptor Headers(params string[] headers) => Qs("h", headers);
+
+        /// <summary>Return help information.</summary>
+        public CatClusterManagerDescriptor Help(bool? help = true) => Qs("help", help);
+
+        /// <summary>Return local information, do not retrieve the state from cluster-manager node.</summary>
+        public CatClusterManagerDescriptor Local(bool? local = true) => Qs("local", local);
+
+        /// <summary>Operation timeout for connection to master node.</summary>
+        [Obsolete(
+            "Deprecated as of: 2.0.0, reason: To promote inclusive language, use 'cluster_manager_timeout' instead."
+        )]
+        public CatClusterManagerDescriptor MasterTimeout(Time mastertimeout) =>
+            Qs("master_timeout", mastertimeout);
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public CatClusterManagerDescriptor SortByColumns(params string[] sortbycolumns) =>
+            Qs("s", sortbycolumns);
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public CatClusterManagerDescriptor Verbose(bool? verbose = true) => Qs("v", verbose);
+    }
+
+    /// <summary>Descriptor for Count <para>https://opensearch.org/docs/latest/api-reference/cat/cat-count/</para></summary>
+    public partial class CatCountDescriptor
+        : RequestDescriptorBase<CatCountDescriptor, CatCountRequestParameters, ICatCountRequest>,
+            ICatCountRequest
+    {
+        internal override ApiUrls ApiUrls => ApiUrlsLookups.CatCount;
+
+        /// <summary>/_cat/count</summary>
+        public CatCountDescriptor()
+            : base() { }
+
+        /// <summary>/_cat/count/{index}</summary>
+        /// <param name="index">Optional, accepts null</param>
+        public CatCountDescriptor(Indices index)
+            : base(r => r.Optional("index", index)) { }
+
+        // values part of the url path
+        Indices ICatCountRequest.Index => Self.RouteValues.Get<Indices>("index");
+
+        /// <summary>Comma-separated list of indices to limit the returned information.</summary>
+        public CatCountDescriptor Index(Indices index) =>
+            Assign(index, (a, v) => a.RouteValues.Optional("index", v));
+
+        /// <summary>a shortcut into calling Index(typeof(TOther))</summary>
+        public CatCountDescriptor Index<TOther>()
+            where TOther : class =>
+            Assign(typeof(TOther), (a, v) => a.RouteValues.Optional("index", (Indices)v));
+
+        /// <summary>A shortcut into calling Index(Indices.All)</summary>
+        public CatCountDescriptor AllIndices() => Index(Indices.All);
+
+        // Request parameters
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public CatCountDescriptor Format(string format) => Qs("format", format);
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public CatCountDescriptor Headers(params string[] headers) => Qs("h", headers);
+
+        /// <summary>Return help information.</summary>
+        public CatCountDescriptor Help(bool? help = true) => Qs("help", help);
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public CatCountDescriptor SortByColumns(params string[] sortbycolumns) =>
+            Qs("s", sortbycolumns);
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public CatCountDescriptor Verbose(bool? verbose = true) => Qs("v", verbose);
+    }
+
+    /// <summary>Descriptor for Fielddata <para>https://opensearch.org/docs/latest/api-reference/cat/cat-field-data/</para></summary>
+    public partial class CatFielddataDescriptor
+        : RequestDescriptorBase<
+            CatFielddataDescriptor,
+            CatFielddataRequestParameters,
+            ICatFielddataRequest
+        >,
+            ICatFielddataRequest
+    {
+        internal override ApiUrls ApiUrls => ApiUrlsLookups.CatFielddata;
+
+        /// <summary>/_cat/fielddata</summary>
+        public CatFielddataDescriptor()
+            : base() { }
+
+        /// <summary>/_cat/fielddata/{fields}</summary>
+        /// <param name="fields">Optional, accepts null</param>
+        public CatFielddataDescriptor(Fields fields)
+            : base(r => r.Optional("fields", fields)) { }
+
+        // values part of the url path
+        Fields ICatFielddataRequest.Fields => Self.RouteValues.Get<Fields>("fields");
+
+        /// <summary>Comma-separated list of fields to return the fielddata size.</summary>
+        public CatFielddataDescriptor Fields(Fields fields) =>
+            Assign(fields, (a, v) => a.RouteValues.Optional("fields", v));
+
+        /// <summary>Comma-separated list of fields to return the fielddata size.</summary>
+        public CatFielddataDescriptor Fields<T>(params Expression<Func<T, object>>[] fields) =>
+            Assign(fields, (a, v) => a.RouteValues.Optional("fields", (Fields)v));
+
+        // Request parameters
+        /// <summary>The unit in which to display byte values.</summary>
+        public CatFielddataDescriptor Bytes(Bytes? bytes) => Qs("bytes", bytes);
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public CatFielddataDescriptor Format(string format) => Qs("format", format);
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public CatFielddataDescriptor Headers(params string[] headers) => Qs("h", headers);
+
+        /// <summary>Return help information.</summary>
+        public CatFielddataDescriptor Help(bool? help = true) => Qs("help", help);
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public CatFielddataDescriptor SortByColumns(params string[] sortbycolumns) =>
+            Qs("s", sortbycolumns);
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public CatFielddataDescriptor Verbose(bool? verbose = true) => Qs("v", verbose);
+    }
+
+    /// <summary>Descriptor for Health <para>https://opensearch.org/docs/latest/api-reference/cat/cat-health/</para></summary>
+    public partial class CatHealthDescriptor
+        : RequestDescriptorBase<CatHealthDescriptor, CatHealthRequestParameters, ICatHealthRequest>,
+            ICatHealthRequest
+    {
+        internal override ApiUrls ApiUrls => ApiUrlsLookups.CatHealth;
+
+        // values part of the url path
+        // Request parameters
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public CatHealthDescriptor Format(string format) => Qs("format", format);
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public CatHealthDescriptor Headers(params string[] headers) => Qs("h", headers);
+
+        /// <summary>Return help information.</summary>
+        public CatHealthDescriptor Help(bool? help = true) => Qs("help", help);
+
+        /// <summary>Set to false to disable timestamping.</summary>
+        public CatHealthDescriptor IncludeTimestamp(bool? includetimestamp = true) =>
+            Qs("ts", includetimestamp);
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public CatHealthDescriptor SortByColumns(params string[] sortbycolumns) =>
+            Qs("s", sortbycolumns);
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public CatHealthDescriptor Verbose(bool? verbose = true) => Qs("v", verbose);
+    }
+
+    /// <summary>Descriptor for Help <para>https://opensearch.org/docs/latest/api-reference/cat/index/</para></summary>
+    public partial class CatHelpDescriptor
+        : RequestDescriptorBase<CatHelpDescriptor, CatHelpRequestParameters, ICatHelpRequest>,
+            ICatHelpRequest
+    {
+        internal override ApiUrls ApiUrls => ApiUrlsLookups.CatHelp;
+
+        // values part of the url path
+        // Request parameters
+        /// <summary>Return help information.</summary>
+        public CatHelpDescriptor Help(bool? help = true) => Qs("help", help);
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public CatHelpDescriptor SortByColumns(params string[] sortbycolumns) =>
+            Qs("s", sortbycolumns);
+    }
+
+    /// <summary>Descriptor for Indices <para>https://opensearch.org/docs/latest/api-reference/cat/cat-indices/</para></summary>
+    public partial class CatIndicesDescriptor
+        : RequestDescriptorBase<
+            CatIndicesDescriptor,
+            CatIndicesRequestParameters,
+            ICatIndicesRequest
+        >,
+            ICatIndicesRequest
+    {
+        internal override ApiUrls ApiUrls => ApiUrlsLookups.CatIndices;
+
+        /// <summary>/_cat/indices</summary>
+        public CatIndicesDescriptor()
+            : base() { }
+
+        /// <summary>/_cat/indices/{index}</summary>
+        /// <param name="index">Optional, accepts null</param>
+        public CatIndicesDescriptor(Indices index)
+            : base(r => r.Optional("index", index)) { }
+
+        // values part of the url path
+        Indices ICatIndicesRequest.Index => Self.RouteValues.Get<Indices>("index");
+
+        /// <summary>Comma-separated list of indices to limit the returned information.</summary>
+        public CatIndicesDescriptor Index(Indices index) =>
+            Assign(index, (a, v) => a.RouteValues.Optional("index", v));
+
+        /// <summary>a shortcut into calling Index(typeof(TOther))</summary>
+        public CatIndicesDescriptor Index<TOther>()
+            where TOther : class =>
+            Assign(typeof(TOther), (a, v) => a.RouteValues.Optional("index", (Indices)v));
+
+        /// <summary>A shortcut into calling Index(Indices.All)</summary>
+        public CatIndicesDescriptor AllIndices() => Index(Indices.All);
+
+        // Request parameters
+        /// <summary>The unit in which to display byte values.</summary>
+        public CatIndicesDescriptor Bytes(Bytes? bytes) => Qs("bytes", bytes);
+
+        /// <summary>Operation timeout for connection to cluster-manager node.</summary>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public CatIndicesDescriptor ClusterManagerTimeout(Time clustermanagertimeout) =>
+            Qs("cluster_manager_timeout", clustermanagertimeout);
+
+        /// <summary>Whether to expand wildcard expression to concrete indices that are open, closed or both.</summary>
+        public CatIndicesDescriptor ExpandWildcards(ExpandWildcards? expandwildcards) =>
+            Qs("expand_wildcards", expandwildcards);
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public CatIndicesDescriptor Format(string format) => Qs("format", format);
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public CatIndicesDescriptor Headers(params string[] headers) => Qs("h", headers);
+
+        /// <summary>Health status ('green', 'yellow', or 'red') to filter only indices matching the specified health status.</summary>
+        public CatIndicesDescriptor Health(Health? health) => Qs("health", health);
+
+        /// <summary>Return help information.</summary>
+        public CatIndicesDescriptor Help(bool? help = true) => Qs("help", help);
+
+        /// <summary>If set to true segment stats will include stats for segments that are not currently loaded into memory.</summary>
+        public CatIndicesDescriptor IncludeUnloadedSegments(bool? includeunloadedsegments = true) =>
+            Qs("include_unloaded_segments", includeunloadedsegments);
+
+        /// <summary>Return local information, do not retrieve the state from cluster-manager node.</summary>
+        public CatIndicesDescriptor Local(bool? local = true) => Qs("local", local);
+
+        /// <summary>Operation timeout for connection to master node.</summary>
+        [Obsolete(
+            "Deprecated as of: 2.0.0, reason: To promote inclusive language, use 'cluster_manager_timeout' instead."
+        )]
+        public CatIndicesDescriptor MasterTimeout(Time mastertimeout) =>
+            Qs("master_timeout", mastertimeout);
+
+        /// <summary>Set to true to return stats only for primary shards.</summary>
+        public CatIndicesDescriptor Pri(bool? pri = true) => Qs("pri", pri);
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public CatIndicesDescriptor SortByColumns(params string[] sortbycolumns) =>
+            Qs("s", sortbycolumns);
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public CatIndicesDescriptor Verbose(bool? verbose = true) => Qs("v", verbose);
+    }
+
+    /// <summary>Descriptor for Master <para>https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/</para></summary>
+    public partial class CatMasterDescriptor
+        : RequestDescriptorBase<CatMasterDescriptor, CatMasterRequestParameters, ICatMasterRequest>,
+            ICatMasterRequest
+    {
+        internal override ApiUrls ApiUrls => ApiUrlsLookups.CatMaster;
+
+        // values part of the url path
+        // Request parameters
+        /// <summary>Operation timeout for connection to cluster-manager node.</summary>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public CatMasterDescriptor ClusterManagerTimeout(Time clustermanagertimeout) =>
+            Qs("cluster_manager_timeout", clustermanagertimeout);
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public CatMasterDescriptor Format(string format) => Qs("format", format);
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public CatMasterDescriptor Headers(params string[] headers) => Qs("h", headers);
+
+        /// <summary>Return help information.</summary>
+        public CatMasterDescriptor Help(bool? help = true) => Qs("help", help);
+
+        /// <summary>Return local information, do not retrieve the state from cluster-manager node.</summary>
+        public CatMasterDescriptor Local(bool? local = true) => Qs("local", local);
+
+        /// <summary>Operation timeout for connection to master node.</summary>
+        [Obsolete(
+            "Deprecated as of: 2.0.0, reason: To promote inclusive language, use 'cluster_manager_timeout' instead."
+        )]
+        public CatMasterDescriptor MasterTimeout(Time mastertimeout) =>
+            Qs("master_timeout", mastertimeout);
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public CatMasterDescriptor SortByColumns(params string[] sortbycolumns) =>
+            Qs("s", sortbycolumns);
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public CatMasterDescriptor Verbose(bool? verbose = true) => Qs("v", verbose);
+    }
+
+    /// <summary>Descriptor for NodeAttributes <para>https://opensearch.org/docs/latest/api-reference/cat/cat-nodeattrs/</para></summary>
+    public partial class CatNodeAttributesDescriptor
+        : RequestDescriptorBase<
+            CatNodeAttributesDescriptor,
+            CatNodeAttributesRequestParameters,
+            ICatNodeAttributesRequest
+        >,
+            ICatNodeAttributesRequest
+    {
+        internal override ApiUrls ApiUrls => ApiUrlsLookups.CatNodeAttributes;
+
+        // values part of the url path
+        // Request parameters
+        /// <summary>Operation timeout for connection to cluster-manager node.</summary>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public CatNodeAttributesDescriptor ClusterManagerTimeout(Time clustermanagertimeout) =>
+            Qs("cluster_manager_timeout", clustermanagertimeout);
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public CatNodeAttributesDescriptor Format(string format) => Qs("format", format);
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public CatNodeAttributesDescriptor Headers(params string[] headers) => Qs("h", headers);
+
+        /// <summary>Return help information.</summary>
+        public CatNodeAttributesDescriptor Help(bool? help = true) => Qs("help", help);
+
+        /// <summary>Return local information, do not retrieve the state from cluster-manager node.</summary>
+        public CatNodeAttributesDescriptor Local(bool? local = true) => Qs("local", local);
+
+        /// <summary>Operation timeout for connection to master node.</summary>
+        [Obsolete(
+            "Deprecated as of: 2.0.0, reason: To promote inclusive language, use 'cluster_manager_timeout' instead."
+        )]
+        public CatNodeAttributesDescriptor MasterTimeout(Time mastertimeout) =>
+            Qs("master_timeout", mastertimeout);
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public CatNodeAttributesDescriptor SortByColumns(params string[] sortbycolumns) =>
+            Qs("s", sortbycolumns);
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public CatNodeAttributesDescriptor Verbose(bool? verbose = true) => Qs("v", verbose);
+    }
+
+    /// <summary>Descriptor for Nodes <para>https://opensearch.org/docs/latest/api-reference/cat/cat-nodes/</para></summary>
+    public partial class CatNodesDescriptor
+        : RequestDescriptorBase<CatNodesDescriptor, CatNodesRequestParameters, ICatNodesRequest>,
+            ICatNodesRequest
+    {
+        internal override ApiUrls ApiUrls => ApiUrlsLookups.CatNodes;
+
+        // values part of the url path
+        // Request parameters
+        /// <summary>The unit in which to display byte values.</summary>
+        public CatNodesDescriptor Bytes(Bytes? bytes) => Qs("bytes", bytes);
+
+        /// <summary>Operation timeout for connection to cluster-manager node.</summary>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public CatNodesDescriptor ClusterManagerTimeout(Time clustermanagertimeout) =>
+            Qs("cluster_manager_timeout", clustermanagertimeout);
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public CatNodesDescriptor Format(string format) => Qs("format", format);
+
+        /// <summary>Return the full node ID instead of the shortened version.</summary>
+        public CatNodesDescriptor FullId(bool? fullid = true) => Qs("full_id", fullid);
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public CatNodesDescriptor Headers(params string[] headers) => Qs("h", headers);
+
+        /// <summary>Return help information.</summary>
+        public CatNodesDescriptor Help(bool? help = true) => Qs("help", help);
+
+        /// <summary>Return local information, do not retrieve the state from cluster-manager node.</summary>
+        [Obsolete(
+            "Deprecated as of: 1.0, reason: This parameter does not cause this API to act locally."
+        )]
+        public CatNodesDescriptor Local(bool? local = true) => Qs("local", local);
+
+        /// <summary>Operation timeout for connection to master node.</summary>
+        [Obsolete(
+            "Deprecated as of: 2.0.0, reason: To promote inclusive language, use 'cluster_manager_timeout' instead."
+        )]
+        public CatNodesDescriptor MasterTimeout(Time mastertimeout) =>
+            Qs("master_timeout", mastertimeout);
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public CatNodesDescriptor SortByColumns(params string[] sortbycolumns) =>
+            Qs("s", sortbycolumns);
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public CatNodesDescriptor Verbose(bool? verbose = true) => Qs("v", verbose);
+    }
+
+    /// <summary>Descriptor for PendingTasks <para>https://opensearch.org/docs/latest/api-reference/cat/cat-pending-tasks/</para></summary>
+    public partial class CatPendingTasksDescriptor
+        : RequestDescriptorBase<
+            CatPendingTasksDescriptor,
+            CatPendingTasksRequestParameters,
+            ICatPendingTasksRequest
+        >,
+            ICatPendingTasksRequest
+    {
+        internal override ApiUrls ApiUrls => ApiUrlsLookups.CatPendingTasks;
+
+        // values part of the url path
+        // Request parameters
+        /// <summary>Operation timeout for connection to cluster-manager node.</summary>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public CatPendingTasksDescriptor ClusterManagerTimeout(Time clustermanagertimeout) =>
+            Qs("cluster_manager_timeout", clustermanagertimeout);
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public CatPendingTasksDescriptor Format(string format) => Qs("format", format);
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public CatPendingTasksDescriptor Headers(params string[] headers) => Qs("h", headers);
+
+        /// <summary>Return help information.</summary>
+        public CatPendingTasksDescriptor Help(bool? help = true) => Qs("help", help);
+
+        /// <summary>Return local information, do not retrieve the state from cluster-manager node.</summary>
+        public CatPendingTasksDescriptor Local(bool? local = true) => Qs("local", local);
+
+        /// <summary>Operation timeout for connection to master node.</summary>
+        [Obsolete(
+            "Deprecated as of: 2.0.0, reason: To promote inclusive language, use 'cluster_manager_timeout' instead."
+        )]
+        public CatPendingTasksDescriptor MasterTimeout(Time mastertimeout) =>
+            Qs("master_timeout", mastertimeout);
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public CatPendingTasksDescriptor SortByColumns(params string[] sortbycolumns) =>
+            Qs("s", sortbycolumns);
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public CatPendingTasksDescriptor Verbose(bool? verbose = true) => Qs("v", verbose);
+    }
+}
diff --git a/src/OpenSearch.Client/_Generated/IOpenSearchClient.cs b/src/OpenSearch.Client/_Generated/IOpenSearchClient.cs
index 22732f559a..1db4dc4f29 100644
--- a/src/OpenSearch.Client/_Generated/IOpenSearchClient.cs
+++ b/src/OpenSearch.Client/_Generated/IOpenSearchClient.cs
@@ -48,6 +48,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using OpenSearch.Client.Specification.ClusterApi;
 using OpenSearch.Client.Specification.DanglingIndicesApi;
 using OpenSearch.Client.Specification.HttpApi;
@@ -64,6 +65,9 @@ namespace OpenSearch.Client
     /// </summary>
     public partial interface IOpenSearchClient
     {
+        /// <summary>Cat APIs</summary>
+        CatNamespace Cat { get; }
+
         /// <summary>Cluster APIs</summary>
         ClusterNamespace Cluster { get; }
 
diff --git a/src/OpenSearch.Client/_Generated/OpenSearchClient.Cat.cs b/src/OpenSearch.Client/_Generated/OpenSearchClient.Cat.cs
new file mode 100644
index 0000000000..e917ab3cba
--- /dev/null
+++ b/src/OpenSearch.Client/_Generated/OpenSearchClient.Cat.cs
@@ -0,0 +1,574 @@
+/* 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.
+*
+*  Licensed to Elasticsearch B.V. under one or more contributor
+*  license agreements. See the NOTICE file distributed with
+*  this work for additional information regarding copyright
+*  ownership. Elasticsearch B.V. licenses this file to you under
+*  the Apache License, Version 2.0 (the "License"); you may
+*  not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing,
+*  software distributed under the License is distributed on an
+*  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+*  KIND, either express or implied.  See the License for the
+*  specific language governing permissions and limitations
+*  under the License.
+*/
+// ███╗   ██╗ ██████╗ ████████╗██╗ ██████╗███████╗
+// ████╗  ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝
+// ██╔██╗ ██║██║   ██║   ██║   ██║██║     █████╗
+// ██║╚██╗██║██║   ██║   ██║   ██║██║     ██╔══╝
+// ██║ ╚████║╚██████╔╝   ██║   ██║╚██████╗███████╗
+// ╚═╝  ╚═══╝ ╚═════╝    ╚═╝   ╚═╝ ╚═════╝╚══════╝
+// -----------------------------------------------
+//
+// This file is automatically generated
+// Please do not edit these files manually
+// Run the following in the root of the repos:
+//
+//      *NIX        :   ./build.sh codegen
+//      Windows     :   build.bat codegen
+//
+// -----------------------------------------------
+// ReSharper disable RedundantUsingDirective
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using OpenSearch.Net.Specification.CatApi;
+
+// ReSharper disable once CheckNamespace
+// ReSharper disable RedundantTypeArgumentsOfMethod
+namespace OpenSearch.Client.Specification.CatApi
+{
+    /// <summary>
+    /// Cat APIs.
+    /// <para>Not intended to be instantiated directly. Use the <see cref="IOpenSearchClient.Cat"/> property
+    /// on <see cref="IOpenSearchClient"/>.
+    /// </para>
+    /// </summary>
+    public partial class CatNamespace : NamespacedClientProxy
+    {
+        internal CatNamespace(OpenSearchClient client)
+            : base(client) { }
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.aliases</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-aliases/">https://opensearch.org/docs/latest/api-reference/cat/cat-aliases/</a>
+        /// </summary>
+        public CatResponse<CatAliasesRecord> Aliases(
+            Func<CatAliasesDescriptor, ICatAliasesRequest> selector = null
+        ) => Aliases(selector.InvokeOrDefault(new CatAliasesDescriptor()));
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.aliases</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-aliases/">https://opensearch.org/docs/latest/api-reference/cat/cat-aliases/</a>
+        /// </summary>
+        public Task<CatResponse<CatAliasesRecord>> AliasesAsync(
+            Func<CatAliasesDescriptor, ICatAliasesRequest> selector = null,
+            CancellationToken ct = default
+        ) => AliasesAsync(selector.InvokeOrDefault(new CatAliasesDescriptor()), ct);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.aliases</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-aliases/">https://opensearch.org/docs/latest/api-reference/cat/cat-aliases/</a>
+        /// </summary>
+        public CatResponse<CatAliasesRecord> Aliases(ICatAliasesRequest request) =>
+            DoCat<ICatAliasesRequest, CatAliasesRequestParameters, CatAliasesRecord>(request);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.aliases</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-aliases/">https://opensearch.org/docs/latest/api-reference/cat/cat-aliases/</a>
+        /// </summary>
+        public Task<CatResponse<CatAliasesRecord>> AliasesAsync(
+            ICatAliasesRequest request,
+            CancellationToken ct = default
+        ) =>
+            DoCatAsync<ICatAliasesRequest, CatAliasesRequestParameters, CatAliasesRecord>(
+                request,
+                ct
+            );
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.allocation</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-allocation/">https://opensearch.org/docs/latest/api-reference/cat/cat-allocation/</a>
+        /// </summary>
+        public CatResponse<CatAllocationRecord> Allocation(
+            Func<CatAllocationDescriptor, ICatAllocationRequest> selector = null
+        ) => Allocation(selector.InvokeOrDefault(new CatAllocationDescriptor()));
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.allocation</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-allocation/">https://opensearch.org/docs/latest/api-reference/cat/cat-allocation/</a>
+        /// </summary>
+        public Task<CatResponse<CatAllocationRecord>> AllocationAsync(
+            Func<CatAllocationDescriptor, ICatAllocationRequest> selector = null,
+            CancellationToken ct = default
+        ) => AllocationAsync(selector.InvokeOrDefault(new CatAllocationDescriptor()), ct);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.allocation</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-allocation/">https://opensearch.org/docs/latest/api-reference/cat/cat-allocation/</a>
+        /// </summary>
+        public CatResponse<CatAllocationRecord> Allocation(ICatAllocationRequest request) =>
+            DoCat<ICatAllocationRequest, CatAllocationRequestParameters, CatAllocationRecord>(
+                request
+            );
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.allocation</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-allocation/">https://opensearch.org/docs/latest/api-reference/cat/cat-allocation/</a>
+        /// </summary>
+        public Task<CatResponse<CatAllocationRecord>> AllocationAsync(
+            ICatAllocationRequest request,
+            CancellationToken ct = default
+        ) =>
+            DoCatAsync<ICatAllocationRequest, CatAllocationRequestParameters, CatAllocationRecord>(
+                request,
+                ct
+            );
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.cluster_manager</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/">https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/</a>
+        /// </summary>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public CatResponse<CatClusterManagerRecord> ClusterManager(
+            Func<CatClusterManagerDescriptor, ICatClusterManagerRequest> selector = null
+        ) => ClusterManager(selector.InvokeOrDefault(new CatClusterManagerDescriptor()));
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.cluster_manager</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/">https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/</a>
+        /// </summary>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public Task<CatResponse<CatClusterManagerRecord>> ClusterManagerAsync(
+            Func<CatClusterManagerDescriptor, ICatClusterManagerRequest> selector = null,
+            CancellationToken ct = default
+        ) => ClusterManagerAsync(selector.InvokeOrDefault(new CatClusterManagerDescriptor()), ct);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.cluster_manager</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/">https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/</a>
+        /// </summary>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public CatResponse<CatClusterManagerRecord> ClusterManager(
+            ICatClusterManagerRequest request
+        ) =>
+            DoCat<
+                ICatClusterManagerRequest,
+                CatClusterManagerRequestParameters,
+                CatClusterManagerRecord
+            >(request);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.cluster_manager</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/">https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/</a>
+        /// </summary>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public Task<CatResponse<CatClusterManagerRecord>> ClusterManagerAsync(
+            ICatClusterManagerRequest request,
+            CancellationToken ct = default
+        ) =>
+            DoCatAsync<
+                ICatClusterManagerRequest,
+                CatClusterManagerRequestParameters,
+                CatClusterManagerRecord
+            >(request, ct);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.count</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-count/">https://opensearch.org/docs/latest/api-reference/cat/cat-count/</a>
+        /// </summary>
+        public CatResponse<CatCountRecord> Count(
+            Func<CatCountDescriptor, ICatCountRequest> selector = null
+        ) => Count(selector.InvokeOrDefault(new CatCountDescriptor()));
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.count</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-count/">https://opensearch.org/docs/latest/api-reference/cat/cat-count/</a>
+        /// </summary>
+        public Task<CatResponse<CatCountRecord>> CountAsync(
+            Func<CatCountDescriptor, ICatCountRequest> selector = null,
+            CancellationToken ct = default
+        ) => CountAsync(selector.InvokeOrDefault(new CatCountDescriptor()), ct);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.count</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-count/">https://opensearch.org/docs/latest/api-reference/cat/cat-count/</a>
+        /// </summary>
+        public CatResponse<CatCountRecord> Count(ICatCountRequest request) =>
+            DoCat<ICatCountRequest, CatCountRequestParameters, CatCountRecord>(request);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.count</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-count/">https://opensearch.org/docs/latest/api-reference/cat/cat-count/</a>
+        /// </summary>
+        public Task<CatResponse<CatCountRecord>> CountAsync(
+            ICatCountRequest request,
+            CancellationToken ct = default
+        ) => DoCatAsync<ICatCountRequest, CatCountRequestParameters, CatCountRecord>(request, ct);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.fielddata</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-field-data/">https://opensearch.org/docs/latest/api-reference/cat/cat-field-data/</a>
+        /// </summary>
+        public CatResponse<CatFielddataRecord> Fielddata(
+            Func<CatFielddataDescriptor, ICatFielddataRequest> selector = null
+        ) => Fielddata(selector.InvokeOrDefault(new CatFielddataDescriptor()));
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.fielddata</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-field-data/">https://opensearch.org/docs/latest/api-reference/cat/cat-field-data/</a>
+        /// </summary>
+        public Task<CatResponse<CatFielddataRecord>> FielddataAsync(
+            Func<CatFielddataDescriptor, ICatFielddataRequest> selector = null,
+            CancellationToken ct = default
+        ) => FielddataAsync(selector.InvokeOrDefault(new CatFielddataDescriptor()), ct);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.fielddata</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-field-data/">https://opensearch.org/docs/latest/api-reference/cat/cat-field-data/</a>
+        /// </summary>
+        public CatResponse<CatFielddataRecord> Fielddata(ICatFielddataRequest request) =>
+            DoCat<ICatFielddataRequest, CatFielddataRequestParameters, CatFielddataRecord>(request);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.fielddata</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-field-data/">https://opensearch.org/docs/latest/api-reference/cat/cat-field-data/</a>
+        /// </summary>
+        public Task<CatResponse<CatFielddataRecord>> FielddataAsync(
+            ICatFielddataRequest request,
+            CancellationToken ct = default
+        ) =>
+            DoCatAsync<ICatFielddataRequest, CatFielddataRequestParameters, CatFielddataRecord>(
+                request,
+                ct
+            );
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.health</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-health/">https://opensearch.org/docs/latest/api-reference/cat/cat-health/</a>
+        /// </summary>
+        public CatResponse<CatHealthRecord> Health(
+            Func<CatHealthDescriptor, ICatHealthRequest> selector = null
+        ) => Health(selector.InvokeOrDefault(new CatHealthDescriptor()));
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.health</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-health/">https://opensearch.org/docs/latest/api-reference/cat/cat-health/</a>
+        /// </summary>
+        public Task<CatResponse<CatHealthRecord>> HealthAsync(
+            Func<CatHealthDescriptor, ICatHealthRequest> selector = null,
+            CancellationToken ct = default
+        ) => HealthAsync(selector.InvokeOrDefault(new CatHealthDescriptor()), ct);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.health</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-health/">https://opensearch.org/docs/latest/api-reference/cat/cat-health/</a>
+        /// </summary>
+        public CatResponse<CatHealthRecord> Health(ICatHealthRequest request) =>
+            DoCat<ICatHealthRequest, CatHealthRequestParameters, CatHealthRecord>(request);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.health</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-health/">https://opensearch.org/docs/latest/api-reference/cat/cat-health/</a>
+        /// </summary>
+        public Task<CatResponse<CatHealthRecord>> HealthAsync(
+            ICatHealthRequest request,
+            CancellationToken ct = default
+        ) =>
+            DoCatAsync<ICatHealthRequest, CatHealthRequestParameters, CatHealthRecord>(request, ct);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.help</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/index/">https://opensearch.org/docs/latest/api-reference/cat/index/</a>
+        /// </summary>
+        public CatResponse<CatHelpRecord> Help(
+            Func<CatHelpDescriptor, ICatHelpRequest> selector = null
+        ) => Help(selector.InvokeOrDefault(new CatHelpDescriptor()));
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.help</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/index/">https://opensearch.org/docs/latest/api-reference/cat/index/</a>
+        /// </summary>
+        public Task<CatResponse<CatHelpRecord>> HelpAsync(
+            Func<CatHelpDescriptor, ICatHelpRequest> selector = null,
+            CancellationToken ct = default
+        ) => HelpAsync(selector.InvokeOrDefault(new CatHelpDescriptor()), ct);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.help</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/index/">https://opensearch.org/docs/latest/api-reference/cat/index/</a>
+        /// </summary>
+        public CatResponse<CatHelpRecord> Help(ICatHelpRequest request) =>
+            DoCat<ICatHelpRequest, CatHelpRequestParameters, CatHelpRecord>(request);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.help</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/index/">https://opensearch.org/docs/latest/api-reference/cat/index/</a>
+        /// </summary>
+        public Task<CatResponse<CatHelpRecord>> HelpAsync(
+            ICatHelpRequest request,
+            CancellationToken ct = default
+        ) => DoCatAsync<ICatHelpRequest, CatHelpRequestParameters, CatHelpRecord>(request, ct);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.indices</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-indices/">https://opensearch.org/docs/latest/api-reference/cat/cat-indices/</a>
+        /// </summary>
+        public CatResponse<CatIndicesRecord> Indices(
+            Func<CatIndicesDescriptor, ICatIndicesRequest> selector = null
+        ) => Indices(selector.InvokeOrDefault(new CatIndicesDescriptor()));
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.indices</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-indices/">https://opensearch.org/docs/latest/api-reference/cat/cat-indices/</a>
+        /// </summary>
+        public Task<CatResponse<CatIndicesRecord>> IndicesAsync(
+            Func<CatIndicesDescriptor, ICatIndicesRequest> selector = null,
+            CancellationToken ct = default
+        ) => IndicesAsync(selector.InvokeOrDefault(new CatIndicesDescriptor()), ct);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.indices</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-indices/">https://opensearch.org/docs/latest/api-reference/cat/cat-indices/</a>
+        /// </summary>
+        public CatResponse<CatIndicesRecord> Indices(ICatIndicesRequest request) =>
+            DoCat<ICatIndicesRequest, CatIndicesRequestParameters, CatIndicesRecord>(request);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.indices</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-indices/">https://opensearch.org/docs/latest/api-reference/cat/cat-indices/</a>
+        /// </summary>
+        public Task<CatResponse<CatIndicesRecord>> IndicesAsync(
+            ICatIndicesRequest request,
+            CancellationToken ct = default
+        ) =>
+            DoCatAsync<ICatIndicesRequest, CatIndicesRequestParameters, CatIndicesRecord>(
+                request,
+                ct
+            );
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.master</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/">https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/</a>
+        /// </summary>
+        [Obsolete(
+            "Deprecated as of: 2.0, reason: To promote inclusive language, please use '/_cat/cluster_manager' instead."
+        )]
+        public CatResponse<CatMasterRecord> Master(
+            Func<CatMasterDescriptor, ICatMasterRequest> selector = null
+        ) => Master(selector.InvokeOrDefault(new CatMasterDescriptor()));
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.master</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/">https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/</a>
+        /// </summary>
+        [Obsolete(
+            "Deprecated as of: 2.0, reason: To promote inclusive language, please use '/_cat/cluster_manager' instead."
+        )]
+        public Task<CatResponse<CatMasterRecord>> MasterAsync(
+            Func<CatMasterDescriptor, ICatMasterRequest> selector = null,
+            CancellationToken ct = default
+        ) => MasterAsync(selector.InvokeOrDefault(new CatMasterDescriptor()), ct);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.master</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/">https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/</a>
+        /// </summary>
+        [Obsolete(
+            "Deprecated as of: 2.0, reason: To promote inclusive language, please use '/_cat/cluster_manager' instead."
+        )]
+        public CatResponse<CatMasterRecord> Master(ICatMasterRequest request) =>
+            DoCat<ICatMasterRequest, CatMasterRequestParameters, CatMasterRecord>(request);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.master</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/">https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/</a>
+        /// </summary>
+        [Obsolete(
+            "Deprecated as of: 2.0, reason: To promote inclusive language, please use '/_cat/cluster_manager' instead."
+        )]
+        public Task<CatResponse<CatMasterRecord>> MasterAsync(
+            ICatMasterRequest request,
+            CancellationToken ct = default
+        ) =>
+            DoCatAsync<ICatMasterRequest, CatMasterRequestParameters, CatMasterRecord>(request, ct);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.nodeattrs</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-nodeattrs/">https://opensearch.org/docs/latest/api-reference/cat/cat-nodeattrs/</a>
+        /// </summary>
+        public CatResponse<CatNodeAttributesRecord> NodeAttributes(
+            Func<CatNodeAttributesDescriptor, ICatNodeAttributesRequest> selector = null
+        ) => NodeAttributes(selector.InvokeOrDefault(new CatNodeAttributesDescriptor()));
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.nodeattrs</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-nodeattrs/">https://opensearch.org/docs/latest/api-reference/cat/cat-nodeattrs/</a>
+        /// </summary>
+        public Task<CatResponse<CatNodeAttributesRecord>> NodeAttributesAsync(
+            Func<CatNodeAttributesDescriptor, ICatNodeAttributesRequest> selector = null,
+            CancellationToken ct = default
+        ) => NodeAttributesAsync(selector.InvokeOrDefault(new CatNodeAttributesDescriptor()), ct);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.nodeattrs</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-nodeattrs/">https://opensearch.org/docs/latest/api-reference/cat/cat-nodeattrs/</a>
+        /// </summary>
+        public CatResponse<CatNodeAttributesRecord> NodeAttributes(
+            ICatNodeAttributesRequest request
+        ) =>
+            DoCat<
+                ICatNodeAttributesRequest,
+                CatNodeAttributesRequestParameters,
+                CatNodeAttributesRecord
+            >(request);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.nodeattrs</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-nodeattrs/">https://opensearch.org/docs/latest/api-reference/cat/cat-nodeattrs/</a>
+        /// </summary>
+        public Task<CatResponse<CatNodeAttributesRecord>> NodeAttributesAsync(
+            ICatNodeAttributesRequest request,
+            CancellationToken ct = default
+        ) =>
+            DoCatAsync<
+                ICatNodeAttributesRequest,
+                CatNodeAttributesRequestParameters,
+                CatNodeAttributesRecord
+            >(request, ct);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.nodes</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-nodes/">https://opensearch.org/docs/latest/api-reference/cat/cat-nodes/</a>
+        /// </summary>
+        public CatResponse<CatNodesRecord> Nodes(
+            Func<CatNodesDescriptor, ICatNodesRequest> selector = null
+        ) => Nodes(selector.InvokeOrDefault(new CatNodesDescriptor()));
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.nodes</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-nodes/">https://opensearch.org/docs/latest/api-reference/cat/cat-nodes/</a>
+        /// </summary>
+        public Task<CatResponse<CatNodesRecord>> NodesAsync(
+            Func<CatNodesDescriptor, ICatNodesRequest> selector = null,
+            CancellationToken ct = default
+        ) => NodesAsync(selector.InvokeOrDefault(new CatNodesDescriptor()), ct);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.nodes</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-nodes/">https://opensearch.org/docs/latest/api-reference/cat/cat-nodes/</a>
+        /// </summary>
+        public CatResponse<CatNodesRecord> Nodes(ICatNodesRequest request) =>
+            DoCat<ICatNodesRequest, CatNodesRequestParameters, CatNodesRecord>(request);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.nodes</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-nodes/">https://opensearch.org/docs/latest/api-reference/cat/cat-nodes/</a>
+        /// </summary>
+        public Task<CatResponse<CatNodesRecord>> NodesAsync(
+            ICatNodesRequest request,
+            CancellationToken ct = default
+        ) => DoCatAsync<ICatNodesRequest, CatNodesRequestParameters, CatNodesRecord>(request, ct);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.pending_tasks</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-pending-tasks/">https://opensearch.org/docs/latest/api-reference/cat/cat-pending-tasks/</a>
+        /// </summary>
+        public CatResponse<CatPendingTasksRecord> PendingTasks(
+            Func<CatPendingTasksDescriptor, ICatPendingTasksRequest> selector = null
+        ) => PendingTasks(selector.InvokeOrDefault(new CatPendingTasksDescriptor()));
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.pending_tasks</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-pending-tasks/">https://opensearch.org/docs/latest/api-reference/cat/cat-pending-tasks/</a>
+        /// </summary>
+        public Task<CatResponse<CatPendingTasksRecord>> PendingTasksAsync(
+            Func<CatPendingTasksDescriptor, ICatPendingTasksRequest> selector = null,
+            CancellationToken ct = default
+        ) => PendingTasksAsync(selector.InvokeOrDefault(new CatPendingTasksDescriptor()), ct);
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.pending_tasks</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-pending-tasks/">https://opensearch.org/docs/latest/api-reference/cat/cat-pending-tasks/</a>
+        /// </summary>
+        public CatResponse<CatPendingTasksRecord> PendingTasks(ICatPendingTasksRequest request) =>
+            DoCat<ICatPendingTasksRequest, CatPendingTasksRequestParameters, CatPendingTasksRecord>(
+                request
+            );
+
+        /// <summary>
+        /// <c>GET</c> request to the <c>cat.pending_tasks</c> API, read more about this API online:
+        /// <para></para>
+        /// <a href="https://opensearch.org/docs/latest/api-reference/cat/cat-pending-tasks/">https://opensearch.org/docs/latest/api-reference/cat/cat-pending-tasks/</a>
+        /// </summary>
+        public Task<CatResponse<CatPendingTasksRecord>> PendingTasksAsync(
+            ICatPendingTasksRequest request,
+            CancellationToken ct = default
+        ) =>
+            DoCatAsync<
+                ICatPendingTasksRequest,
+                CatPendingTasksRequestParameters,
+                CatPendingTasksRecord
+            >(request, ct);
+    }
+}
diff --git a/src/OpenSearch.Client/_Generated/OpenSearchClient.cs b/src/OpenSearch.Client/_Generated/OpenSearchClient.cs
index 28f5994f96..6f12c13f45 100644
--- a/src/OpenSearch.Client/_Generated/OpenSearchClient.cs
+++ b/src/OpenSearch.Client/_Generated/OpenSearchClient.cs
@@ -46,6 +46,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using OpenSearch.Client.Specification.ClusterApi;
 using OpenSearch.Client.Specification.DanglingIndicesApi;
 using OpenSearch.Client.Specification.HttpApi;
@@ -63,6 +64,9 @@ namespace OpenSearch.Client
     /// </summary>
     public partial class OpenSearchClient : IOpenSearchClient
     {
+        /// <summary>Cat APIs</summary>
+        public CatNamespace Cat { get; private set; }
+
         /// <summary>Cluster APIs</summary>
         public ClusterNamespace Cluster { get; private set; }
 
@@ -89,6 +93,7 @@ public partial class OpenSearchClient : IOpenSearchClient
 
         partial void SetupGeneratedNamespaces()
         {
+            Cat = new CatNamespace(this);
             Cluster = new ClusterNamespace(this);
             DanglingIndices = new DanglingIndicesNamespace(this);
             Indices = new IndicesNamespace(this);
diff --git a/src/OpenSearch.Client/_Generated/Requests.Cat.cs b/src/OpenSearch.Client/_Generated/Requests.Cat.cs
new file mode 100644
index 0000000000..4eb99419ae
--- /dev/null
+++ b/src/OpenSearch.Client/_Generated/Requests.Cat.cs
@@ -0,0 +1,1023 @@
+/* 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.
+*
+*  Licensed to Elasticsearch B.V. under one or more contributor
+*  license agreements. See the NOTICE file distributed with
+*  this work for additional information regarding copyright
+*  ownership. Elasticsearch B.V. licenses this file to you under
+*  the Apache License, Version 2.0 (the "License"); you may
+*  not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing,
+*  software distributed under the License is distributed on an
+*  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+*  KIND, either express or implied.  See the License for the
+*  specific language governing permissions and limitations
+*  under the License.
+*/
+// ███╗   ██╗ ██████╗ ████████╗██╗ ██████╗███████╗
+// ████╗  ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝
+// ██╔██╗ ██║██║   ██║   ██║   ██║██║     █████╗
+// ██║╚██╗██║██║   ██║   ██║   ██║██║     ██╔══╝
+// ██║ ╚████║╚██████╔╝   ██║   ██║╚██████╗███████╗
+// ╚═╝  ╚═══╝ ╚═════╝    ╚═╝   ╚═╝ ╚═════╝╚══════╝
+// -----------------------------------------------
+//
+// This file is automatically generated
+// Please do not edit these files manually
+// Run the following in the root of the repos:
+//
+//      *NIX        :   ./build.sh codegen
+//      Windows     :   build.bat codegen
+//
+// -----------------------------------------------
+// ReSharper disable RedundantUsingDirective
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Runtime.Serialization;
+using System.Text;
+using OpenSearch.Net;
+using OpenSearch.Net.Specification.CatApi;
+using OpenSearch.Net.Utf8Json;
+
+// ReSharper disable RedundantBaseConstructorCall
+// ReSharper disable UnusedTypeParameter
+// ReSharper disable PartialMethodWithSinglePart
+// ReSharper disable RedundantNameQualifier
+namespace OpenSearch.Client
+{
+    [InterfaceDataContract]
+    public partial interface ICatAliasesRequest : IRequest<CatAliasesRequestParameters>
+    {
+        [IgnoreDataMember]
+        Names Name { get; }
+    }
+
+    /// <summary>Request for Aliases <para>https://opensearch.org/docs/latest/api-reference/cat/cat-aliases/</para></summary>
+    public partial class CatAliasesRequest
+        : PlainRequestBase<CatAliasesRequestParameters>,
+            ICatAliasesRequest
+    {
+        protected ICatAliasesRequest Self => this;
+        internal override ApiUrls ApiUrls => ApiUrlsLookups.CatAliases;
+
+        /// <summary>/_cat/aliases</summary>
+        public CatAliasesRequest()
+            : base() { }
+
+        /// <summary>/_cat/aliases/{name}</summary>
+        /// <param name="name">Optional, accepts null</param>
+        public CatAliasesRequest(Names name)
+            : base(r => r.Optional("name", name)) { }
+
+        // values part of the url path
+        [IgnoreDataMember]
+        Names ICatAliasesRequest.Name => Self.RouteValues.Get<Names>("name");
+
+        // Request parameters
+        /// <summary>Whether to expand wildcard expression to concrete indices that are open, closed or both.</summary>
+        public ExpandWildcards? ExpandWildcards
+        {
+            get => Q<ExpandWildcards?>("expand_wildcards");
+            set => Q("expand_wildcards", value);
+        }
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public string Format
+        {
+            get => Q<string>("format");
+            set
+            {
+                Q("format", value);
+                SetAcceptHeader(value);
+            }
+        }
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public string[] Headers
+        {
+            get => Q<string[]>("h");
+            set => Q("h", value);
+        }
+
+        /// <summary>Return help information.</summary>
+        public bool? Help
+        {
+            get => Q<bool?>("help");
+            set => Q("help", value);
+        }
+
+        /// <summary>Return local information, do not retrieve the state from cluster-manager node.</summary>
+        public bool? Local
+        {
+            get => Q<bool?>("local");
+            set => Q("local", value);
+        }
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public string[] SortByColumns
+        {
+            get => Q<string[]>("s");
+            set => Q("s", value);
+        }
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public bool? Verbose
+        {
+            get => Q<bool?>("v");
+            set => Q("v", value);
+        }
+    }
+
+    [InterfaceDataContract]
+    public partial interface ICatAllocationRequest : IRequest<CatAllocationRequestParameters>
+    {
+        [IgnoreDataMember]
+        NodeIds NodeId { get; }
+    }
+
+    /// <summary>Request for Allocation <para>https://opensearch.org/docs/latest/api-reference/cat/cat-allocation/</para></summary>
+    public partial class CatAllocationRequest
+        : PlainRequestBase<CatAllocationRequestParameters>,
+            ICatAllocationRequest
+    {
+        protected ICatAllocationRequest Self => this;
+        internal override ApiUrls ApiUrls => ApiUrlsLookups.CatAllocation;
+
+        /// <summary>/_cat/allocation</summary>
+        public CatAllocationRequest()
+            : base() { }
+
+        /// <summary>/_cat/allocation/{node_id}</summary>
+        /// <param name="nodeId">Optional, accepts null</param>
+        public CatAllocationRequest(NodeIds nodeId)
+            : base(r => r.Optional("node_id", nodeId)) { }
+
+        // values part of the url path
+        [IgnoreDataMember]
+        NodeIds ICatAllocationRequest.NodeId => Self.RouteValues.Get<NodeIds>("node_id");
+
+        // Request parameters
+        /// <summary>The unit in which to display byte values.</summary>
+        public Bytes? Bytes
+        {
+            get => Q<Bytes?>("bytes");
+            set => Q("bytes", value);
+        }
+
+        /// <summary>Operation timeout for connection to cluster-manager node.</summary>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public Time ClusterManagerTimeout
+        {
+            get => Q<Time>("cluster_manager_timeout");
+            set => Q("cluster_manager_timeout", value);
+        }
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public string Format
+        {
+            get => Q<string>("format");
+            set
+            {
+                Q("format", value);
+                SetAcceptHeader(value);
+            }
+        }
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public string[] Headers
+        {
+            get => Q<string[]>("h");
+            set => Q("h", value);
+        }
+
+        /// <summary>Return help information.</summary>
+        public bool? Help
+        {
+            get => Q<bool?>("help");
+            set => Q("help", value);
+        }
+
+        /// <summary>Return local information, do not retrieve the state from cluster-manager node.</summary>
+        public bool? Local
+        {
+            get => Q<bool?>("local");
+            set => Q("local", value);
+        }
+
+        /// <summary>Operation timeout for connection to master node.</summary>
+        [Obsolete(
+            "Deprecated as of: 2.0.0, reason: To promote inclusive language, use 'cluster_manager_timeout' instead."
+        )]
+        public Time MasterTimeout
+        {
+            get => Q<Time>("master_timeout");
+            set => Q("master_timeout", value);
+        }
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public string[] SortByColumns
+        {
+            get => Q<string[]>("s");
+            set => Q("s", value);
+        }
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public bool? Verbose
+        {
+            get => Q<bool?>("v");
+            set => Q("v", value);
+        }
+    }
+
+    [InterfaceDataContract]
+    public partial interface ICatClusterManagerRequest
+        : IRequest<CatClusterManagerRequestParameters> { }
+
+    /// <summary>Request for ClusterManager <para>https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/</para></summary>
+    public partial class CatClusterManagerRequest
+        : PlainRequestBase<CatClusterManagerRequestParameters>,
+            ICatClusterManagerRequest
+    {
+        protected ICatClusterManagerRequest Self => this;
+        internal override ApiUrls ApiUrls => ApiUrlsLookups.CatClusterManager;
+
+        // values part of the url path
+
+        // Request parameters
+        /// <summary>Operation timeout for connection to cluster-manager node.</summary>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public Time ClusterManagerTimeout
+        {
+            get => Q<Time>("cluster_manager_timeout");
+            set => Q("cluster_manager_timeout", value);
+        }
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public string Format
+        {
+            get => Q<string>("format");
+            set
+            {
+                Q("format", value);
+                SetAcceptHeader(value);
+            }
+        }
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public string[] Headers
+        {
+            get => Q<string[]>("h");
+            set => Q("h", value);
+        }
+
+        /// <summary>Return help information.</summary>
+        public bool? Help
+        {
+            get => Q<bool?>("help");
+            set => Q("help", value);
+        }
+
+        /// <summary>Return local information, do not retrieve the state from cluster-manager node.</summary>
+        public bool? Local
+        {
+            get => Q<bool?>("local");
+            set => Q("local", value);
+        }
+
+        /// <summary>Operation timeout for connection to master node.</summary>
+        [Obsolete(
+            "Deprecated as of: 2.0.0, reason: To promote inclusive language, use 'cluster_manager_timeout' instead."
+        )]
+        public Time MasterTimeout
+        {
+            get => Q<Time>("master_timeout");
+            set => Q("master_timeout", value);
+        }
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public string[] SortByColumns
+        {
+            get => Q<string[]>("s");
+            set => Q("s", value);
+        }
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public bool? Verbose
+        {
+            get => Q<bool?>("v");
+            set => Q("v", value);
+        }
+    }
+
+    [InterfaceDataContract]
+    public partial interface ICatCountRequest : IRequest<CatCountRequestParameters>
+    {
+        [IgnoreDataMember]
+        Indices Index { get; }
+    }
+
+    /// <summary>Request for Count <para>https://opensearch.org/docs/latest/api-reference/cat/cat-count/</para></summary>
+    public partial class CatCountRequest
+        : PlainRequestBase<CatCountRequestParameters>,
+            ICatCountRequest
+    {
+        protected ICatCountRequest Self => this;
+        internal override ApiUrls ApiUrls => ApiUrlsLookups.CatCount;
+
+        /// <summary>/_cat/count</summary>
+        public CatCountRequest()
+            : base() { }
+
+        /// <summary>/_cat/count/{index}</summary>
+        /// <param name="index">Optional, accepts null</param>
+        public CatCountRequest(Indices index)
+            : base(r => r.Optional("index", index)) { }
+
+        // values part of the url path
+        [IgnoreDataMember]
+        Indices ICatCountRequest.Index => Self.RouteValues.Get<Indices>("index");
+
+        // Request parameters
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public string Format
+        {
+            get => Q<string>("format");
+            set
+            {
+                Q("format", value);
+                SetAcceptHeader(value);
+            }
+        }
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public string[] Headers
+        {
+            get => Q<string[]>("h");
+            set => Q("h", value);
+        }
+
+        /// <summary>Return help information.</summary>
+        public bool? Help
+        {
+            get => Q<bool?>("help");
+            set => Q("help", value);
+        }
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public string[] SortByColumns
+        {
+            get => Q<string[]>("s");
+            set => Q("s", value);
+        }
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public bool? Verbose
+        {
+            get => Q<bool?>("v");
+            set => Q("v", value);
+        }
+    }
+
+    [InterfaceDataContract]
+    public partial interface ICatFielddataRequest : IRequest<CatFielddataRequestParameters>
+    {
+        [IgnoreDataMember]
+        Fields Fields { get; }
+    }
+
+    /// <summary>Request for Fielddata <para>https://opensearch.org/docs/latest/api-reference/cat/cat-field-data/</para></summary>
+    public partial class CatFielddataRequest
+        : PlainRequestBase<CatFielddataRequestParameters>,
+            ICatFielddataRequest
+    {
+        protected ICatFielddataRequest Self => this;
+        internal override ApiUrls ApiUrls => ApiUrlsLookups.CatFielddata;
+
+        /// <summary>/_cat/fielddata</summary>
+        public CatFielddataRequest()
+            : base() { }
+
+        /// <summary>/_cat/fielddata/{fields}</summary>
+        /// <param name="fields">Optional, accepts null</param>
+        public CatFielddataRequest(Fields fields)
+            : base(r => r.Optional("fields", fields)) { }
+
+        // values part of the url path
+        [IgnoreDataMember]
+        Fields ICatFielddataRequest.Fields => Self.RouteValues.Get<Fields>("fields");
+
+        // Request parameters
+        /// <summary>The unit in which to display byte values.</summary>
+        public Bytes? Bytes
+        {
+            get => Q<Bytes?>("bytes");
+            set => Q("bytes", value);
+        }
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public string Format
+        {
+            get => Q<string>("format");
+            set
+            {
+                Q("format", value);
+                SetAcceptHeader(value);
+            }
+        }
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public string[] Headers
+        {
+            get => Q<string[]>("h");
+            set => Q("h", value);
+        }
+
+        /// <summary>Return help information.</summary>
+        public bool? Help
+        {
+            get => Q<bool?>("help");
+            set => Q("help", value);
+        }
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public string[] SortByColumns
+        {
+            get => Q<string[]>("s");
+            set => Q("s", value);
+        }
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public bool? Verbose
+        {
+            get => Q<bool?>("v");
+            set => Q("v", value);
+        }
+    }
+
+    [InterfaceDataContract]
+    public partial interface ICatHealthRequest : IRequest<CatHealthRequestParameters> { }
+
+    /// <summary>Request for Health <para>https://opensearch.org/docs/latest/api-reference/cat/cat-health/</para></summary>
+    public partial class CatHealthRequest
+        : PlainRequestBase<CatHealthRequestParameters>,
+            ICatHealthRequest
+    {
+        protected ICatHealthRequest Self => this;
+        internal override ApiUrls ApiUrls => ApiUrlsLookups.CatHealth;
+
+        // values part of the url path
+
+        // Request parameters
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public string Format
+        {
+            get => Q<string>("format");
+            set
+            {
+                Q("format", value);
+                SetAcceptHeader(value);
+            }
+        }
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public string[] Headers
+        {
+            get => Q<string[]>("h");
+            set => Q("h", value);
+        }
+
+        /// <summary>Return help information.</summary>
+        public bool? Help
+        {
+            get => Q<bool?>("help");
+            set => Q("help", value);
+        }
+
+        /// <summary>Set to false to disable timestamping.</summary>
+        public bool? IncludeTimestamp
+        {
+            get => Q<bool?>("ts");
+            set => Q("ts", value);
+        }
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public string[] SortByColumns
+        {
+            get => Q<string[]>("s");
+            set => Q("s", value);
+        }
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public bool? Verbose
+        {
+            get => Q<bool?>("v");
+            set => Q("v", value);
+        }
+    }
+
+    [InterfaceDataContract]
+    public partial interface ICatHelpRequest : IRequest<CatHelpRequestParameters> { }
+
+    /// <summary>Request for Help <para>https://opensearch.org/docs/latest/api-reference/cat/index/</para></summary>
+    public partial class CatHelpRequest
+        : PlainRequestBase<CatHelpRequestParameters>,
+            ICatHelpRequest
+    {
+        protected ICatHelpRequest Self => this;
+        internal override ApiUrls ApiUrls => ApiUrlsLookups.CatHelp;
+
+        // values part of the url path
+
+        // Request parameters
+        /// <summary>Return help information.</summary>
+        public bool? Help
+        {
+            get => Q<bool?>("help");
+            set => Q("help", value);
+        }
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public string[] SortByColumns
+        {
+            get => Q<string[]>("s");
+            set => Q("s", value);
+        }
+    }
+
+    [InterfaceDataContract]
+    public partial interface ICatIndicesRequest : IRequest<CatIndicesRequestParameters>
+    {
+        [IgnoreDataMember]
+        Indices Index { get; }
+    }
+
+    /// <summary>Request for Indices <para>https://opensearch.org/docs/latest/api-reference/cat/cat-indices/</para></summary>
+    public partial class CatIndicesRequest
+        : PlainRequestBase<CatIndicesRequestParameters>,
+            ICatIndicesRequest
+    {
+        protected ICatIndicesRequest Self => this;
+        internal override ApiUrls ApiUrls => ApiUrlsLookups.CatIndices;
+
+        /// <summary>/_cat/indices</summary>
+        public CatIndicesRequest()
+            : base() { }
+
+        /// <summary>/_cat/indices/{index}</summary>
+        /// <param name="index">Optional, accepts null</param>
+        public CatIndicesRequest(Indices index)
+            : base(r => r.Optional("index", index)) { }
+
+        // values part of the url path
+        [IgnoreDataMember]
+        Indices ICatIndicesRequest.Index => Self.RouteValues.Get<Indices>("index");
+
+        // Request parameters
+        /// <summary>The unit in which to display byte values.</summary>
+        public Bytes? Bytes
+        {
+            get => Q<Bytes?>("bytes");
+            set => Q("bytes", value);
+        }
+
+        /// <summary>Operation timeout for connection to cluster-manager node.</summary>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public Time ClusterManagerTimeout
+        {
+            get => Q<Time>("cluster_manager_timeout");
+            set => Q("cluster_manager_timeout", value);
+        }
+
+        /// <summary>Whether to expand wildcard expression to concrete indices that are open, closed or both.</summary>
+        public ExpandWildcards? ExpandWildcards
+        {
+            get => Q<ExpandWildcards?>("expand_wildcards");
+            set => Q("expand_wildcards", value);
+        }
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public string Format
+        {
+            get => Q<string>("format");
+            set
+            {
+                Q("format", value);
+                SetAcceptHeader(value);
+            }
+        }
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public string[] Headers
+        {
+            get => Q<string[]>("h");
+            set => Q("h", value);
+        }
+
+        /// <summary>Health status ('green', 'yellow', or 'red') to filter only indices matching the specified health status.</summary>
+        public Health? Health
+        {
+            get => Q<Health?>("health");
+            set => Q("health", value);
+        }
+
+        /// <summary>Return help information.</summary>
+        public bool? Help
+        {
+            get => Q<bool?>("help");
+            set => Q("help", value);
+        }
+
+        /// <summary>If set to true segment stats will include stats for segments that are not currently loaded into memory.</summary>
+        public bool? IncludeUnloadedSegments
+        {
+            get => Q<bool?>("include_unloaded_segments");
+            set => Q("include_unloaded_segments", value);
+        }
+
+        /// <summary>Return local information, do not retrieve the state from cluster-manager node.</summary>
+        public bool? Local
+        {
+            get => Q<bool?>("local");
+            set => Q("local", value);
+        }
+
+        /// <summary>Operation timeout for connection to master node.</summary>
+        [Obsolete(
+            "Deprecated as of: 2.0.0, reason: To promote inclusive language, use 'cluster_manager_timeout' instead."
+        )]
+        public Time MasterTimeout
+        {
+            get => Q<Time>("master_timeout");
+            set => Q("master_timeout", value);
+        }
+
+        /// <summary>Set to true to return stats only for primary shards.</summary>
+        public bool? Pri
+        {
+            get => Q<bool?>("pri");
+            set => Q("pri", value);
+        }
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public string[] SortByColumns
+        {
+            get => Q<string[]>("s");
+            set => Q("s", value);
+        }
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public bool? Verbose
+        {
+            get => Q<bool?>("v");
+            set => Q("v", value);
+        }
+    }
+
+    [InterfaceDataContract]
+    public partial interface ICatMasterRequest : IRequest<CatMasterRequestParameters> { }
+
+    /// <summary>Request for Master <para>https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/</para></summary>
+    public partial class CatMasterRequest
+        : PlainRequestBase<CatMasterRequestParameters>,
+            ICatMasterRequest
+    {
+        protected ICatMasterRequest Self => this;
+        internal override ApiUrls ApiUrls => ApiUrlsLookups.CatMaster;
+
+        // values part of the url path
+
+        // Request parameters
+        /// <summary>Operation timeout for connection to cluster-manager node.</summary>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public Time ClusterManagerTimeout
+        {
+            get => Q<Time>("cluster_manager_timeout");
+            set => Q("cluster_manager_timeout", value);
+        }
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public string Format
+        {
+            get => Q<string>("format");
+            set
+            {
+                Q("format", value);
+                SetAcceptHeader(value);
+            }
+        }
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public string[] Headers
+        {
+            get => Q<string[]>("h");
+            set => Q("h", value);
+        }
+
+        /// <summary>Return help information.</summary>
+        public bool? Help
+        {
+            get => Q<bool?>("help");
+            set => Q("help", value);
+        }
+
+        /// <summary>Return local information, do not retrieve the state from cluster-manager node.</summary>
+        public bool? Local
+        {
+            get => Q<bool?>("local");
+            set => Q("local", value);
+        }
+
+        /// <summary>Operation timeout for connection to master node.</summary>
+        [Obsolete(
+            "Deprecated as of: 2.0.0, reason: To promote inclusive language, use 'cluster_manager_timeout' instead."
+        )]
+        public Time MasterTimeout
+        {
+            get => Q<Time>("master_timeout");
+            set => Q("master_timeout", value);
+        }
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public string[] SortByColumns
+        {
+            get => Q<string[]>("s");
+            set => Q("s", value);
+        }
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public bool? Verbose
+        {
+            get => Q<bool?>("v");
+            set => Q("v", value);
+        }
+    }
+
+    [InterfaceDataContract]
+    public partial interface ICatNodeAttributesRequest
+        : IRequest<CatNodeAttributesRequestParameters> { }
+
+    /// <summary>Request for NodeAttributes <para>https://opensearch.org/docs/latest/api-reference/cat/cat-nodeattrs/</para></summary>
+    public partial class CatNodeAttributesRequest
+        : PlainRequestBase<CatNodeAttributesRequestParameters>,
+            ICatNodeAttributesRequest
+    {
+        protected ICatNodeAttributesRequest Self => this;
+        internal override ApiUrls ApiUrls => ApiUrlsLookups.CatNodeAttributes;
+
+        // values part of the url path
+
+        // Request parameters
+        /// <summary>Operation timeout for connection to cluster-manager node.</summary>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public Time ClusterManagerTimeout
+        {
+            get => Q<Time>("cluster_manager_timeout");
+            set => Q("cluster_manager_timeout", value);
+        }
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public string Format
+        {
+            get => Q<string>("format");
+            set
+            {
+                Q("format", value);
+                SetAcceptHeader(value);
+            }
+        }
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public string[] Headers
+        {
+            get => Q<string[]>("h");
+            set => Q("h", value);
+        }
+
+        /// <summary>Return help information.</summary>
+        public bool? Help
+        {
+            get => Q<bool?>("help");
+            set => Q("help", value);
+        }
+
+        /// <summary>Return local information, do not retrieve the state from cluster-manager node.</summary>
+        public bool? Local
+        {
+            get => Q<bool?>("local");
+            set => Q("local", value);
+        }
+
+        /// <summary>Operation timeout for connection to master node.</summary>
+        [Obsolete(
+            "Deprecated as of: 2.0.0, reason: To promote inclusive language, use 'cluster_manager_timeout' instead."
+        )]
+        public Time MasterTimeout
+        {
+            get => Q<Time>("master_timeout");
+            set => Q("master_timeout", value);
+        }
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public string[] SortByColumns
+        {
+            get => Q<string[]>("s");
+            set => Q("s", value);
+        }
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public bool? Verbose
+        {
+            get => Q<bool?>("v");
+            set => Q("v", value);
+        }
+    }
+
+    [InterfaceDataContract]
+    public partial interface ICatNodesRequest : IRequest<CatNodesRequestParameters> { }
+
+    /// <summary>Request for Nodes <para>https://opensearch.org/docs/latest/api-reference/cat/cat-nodes/</para></summary>
+    public partial class CatNodesRequest
+        : PlainRequestBase<CatNodesRequestParameters>,
+            ICatNodesRequest
+    {
+        protected ICatNodesRequest Self => this;
+        internal override ApiUrls ApiUrls => ApiUrlsLookups.CatNodes;
+
+        // values part of the url path
+
+        // Request parameters
+        /// <summary>The unit in which to display byte values.</summary>
+        public Bytes? Bytes
+        {
+            get => Q<Bytes?>("bytes");
+            set => Q("bytes", value);
+        }
+
+        /// <summary>Operation timeout for connection to cluster-manager node.</summary>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public Time ClusterManagerTimeout
+        {
+            get => Q<Time>("cluster_manager_timeout");
+            set => Q("cluster_manager_timeout", value);
+        }
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public string Format
+        {
+            get => Q<string>("format");
+            set
+            {
+                Q("format", value);
+                SetAcceptHeader(value);
+            }
+        }
+
+        /// <summary>Return the full node ID instead of the shortened version.</summary>
+        public bool? FullId
+        {
+            get => Q<bool?>("full_id");
+            set => Q("full_id", value);
+        }
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public string[] Headers
+        {
+            get => Q<string[]>("h");
+            set => Q("h", value);
+        }
+
+        /// <summary>Return help information.</summary>
+        public bool? Help
+        {
+            get => Q<bool?>("help");
+            set => Q("help", value);
+        }
+
+        /// <summary>Return local information, do not retrieve the state from cluster-manager node.</summary>
+        [Obsolete(
+            "Deprecated as of: 1.0, reason: This parameter does not cause this API to act locally."
+        )]
+        public bool? Local
+        {
+            get => Q<bool?>("local");
+            set => Q("local", value);
+        }
+
+        /// <summary>Operation timeout for connection to master node.</summary>
+        [Obsolete(
+            "Deprecated as of: 2.0.0, reason: To promote inclusive language, use 'cluster_manager_timeout' instead."
+        )]
+        public Time MasterTimeout
+        {
+            get => Q<Time>("master_timeout");
+            set => Q("master_timeout", value);
+        }
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public string[] SortByColumns
+        {
+            get => Q<string[]>("s");
+            set => Q("s", value);
+        }
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public bool? Verbose
+        {
+            get => Q<bool?>("v");
+            set => Q("v", value);
+        }
+    }
+
+    [InterfaceDataContract]
+    public partial interface ICatPendingTasksRequest
+        : IRequest<CatPendingTasksRequestParameters> { }
+
+    /// <summary>Request for PendingTasks <para>https://opensearch.org/docs/latest/api-reference/cat/cat-pending-tasks/</para></summary>
+    public partial class CatPendingTasksRequest
+        : PlainRequestBase<CatPendingTasksRequestParameters>,
+            ICatPendingTasksRequest
+    {
+        protected ICatPendingTasksRequest Self => this;
+        internal override ApiUrls ApiUrls => ApiUrlsLookups.CatPendingTasks;
+
+        // values part of the url path
+
+        // Request parameters
+        /// <summary>Operation timeout for connection to cluster-manager node.</summary>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public Time ClusterManagerTimeout
+        {
+            get => Q<Time>("cluster_manager_timeout");
+            set => Q("cluster_manager_timeout", value);
+        }
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public string Format
+        {
+            get => Q<string>("format");
+            set
+            {
+                Q("format", value);
+                SetAcceptHeader(value);
+            }
+        }
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public string[] Headers
+        {
+            get => Q<string[]>("h");
+            set => Q("h", value);
+        }
+
+        /// <summary>Return help information.</summary>
+        public bool? Help
+        {
+            get => Q<bool?>("help");
+            set => Q("help", value);
+        }
+
+        /// <summary>Return local information, do not retrieve the state from cluster-manager node.</summary>
+        public bool? Local
+        {
+            get => Q<bool?>("local");
+            set => Q("local", value);
+        }
+
+        /// <summary>Operation timeout for connection to master node.</summary>
+        [Obsolete(
+            "Deprecated as of: 2.0.0, reason: To promote inclusive language, use 'cluster_manager_timeout' instead."
+        )]
+        public Time MasterTimeout
+        {
+            get => Q<Time>("master_timeout");
+            set => Q("master_timeout", value);
+        }
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public string[] SortByColumns
+        {
+            get => Q<string[]>("s");
+            set => Q("s", value);
+        }
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public bool? Verbose
+        {
+            get => Q<bool?>("v");
+            set => Q("v", value);
+        }
+    }
+}
diff --git a/src/OpenSearch.Client/_Generated/Requests.cs b/src/OpenSearch.Client/_Generated/Requests.cs
index 2c386704aa..64af2783e3 100644
--- a/src/OpenSearch.Client/_Generated/Requests.cs
+++ b/src/OpenSearch.Client/_Generated/Requests.cs
@@ -49,6 +49,7 @@
 using System.Runtime.Serialization;
 using System.Text;
 using OpenSearch.Net;
+using OpenSearch.Net.Specification.CatApi;
 using OpenSearch.Net.Specification.ClusterApi;
 using OpenSearch.Net.Specification.DanglingIndicesApi;
 using OpenSearch.Net.Specification.HttpApi;
diff --git a/src/OpenSearch.Net/Api/Enums.cs b/src/OpenSearch.Net/Api/Enums.cs
index 0cbb582060..869c5fc2a9 100644
--- a/src/OpenSearch.Net/Api/Enums.cs
+++ b/src/OpenSearch.Net/Api/Enums.cs
@@ -131,44 +131,6 @@ public enum Refresh
 		WaitFor
 	}
 
-	[StringEnum]
-	public enum Bytes
-	{
-		[EnumMember(Value = "b")]
-		B,
-		[EnumMember(Value = "k")]
-		K,
-		[EnumMember(Value = "kb")]
-		Kb,
-		[EnumMember(Value = "m")]
-		M,
-		[EnumMember(Value = "mb")]
-		Mb,
-		[EnumMember(Value = "g")]
-		G,
-		[EnumMember(Value = "gb")]
-		Gb,
-		[EnumMember(Value = "t")]
-		T,
-		[EnumMember(Value = "tb")]
-		Tb,
-		[EnumMember(Value = "p")]
-		P,
-		[EnumMember(Value = "pb")]
-		Pb
-	}
-
-	[StringEnum]
-	public enum Health
-	{
-		[EnumMember(Value = "green")]
-		Green,
-		[EnumMember(Value = "yellow")]
-		Yellow,
-		[EnumMember(Value = "red")]
-		Red
-	}
-
 	[StringEnum]
 	public enum Size
 	{
@@ -279,8 +241,6 @@ static KnownEnums()
 			EnumStringResolvers.TryAdd(typeof(SearchType), (e) => GetStringValue((SearchType)e));
 			EnumStringResolvers.TryAdd(typeof(SuggestMode), (e) => GetStringValue((SuggestMode)e));
 			EnumStringResolvers.TryAdd(typeof(Refresh), (e) => GetStringValue((Refresh)e));
-			EnumStringResolvers.TryAdd(typeof(Bytes), (e) => GetStringValue((Bytes)e));
-			EnumStringResolvers.TryAdd(typeof(Health), (e) => GetStringValue((Health)e));
 			EnumStringResolvers.TryAdd(typeof(Size), (e) => GetStringValue((Size)e));
 			EnumStringResolvers.TryAdd(typeof(Level), (e) => GetStringValue((Level)e));
 			EnumStringResolvers.TryAdd(typeof(ClusterRerouteMetric), (e) => GetStringValue((ClusterRerouteMetric)e));
@@ -403,52 +363,6 @@ public static string GetStringValue(this Refresh enumValue)
 			throw new ArgumentException($"'{enumValue.ToString()}' is not a valid value for enum 'Refresh'");
 		}
 
-		public static string GetStringValue(this Bytes enumValue)
-		{
-			switch (enumValue)
-			{
-				case Bytes.B:
-					return "b";
-				case Bytes.K:
-					return "k";
-				case Bytes.Kb:
-					return "kb";
-				case Bytes.M:
-					return "m";
-				case Bytes.Mb:
-					return "mb";
-				case Bytes.G:
-					return "g";
-				case Bytes.Gb:
-					return "gb";
-				case Bytes.T:
-					return "t";
-				case Bytes.Tb:
-					return "tb";
-				case Bytes.P:
-					return "p";
-				case Bytes.Pb:
-					return "pb";
-			}
-
-			throw new ArgumentException($"'{enumValue.ToString()}' is not a valid value for enum 'Bytes'");
-		}
-
-		public static string GetStringValue(this Health enumValue)
-		{
-			switch (enumValue)
-			{
-				case Health.Green:
-					return "green";
-				case Health.Yellow:
-					return "yellow";
-				case Health.Red:
-					return "red";
-			}
-
-			throw new ArgumentException($"'{enumValue.ToString()}' is not a valid value for enum 'Health'");
-		}
-
 		public static string GetStringValue(this Size enumValue)
 		{
 			switch (enumValue)
diff --git a/src/OpenSearch.Net/Api/RequestParameters/RequestParameters.Cat.cs b/src/OpenSearch.Net/Api/RequestParameters/RequestParameters.Cat.cs
index fe66f89aa4..c7a84fcd9e 100644
--- a/src/OpenSearch.Net/Api/RequestParameters/RequestParameters.Cat.cs
+++ b/src/OpenSearch.Net/Api/RequestParameters/RequestParameters.Cat.cs
@@ -51,759 +51,6 @@
 // ReSharper disable once CheckNamespace
 namespace OpenSearch.Net.Specification.CatApi
 {
-	///<summary>Request options for Aliases <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-aliases/</para></summary>
-	public class CatAliasesRequestParameters : RequestParameters<CatAliasesRequestParameters>
-	{
-		public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
-		public override bool SupportsBody => false;
-		///<summary>Whether to expand wildcard expression to concrete indices that are open, closed or both.</summary>
-		public ExpandWildcards? ExpandWildcards
-		{
-			get => Q<ExpandWildcards? >("expand_wildcards");
-			set => Q("expand_wildcards", value);
-		}
-
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public string Format
-		{
-			get => Q<string>("format");
-			set
-			{
-				Q("format", value);
-				SetAcceptHeader(value);
-			}
-		}
-
-		///<summary>Comma-separated list of column names to display</summary>
-		public string[] Headers
-		{
-			get => Q<string[]>("h");
-			set => Q("h", value);
-		}
-
-		///<summary>Return help information</summary>
-		public bool? Help
-		{
-			get => Q<bool? >("help");
-			set => Q("help", value);
-		}
-
-		///<summary>Return local information, do not retrieve the state from cluster_manager node (default: false)</summary>
-		public bool? Local
-		{
-			get => Q<bool? >("local");
-			set => Q("local", value);
-		}
-
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public string[] SortByColumns
-		{
-			get => Q<string[]>("s");
-			set => Q("s", value);
-		}
-
-		///<summary>Verbose mode. Display column headers</summary>
-		public bool? Verbose
-		{
-			get => Q<bool? >("v");
-			set => Q("v", value);
-		}
-	}
-
-	///<summary>Request options for Allocation <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-allocation/</para></summary>
-	public class CatAllocationRequestParameters : RequestParameters<CatAllocationRequestParameters>
-	{
-		public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
-		public override bool SupportsBody => false;
-		///<summary>The unit in which to display byte values</summary>
-		public Bytes? Bytes
-		{
-			get => Q<Bytes? >("bytes");
-			set => Q("bytes", value);
-		}
-
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public string Format
-		{
-			get => Q<string>("format");
-			set
-			{
-				Q("format", value);
-				SetAcceptHeader(value);
-			}
-		}
-
-		///<summary>Comma-separated list of column names to display</summary>
-		public string[] Headers
-		{
-			get => Q<string[]>("h");
-			set => Q("h", value);
-		}
-
-		///<summary>Return help information</summary>
-		public bool? Help
-		{
-			get => Q<bool? >("help");
-			set => Q("help", value);
-		}
-
-		///<summary>Return local information, do not retrieve the state from cluster_manager node (default: false)</summary>
-		public bool? Local
-		{
-			get => Q<bool? >("local");
-			set => Q("local", value);
-		}
-
-		///<summary>Explicit operation timeout for connection to master node</summary>
-		///<remarks>Deprecated as of OpenSearch 2.0, use <see cref="ClusterManagerTimeout"/> instead</remarks>
-		public TimeSpan MasterTimeout
-		{
-			get => Q<TimeSpan>("master_timeout");
-			set => Q("master_timeout", value);
-		}
-
-		///<summary>Explicit operation timeout for connection to cluster_manager node</summary>
-		///<remarks>Introduced in OpenSearch 2.0 instead of <see cref="MasterTimeout"/></remarks>
-		public TimeSpan ClusterManagerTimeout
-		{
-			get => Q<TimeSpan>("cluster_manager_timeout");
-			set => Q("cluster_manager_timeout", value);
-		}
-
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public string[] SortByColumns
-		{
-			get => Q<string[]>("s");
-			set => Q("s", value);
-		}
-
-		///<summary>Verbose mode. Display column headers</summary>
-		public bool? Verbose
-		{
-			get => Q<bool? >("v");
-			set => Q("v", value);
-		}
-	}
-
-	///<summary>Request options for Count <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-count/</para></summary>
-	public class CatCountRequestParameters : RequestParameters<CatCountRequestParameters>
-	{
-		public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
-		public override bool SupportsBody => false;
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public string Format
-		{
-			get => Q<string>("format");
-			set
-			{
-				Q("format", value);
-				SetAcceptHeader(value);
-			}
-		}
-
-		///<summary>Comma-separated list of column names to display</summary>
-		public string[] Headers
-		{
-			get => Q<string[]>("h");
-			set => Q("h", value);
-		}
-
-		///<summary>Return help information</summary>
-		public bool? Help
-		{
-			get => Q<bool? >("help");
-			set => Q("help", value);
-		}
-
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public string[] SortByColumns
-		{
-			get => Q<string[]>("s");
-			set => Q("s", value);
-		}
-
-		///<summary>Verbose mode. Display column headers</summary>
-		public bool? Verbose
-		{
-			get => Q<bool? >("v");
-			set => Q("v", value);
-		}
-	}
-
-	///<summary>Request options for Fielddata <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-field-data/</para></summary>
-	public class CatFielddataRequestParameters : RequestParameters<CatFielddataRequestParameters>
-	{
-		public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
-		public override bool SupportsBody => false;
-		///<summary>The unit in which to display byte values</summary>
-		public Bytes? Bytes
-		{
-			get => Q<Bytes? >("bytes");
-			set => Q("bytes", value);
-		}
-
-		///<summary>A comma-separated list of fields to return in the output</summary>
-		public string[] Fields
-		{
-			get => Q<string[]>("fields");
-			set => Q("fields", value);
-		}
-
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public string Format
-		{
-			get => Q<string>("format");
-			set
-			{
-				Q("format", value);
-				SetAcceptHeader(value);
-			}
-		}
-
-		///<summary>Comma-separated list of column names to display</summary>
-		public string[] Headers
-		{
-			get => Q<string[]>("h");
-			set => Q("h", value);
-		}
-
-		///<summary>Return help information</summary>
-		public bool? Help
-		{
-			get => Q<bool? >("help");
-			set => Q("help", value);
-		}
-
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public string[] SortByColumns
-		{
-			get => Q<string[]>("s");
-			set => Q("s", value);
-		}
-
-		///<summary>Verbose mode. Display column headers</summary>
-		public bool? Verbose
-		{
-			get => Q<bool? >("v");
-			set => Q("v", value);
-		}
-	}
-
-	///<summary>Request options for Health <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-health/</para></summary>
-	public class CatHealthRequestParameters : RequestParameters<CatHealthRequestParameters>
-	{
-		public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
-		public override bool SupportsBody => false;
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public string Format
-		{
-			get => Q<string>("format");
-			set
-			{
-				Q("format", value);
-				SetAcceptHeader(value);
-			}
-		}
-
-		///<summary>Comma-separated list of column names to display</summary>
-		public string[] Headers
-		{
-			get => Q<string[]>("h");
-			set => Q("h", value);
-		}
-
-		///<summary>Return help information</summary>
-		public bool? Help
-		{
-			get => Q<bool? >("help");
-			set => Q("help", value);
-		}
-
-		///<summary>Set to false to disable timestamping</summary>
-		public bool? IncludeTimestamp
-		{
-			get => Q<bool? >("ts");
-			set => Q("ts", value);
-		}
-
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public string[] SortByColumns
-		{
-			get => Q<string[]>("s");
-			set => Q("s", value);
-		}
-
-		///<summary>Verbose mode. Display column headers</summary>
-		public bool? Verbose
-		{
-			get => Q<bool? >("v");
-			set => Q("v", value);
-		}
-	}
-
-	///<summary>Request options for Help <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/index/</para></summary>
-	public class CatHelpRequestParameters : RequestParameters<CatHelpRequestParameters>
-	{
-		public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
-		public override bool SupportsBody => false;
-		///<summary>Return help information</summary>
-		public bool? Help
-		{
-			get => Q<bool? >("help");
-			set => Q("help", value);
-		}
-
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public string[] SortByColumns
-		{
-			get => Q<string[]>("s");
-			set => Q("s", value);
-		}
-	}
-
-	///<summary>Request options for Indices <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-indices/</para></summary>
-	public class CatIndicesRequestParameters : RequestParameters<CatIndicesRequestParameters>
-	{
-		public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
-		public override bool SupportsBody => false;
-		///<summary>The unit in which to display byte values</summary>
-		public Bytes? Bytes
-		{
-			get => Q<Bytes? >("bytes");
-			set => Q("bytes", value);
-		}
-
-		///<summary>Whether to expand wildcard expression to concrete indices that are open, closed or both.</summary>
-		public ExpandWildcards? ExpandWildcards
-		{
-			get => Q<ExpandWildcards? >("expand_wildcards");
-			set => Q("expand_wildcards", value);
-		}
-
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public string Format
-		{
-			get => Q<string>("format");
-			set
-			{
-				Q("format", value);
-				SetAcceptHeader(value);
-			}
-		}
-
-		///<summary>Comma-separated list of column names to display</summary>
-		public string[] Headers
-		{
-			get => Q<string[]>("h");
-			set => Q("h", value);
-		}
-
-		///<summary>A health status ("green", "yellow", or "red" to filter only indices matching the specified health status</summary>
-		public Health? Health
-		{
-			get => Q<Health? >("health");
-			set => Q("health", value);
-		}
-
-		///<summary>Return help information</summary>
-		public bool? Help
-		{
-			get => Q<bool? >("help");
-			set => Q("help", value);
-		}
-
-		///<summary>If set to true segment stats will include stats for segments that are not currently loaded into memory</summary>
-		public bool? IncludeUnloadedSegments
-		{
-			get => Q<bool? >("include_unloaded_segments");
-			set => Q("include_unloaded_segments", value);
-		}
-
-		///<summary>Return local information, do not retrieve the state from cluster_manager node (default: false)</summary>
-		public bool? Local
-		{
-			get => Q<bool? >("local");
-			set => Q("local", value);
-		}
-
-		///<summary>Explicit operation timeout for connection to master node</summary>
-		///<remarks>Deprecated as of OpenSearch 2.0, use <see cref="ClusterManagerTimeout"/> instead</remarks>
-		public TimeSpan MasterTimeout
-		{
-			get => Q<TimeSpan>("master_timeout");
-			set => Q("master_timeout", value);
-		}
-
-		///<summary>Explicit operation timeout for connection to cluster_manager node</summary>
-		///<remarks>Introduced in OpenSearch 2.0 instead of <see cref="MasterTimeout"/></remarks>
-		public TimeSpan ClusterManagerTimeout
-		{
-			get => Q<TimeSpan>("cluster_manager_timeout");
-			set => Q("cluster_manager_timeout", value);
-		}
-
-		///<summary>Set to true to return stats only for primary shards</summary>
-		public bool? Pri
-		{
-			get => Q<bool? >("pri");
-			set => Q("pri", value);
-		}
-
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public string[] SortByColumns
-		{
-			get => Q<string[]>("s");
-			set => Q("s", value);
-		}
-
-		///<summary>Verbose mode. Display column headers</summary>
-		public bool? Verbose
-		{
-			get => Q<bool? >("v");
-			set => Q("v", value);
-		}
-	}
-
-	///<summary>Request options for Master <para>https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/</para></summary>
-	///<remarks>Deprecated as of OpenSearch 2.0, use <see cref="CatClusterManagerRequestParameters"/> instead</remarks>
-	public class CatMasterRequestParameters : RequestParameters<CatMasterRequestParameters>
-	{
-		public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
-		public override bool SupportsBody => false;
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public string Format
-		{
-			get => Q<string>("format");
-			set
-			{
-				Q("format", value);
-				SetAcceptHeader(value);
-			}
-		}
-
-		///<summary>Comma-separated list of column names to display</summary>
-		public string[] Headers
-		{
-			get => Q<string[]>("h");
-			set => Q("h", value);
-		}
-
-		///<summary>Return help information</summary>
-		public bool? Help
-		{
-			get => Q<bool? >("help");
-			set => Q("help", value);
-		}
-
-		///<summary>Return local information, do not retrieve the state from cluster_manager node (default: false)</summary>
-		public bool? Local
-		{
-			get => Q<bool? >("local");
-			set => Q("local", value);
-		}
-
-		///<summary>Explicit operation timeout for connection to master node</summary>
-		///<remarks>Deprecated as of OpenSearch 2.0, use <see cref="ClusterManagerTimeout"/> instead</remarks>
-		public TimeSpan MasterTimeout
-		{
-			get => Q<TimeSpan>("master_timeout");
-			set => Q("master_timeout", value);
-		}
-
-		///<summary>Explicit operation timeout for connection to cluster_manager node</summary>
-		///<remarks>Introduced in OpenSearch 2.0 instead of <see cref="MasterTimeout"/></remarks>
-		public TimeSpan ClusterManagerTimeout
-		{
-			get => Q<TimeSpan>("cluster_manager_timeout");
-			set => Q("cluster_manager_timeout", value);
-		}
-
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public string[] SortByColumns
-		{
-			get => Q<string[]>("s");
-			set => Q("s", value);
-		}
-
-		///<summary>Verbose mode. Display column headers</summary>
-		public bool? Verbose
-		{
-			get => Q<bool? >("v");
-			set => Q("v", value);
-		}
-	}
-
-	///<summary>Request options for ClusterManager <para>https://opensearch.org/docs/2.0/opensearch/rest-api/cat/cat-cluster_manager/</para></summary>
-	///<remarks>Introduced in OpenSearch 2.0 instead of <see cref="CatMasterRequestParameters"/></remarks>
-	public class CatClusterManagerRequestParameters : RequestParameters<CatClusterManagerRequestParameters>
-	{
-		public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
-		public override bool SupportsBody => false;
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public string Format
-		{
-			get => Q<string>("format");
-			set
-			{
-				Q("format", value);
-				SetAcceptHeader(value);
-			}
-		}
-
-		///<summary>Comma-separated list of column names to display</summary>
-		public string[] Headers
-		{
-			get => Q<string[]>("h");
-			set => Q("h", value);
-		}
-
-		///<summary>Return help information</summary>
-		public bool? Help
-		{
-			get => Q<bool? >("help");
-			set => Q("help", value);
-		}
-
-		///<summary>Return local information, do not retrieve the state from cluster_manager node (default: false)</summary>
-		public bool? Local
-		{
-			get => Q<bool? >("local");
-			set => Q("local", value);
-		}
-
-		///<summary>Explicit operation timeout for connection to cluster_manager node</summary>
-		public TimeSpan ClusterManagerTimeout
-		{
-			get => Q<TimeSpan>("cluster_manager_timeout");
-			set => Q("cluster_manager_timeout", value);
-		}
-
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public string[] SortByColumns
-		{
-			get => Q<string[]>("s");
-			set => Q("s", value);
-		}
-
-		///<summary>Verbose mode. Display column headers</summary>
-		public bool? Verbose
-		{
-			get => Q<bool? >("v");
-			set => Q("v", value);
-		}
-	}
-
-	///<summary>Request options for NodeAttributes <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodeattrs/</para></summary>
-	public class CatNodeAttributesRequestParameters : RequestParameters<CatNodeAttributesRequestParameters>
-	{
-		public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
-		public override bool SupportsBody => false;
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public string Format
-		{
-			get => Q<string>("format");
-			set
-			{
-				Q("format", value);
-				SetAcceptHeader(value);
-			}
-		}
-
-		///<summary>Comma-separated list of column names to display</summary>
-		public string[] Headers
-		{
-			get => Q<string[]>("h");
-			set => Q("h", value);
-		}
-
-		///<summary>Return help information</summary>
-		public bool? Help
-		{
-			get => Q<bool? >("help");
-			set => Q("help", value);
-		}
-
-		///<summary>Return local information, do not retrieve the state from cluster_manager node (default: false)</summary>
-		public bool? Local
-		{
-			get => Q<bool? >("local");
-			set => Q("local", value);
-		}
-
-		///<summary>Explicit operation timeout for connection to master node</summary>
-		///<remarks>Deprecated as of OpenSearch 2.0, use <see cref="ClusterManagerTimeout"/> instead</remarks>
-		public TimeSpan MasterTimeout
-		{
-			get => Q<TimeSpan>("master_timeout");
-			set => Q("master_timeout", value);
-		}
-
-		///<summary>Explicit operation timeout for connection to cluster_manager node</summary>
-		///<remarks>Introduced in OpenSearch 2.0 instead of <see cref="MasterTimeout"/></remarks>
-		public TimeSpan ClusterManagerTimeout
-		{
-			get => Q<TimeSpan>("cluster_manager_timeout");
-			set => Q("cluster_manager_timeout", value);
-		}
-
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public string[] SortByColumns
-		{
-			get => Q<string[]>("s");
-			set => Q("s", value);
-		}
-
-		///<summary>Verbose mode. Display column headers</summary>
-		public bool? Verbose
-		{
-			get => Q<bool? >("v");
-			set => Q("v", value);
-		}
-	}
-
-	///<summary>Request options for Nodes <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodes/</para></summary>
-	public class CatNodesRequestParameters : RequestParameters<CatNodesRequestParameters>
-	{
-		public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
-		public override bool SupportsBody => false;
-		///<summary>The unit in which to display byte values</summary>
-		public Bytes? Bytes
-		{
-			get => Q<Bytes? >("bytes");
-			set => Q("bytes", value);
-		}
-
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public string Format
-		{
-			get => Q<string>("format");
-			set
-			{
-				Q("format", value);
-				SetAcceptHeader(value);
-			}
-		}
-
-		///<summary>Return the full node ID instead of the shortened version (default: false)</summary>
-		public bool? FullId
-		{
-			get => Q<bool? >("full_id");
-			set => Q("full_id", value);
-		}
-
-		///<summary>Comma-separated list of column names to display</summary>
-		public string[] Headers
-		{
-			get => Q<string[]>("h");
-			set => Q("h", value);
-		}
-
-		///<summary>Return help information</summary>
-		public bool? Help
-		{
-			get => Q<bool? >("help");
-			set => Q("help", value);
-		}
-
-		///<summary>Explicit operation timeout for connection to master node</summary>
-		///<remarks>Deprecated as of OpenSearch 2.0, use <see cref="ClusterManagerTimeout"/> instead</remarks>
-		public TimeSpan MasterTimeout
-		{
-			get => Q<TimeSpan>("master_timeout");
-			set => Q("master_timeout", value);
-		}
-
-		///<summary>Explicit operation timeout for connection to cluster_manager node</summary>
-		///<remarks>Introduced in OpenSearch 2.0 instead of <see cref="MasterTimeout"/></remarks>
-		public TimeSpan ClusterManagerTimeout
-		{
-			get => Q<TimeSpan>("cluster_manager_timeout");
-			set => Q("cluster_manager_timeout", value);
-		}
-
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public string[] SortByColumns
-		{
-			get => Q<string[]>("s");
-			set => Q("s", value);
-		}
-
-		///<summary>Verbose mode. Display column headers</summary>
-		public bool? Verbose
-		{
-			get => Q<bool? >("v");
-			set => Q("v", value);
-		}
-	}
-
-	///<summary>Request options for PendingTasks <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-pending-tasks/</para></summary>
-	public class CatPendingTasksRequestParameters : RequestParameters<CatPendingTasksRequestParameters>
-	{
-		public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
-		public override bool SupportsBody => false;
-		///<summary>a short version of the Accept header, e.g. json, yaml</summary>
-		public string Format
-		{
-			get => Q<string>("format");
-			set
-			{
-				Q("format", value);
-				SetAcceptHeader(value);
-			}
-		}
-
-		///<summary>Comma-separated list of column names to display</summary>
-		public string[] Headers
-		{
-			get => Q<string[]>("h");
-			set => Q("h", value);
-		}
-
-		///<summary>Return help information</summary>
-		public bool? Help
-		{
-			get => Q<bool? >("help");
-			set => Q("help", value);
-		}
-
-		///<summary>Return local information, do not retrieve the state from cluster_manager node (default: false)</summary>
-		public bool? Local
-		{
-			get => Q<bool? >("local");
-			set => Q("local", value);
-		}
-
-		///<summary>Explicit operation timeout for connection to master node</summary>
-		///<remarks>Deprecated as of OpenSearch 2.0, use <see cref="ClusterManagerTimeout"/> instead</remarks>
-		public TimeSpan MasterTimeout
-		{
-			get => Q<TimeSpan>("master_timeout");
-			set => Q("master_timeout", value);
-		}
-
-		///<summary>Explicit operation timeout for connection to cluster_manager node</summary>
-		///<remarks>Introduced in OpenSearch 2.0 instead of <see cref="MasterTimeout"/></remarks>
-		public TimeSpan ClusterManagerTimeout
-		{
-			get => Q<TimeSpan>("cluster_manager_timeout");
-			set => Q("cluster_manager_timeout", value);
-		}
-
-		///<summary>Comma-separated list of column names or column aliases to sort by</summary>
-		public string[] SortByColumns
-		{
-			get => Q<string[]>("s");
-			set => Q("s", value);
-		}
-
-		///<summary>Verbose mode. Display column headers</summary>
-		public bool? Verbose
-		{
-			get => Q<bool? >("v");
-			set => Q("v", value);
-		}
-	}
-
 	///<summary>Request options for Plugins <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-plugins/</para></summary>
 	public class CatPluginsRequestParameters : RequestParameters<CatPluginsRequestParameters>
 	{
diff --git a/src/OpenSearch.Net/IOpenSearchLowLevelClient.Generated.cs b/src/OpenSearch.Net/IOpenSearchLowLevelClient.Generated.cs
index a2d1e172e8..83848d4194 100644
--- a/src/OpenSearch.Net/IOpenSearchLowLevelClient.Generated.cs
+++ b/src/OpenSearch.Net/IOpenSearchLowLevelClient.Generated.cs
@@ -66,12 +66,6 @@ namespace OpenSearch.Net
 	///</summary>
 	public partial interface IOpenSearchLowLevelClient
 	{
-		///<summary>Cat APIs</summary>
-		LowLevelCatNamespace Cat
-		{
-			get;
-		}
-
 		///<summary>POST on /_bulk <para>https://opensearch.org/docs/latest/opensearch/rest-api/document-apis/bulk/</para></summary>
 		///<param name = "body">The operation definition and data (action-data pairs), separated by newlines</param>
 		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
diff --git a/src/OpenSearch.Net/OpenSearchLowLevelClient.Cat.cs b/src/OpenSearch.Net/OpenSearchLowLevelClient.Cat.cs
index b5ef5081f2..c15d93dca4 100644
--- a/src/OpenSearch.Net/OpenSearchLowLevelClient.Cat.cs
+++ b/src/OpenSearch.Net/OpenSearchLowLevelClient.Cat.cs
@@ -27,13 +27,13 @@
 */
 // ███╗   ██╗ ██████╗ ████████╗██╗ ██████╗███████╗
 // ████╗  ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝
-// ██╔██╗ ██║██║   ██║   ██║   ██║██║     █████╗  
-// ██║╚██╗██║██║   ██║   ██║   ██║██║     ██╔══╝  
+// ██╔██╗ ██║██║   ██║   ██║   ██║██║     █████╗
+// ██║╚██╗██║██║   ██║   ██║   ██║██║     ██╔══╝
 // ██║ ╚████║╚██████╔╝   ██║   ██║╚██████╗███████╗
 // ╚═╝  ╚═══╝ ╚═════╝    ╚═╝   ╚═╝ ╚═════╝╚══════╝
 // -----------------------------------------------
-//  
-// This file is automatically generated 
+//
+// This file is automatically generated
 // Please do not edit these files manually
 // Run the following in the root of the repos:
 //
@@ -66,183 +66,6 @@ namespace OpenSearch.Net.Specification.CatApi
 	///</summary>
 	public partial class LowLevelCatNamespace : NamespacedClientProxy
 	{
-		internal LowLevelCatNamespace(OpenSearchLowLevelClient client): base(client)
-		{
-		}
-
-		protected override string ContentType
-		{
-			get;
-		}
-
-		= "text/plain";
-		///<summary>GET on /_cat/aliases <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-aliases/</para></summary>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		public TResponse Aliases<TResponse>(CatAliasesRequestParameters requestParameters = null)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequest<TResponse>(GET, "_cat/aliases", null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/aliases <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-aliases/</para></summary>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		[MapsApi("cat.aliases", "")]
-		public Task<TResponse> AliasesAsync<TResponse>(CatAliasesRequestParameters requestParameters = null, CancellationToken ctx = default)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequestAsync<TResponse>(GET, "_cat/aliases", ctx, null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/aliases/{name} <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-aliases/</para></summary>
-		///<param name = "name">A comma-separated list of alias names to return</param>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		public TResponse Aliases<TResponse>(string name, CatAliasesRequestParameters requestParameters = null)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequest<TResponse>(GET, Url($"_cat/aliases/{name:name}"), null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/aliases/{name} <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-aliases/</para></summary>
-		///<param name = "name">A comma-separated list of alias names to return</param>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		[MapsApi("cat.aliases", "name")]
-		public Task<TResponse> AliasesAsync<TResponse>(string name, CatAliasesRequestParameters requestParameters = null, CancellationToken ctx = default)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequestAsync<TResponse>(GET, Url($"_cat/aliases/{name:name}"), ctx, null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/allocation <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-allocation/</para></summary>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		public TResponse Allocation<TResponse>(CatAllocationRequestParameters requestParameters = null)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequest<TResponse>(GET, "_cat/allocation", null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/allocation <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-allocation/</para></summary>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		[MapsApi("cat.allocation", "")]
-		public Task<TResponse> AllocationAsync<TResponse>(CatAllocationRequestParameters requestParameters = null, CancellationToken ctx = default)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequestAsync<TResponse>(GET, "_cat/allocation", ctx, null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/allocation/{node_id} <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-allocation/</para></summary>
-		///<param name = "nodeId">A comma-separated list of node IDs or names to limit the returned information</param>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		public TResponse Allocation<TResponse>(string nodeId, CatAllocationRequestParameters requestParameters = null)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequest<TResponse>(GET, Url($"_cat/allocation/{nodeId:nodeId}"), null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/allocation/{node_id} <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-allocation/</para></summary>
-		///<param name = "nodeId">A comma-separated list of node IDs or names to limit the returned information</param>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		[MapsApi("cat.allocation", "node_id")]
-		public Task<TResponse> AllocationAsync<TResponse>(string nodeId, CatAllocationRequestParameters requestParameters = null, CancellationToken ctx = default)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequestAsync<TResponse>(GET, Url($"_cat/allocation/{nodeId:nodeId}"), ctx, null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/count <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-count/</para></summary>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		public TResponse Count<TResponse>(CatCountRequestParameters requestParameters = null)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequest<TResponse>(GET, "_cat/count", null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/count <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-count/</para></summary>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		[MapsApi("cat.count", "")]
-		public Task<TResponse> CountAsync<TResponse>(CatCountRequestParameters requestParameters = null, CancellationToken ctx = default)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequestAsync<TResponse>(GET, "_cat/count", ctx, null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/count/{index} <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-count/</para></summary>
-		///<param name = "index">A comma-separated list of index names to limit the returned information</param>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		public TResponse Count<TResponse>(string index, CatCountRequestParameters requestParameters = null)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequest<TResponse>(GET, Url($"_cat/count/{index:index}"), null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/count/{index} <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-count/</para></summary>
-		///<param name = "index">A comma-separated list of index names to limit the returned information</param>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		[MapsApi("cat.count", "index")]
-		public Task<TResponse> CountAsync<TResponse>(string index, CatCountRequestParameters requestParameters = null, CancellationToken ctx = default)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequestAsync<TResponse>(GET, Url($"_cat/count/{index:index}"), ctx, null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/fielddata <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-field-data/</para></summary>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		public TResponse Fielddata<TResponse>(CatFielddataRequestParameters requestParameters = null)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequest<TResponse>(GET, "_cat/fielddata", null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/fielddata <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-field-data/</para></summary>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		[MapsApi("cat.fielddata", "")]
-		public Task<TResponse> FielddataAsync<TResponse>(CatFielddataRequestParameters requestParameters = null, CancellationToken ctx = default)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequestAsync<TResponse>(GET, "_cat/fielddata", ctx, null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/fielddata/{fields} <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-field-data/</para></summary>
-		///<param name = "fields">A comma-separated list of fields to return the fielddata size</param>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		public TResponse Fielddata<TResponse>(string fields, CatFielddataRequestParameters requestParameters = null)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequest<TResponse>(GET, Url($"_cat/fielddata/{fields:fields}"), null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/fielddata/{fields} <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-field-data/</para></summary>
-		///<param name = "fields">A comma-separated list of fields to return the fielddata size</param>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		[MapsApi("cat.fielddata", "fields")]
-		public Task<TResponse> FielddataAsync<TResponse>(string fields, CatFielddataRequestParameters requestParameters = null, CancellationToken ctx = default)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequestAsync<TResponse>(GET, Url($"_cat/fielddata/{fields:fields}"), ctx, null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/health <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-health/</para></summary>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		public TResponse Health<TResponse>(CatHealthRequestParameters requestParameters = null)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequest<TResponse>(GET, "_cat/health", null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/health <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-health/</para></summary>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		[MapsApi("cat.health", "")]
-		public Task<TResponse> HealthAsync<TResponse>(CatHealthRequestParameters requestParameters = null, CancellationToken ctx = default)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequestAsync<TResponse>(GET, "_cat/health", ctx, null, RequestParams(requestParameters));
-		///<summary>GET on /_cat <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/index/</para></summary>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		public TResponse Help<TResponse>(CatHelpRequestParameters requestParameters = null)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequest<TResponse>(GET, "_cat", null, RequestParams(requestParameters));
-		///<summary>GET on /_cat <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/index/</para></summary>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		[MapsApi("cat.help", "")]
-		public Task<TResponse> HelpAsync<TResponse>(CatHelpRequestParameters requestParameters = null, CancellationToken ctx = default)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequestAsync<TResponse>(GET, "_cat", ctx, null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/indices <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-indices/</para></summary>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		public TResponse Indices<TResponse>(CatIndicesRequestParameters requestParameters = null)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequest<TResponse>(GET, "_cat/indices", null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/indices <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-indices/</para></summary>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		[MapsApi("cat.indices", "")]
-		public Task<TResponse> IndicesAsync<TResponse>(CatIndicesRequestParameters requestParameters = null, CancellationToken ctx = default)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequestAsync<TResponse>(GET, "_cat/indices", ctx, null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/indices/{index} <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-indices/</para></summary>
-		///<param name = "index">A comma-separated list of index names to limit the returned information</param>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		public TResponse Indices<TResponse>(string index, CatIndicesRequestParameters requestParameters = null)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequest<TResponse>(GET, Url($"_cat/indices/{index:index}"), null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/indices/{index} <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-indices/</para></summary>
-		///<param name = "index">A comma-separated list of index names to limit the returned information</param>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		[MapsApi("cat.indices", "index")]
-		public Task<TResponse> IndicesAsync<TResponse>(string index, CatIndicesRequestParameters requestParameters = null, CancellationToken ctx = default)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequestAsync<TResponse>(GET, Url($"_cat/indices/{index:index}"), ctx, null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/master <para>https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/</para></summary>
-		///<remarks>Deprecated as of OpenSearch 2.0, use <see cref="ClusterManager"/> instead</remarks>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		public TResponse Master<TResponse>(CatMasterRequestParameters requestParameters = null)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequest<TResponse>(GET, "_cat/master", null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/master <para>https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/</para></summary>
-		///<remarks>Deprecated as of OpenSearch 2.0, use <see cref="ClusterManagerAsync"/> instead</remarks>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		[MapsApi("cat.master", "")]
-		public Task<TResponse> MasterAsync<TResponse>(CatMasterRequestParameters requestParameters = null, CancellationToken ctx = default)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequestAsync<TResponse>(GET, "_cat/master", ctx, null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/cluster_manager <para>https://opensearch.org/docs/2.0/opensearch/rest-api/cat/cat-cluster_manager/</para></summary>
-		///<remarks>Introduced in OpenSearch 2.0 instead of <see cref="Master"/></remarks>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		public TResponse ClusterManager<TResponse>(CatClusterManagerRequestParameters requestParameters = null)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequest<TResponse>(GET, "_cat/cluster_manager", null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/cluster_manager <para>https://opensearch.org/docs/2.0/opensearch/rest-api/cat/cat-cluster_manager/</para></summary>
-		///<remarks>Introduced in OpenSearch 2.0 instead of <see cref="MasterAsync"/></remarks>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		[MapsApi("cat.cluster_manager", "")]
-		public Task<TResponse> ClusterManagerAsync<TResponse>(CatClusterManagerRequestParameters requestParameters = null, CancellationToken ctx = default)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequestAsync<TResponse>(GET, "_cat/cluster_manager", ctx, null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/nodeattrs <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodeattrs/</para></summary>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		public TResponse NodeAttributes<TResponse>(CatNodeAttributesRequestParameters requestParameters = null)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequest<TResponse>(GET, "_cat/nodeattrs", null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/nodeattrs <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodeattrs/</para></summary>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		[MapsApi("cat.nodeattrs", "")]
-		public Task<TResponse> NodeAttributesAsync<TResponse>(CatNodeAttributesRequestParameters requestParameters = null, CancellationToken ctx = default)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequestAsync<TResponse>(GET, "_cat/nodeattrs", ctx, null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/nodes <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodes/</para></summary>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		public TResponse Nodes<TResponse>(CatNodesRequestParameters requestParameters = null)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequest<TResponse>(GET, "_cat/nodes", null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/nodes <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodes/</para></summary>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		[MapsApi("cat.nodes", "")]
-		public Task<TResponse> NodesAsync<TResponse>(CatNodesRequestParameters requestParameters = null, CancellationToken ctx = default)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequestAsync<TResponse>(GET, "_cat/nodes", ctx, null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/pending_tasks <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-pending-tasks/</para></summary>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		public TResponse PendingTasks<TResponse>(CatPendingTasksRequestParameters requestParameters = null)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequest<TResponse>(GET, "_cat/pending_tasks", null, RequestParams(requestParameters));
-		///<summary>GET on /_cat/pending_tasks <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-pending-tasks/</para></summary>
-		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		[MapsApi("cat.pending_tasks", "")]
-		public Task<TResponse> PendingTasksAsync<TResponse>(CatPendingTasksRequestParameters requestParameters = null, CancellationToken ctx = default)
-			where TResponse : class, IOpenSearchResponse, new() => DoRequestAsync<TResponse>(GET, "_cat/pending_tasks", ctx, null, RequestParams(requestParameters));
 		///<summary>GET on /_cat/plugins <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-plugins/</para></summary>
 		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
 		public TResponse Plugins<TResponse>(CatPluginsRequestParameters requestParameters = null)
diff --git a/src/OpenSearch.Net/OpenSearchLowLevelClient.NoNamespace.cs b/src/OpenSearch.Net/OpenSearchLowLevelClient.NoNamespace.cs
index f8afe925cd..85eb12f38c 100644
--- a/src/OpenSearch.Net/OpenSearchLowLevelClient.NoNamespace.cs
+++ b/src/OpenSearch.Net/OpenSearchLowLevelClient.NoNamespace.cs
@@ -69,14 +69,6 @@ namespace OpenSearch.Net
 	///</summary>
 	public partial class OpenSearchLowLevelClient : IOpenSearchLowLevelClient
 	{
-		public LowLevelCatNamespace Cat
-		{
-			get;
-			private set;
-		}
-
-		partial void SetupNamespaces() => Cat = new LowLevelCatNamespace(this);
-
 		///<summary>POST on /_bulk <para>https://opensearch.org/docs/latest/opensearch/rest-api/document-apis/bulk/</para></summary>
 		///<param name = "body">The operation definition and data (action-data pairs), separated by newlines</param>
 		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
diff --git a/src/OpenSearch.Net/_Generated/Api/Enums.cs b/src/OpenSearch.Net/_Generated/Api/Enums.cs
index 9cef5115b9..be4655a46f 100644
--- a/src/OpenSearch.Net/_Generated/Api/Enums.cs
+++ b/src/OpenSearch.Net/_Generated/Api/Enums.cs
@@ -241,6 +241,56 @@ public enum ExpandWildcards
         None
     }
 
+    [StringEnum]
+    public enum Bytes
+    {
+        [EnumMember(Value = "b")]
+        B,
+
+        [EnumMember(Value = "k")]
+        K,
+
+        [EnumMember(Value = "kb")]
+        Kb,
+
+        [EnumMember(Value = "m")]
+        M,
+
+        [EnumMember(Value = "mb")]
+        Mb,
+
+        [EnumMember(Value = "g")]
+        G,
+
+        [EnumMember(Value = "gb")]
+        Gb,
+
+        [EnumMember(Value = "t")]
+        T,
+
+        [EnumMember(Value = "tb")]
+        Tb,
+
+        [EnumMember(Value = "p")]
+        P,
+
+        [EnumMember(Value = "pb")]
+        Pb
+    }
+
+    [StringEnum]
+    public enum Health
+    {
+        [EnumMember(Value = "green")]
+        Green,
+
+        [EnumMember(Value = "yellow")]
+        Yellow,
+
+        [EnumMember(Value = "red")]
+        Red
+    }
+
     [StringEnum]
     public enum ClusterHealthLevel
     {
@@ -359,6 +409,8 @@ static partial void RegisterEnumStringResolvers()
                 typeof(ExpandWildcards),
                 e => GetStringValue((ExpandWildcards)e)
             );
+            EnumStringResolvers.TryAdd(typeof(Bytes), e => GetStringValue((Bytes)e));
+            EnumStringResolvers.TryAdd(typeof(Health), e => GetStringValue((Health)e));
             EnumStringResolvers.TryAdd(
                 typeof(ClusterHealthLevel),
                 e => GetStringValue((ClusterHealthLevel)e)
@@ -529,6 +581,54 @@ public static string GetStringValue(this ExpandWildcards enumValue)
             );
         }
 
+        public static string GetStringValue(this Bytes enumValue)
+        {
+            switch (enumValue)
+            {
+                case Bytes.B:
+                    return "b";
+                case Bytes.K:
+                    return "k";
+                case Bytes.Kb:
+                    return "kb";
+                case Bytes.M:
+                    return "m";
+                case Bytes.Mb:
+                    return "mb";
+                case Bytes.G:
+                    return "g";
+                case Bytes.Gb:
+                    return "gb";
+                case Bytes.T:
+                    return "t";
+                case Bytes.Tb:
+                    return "tb";
+                case Bytes.P:
+                    return "p";
+                case Bytes.Pb:
+                    return "pb";
+            }
+            throw new ArgumentException(
+                $"'{enumValue.ToString()}' is not a valid value for enum 'Bytes'"
+            );
+        }
+
+        public static string GetStringValue(this Health enumValue)
+        {
+            switch (enumValue)
+            {
+                case Health.Green:
+                    return "green";
+                case Health.Yellow:
+                    return "yellow";
+                case Health.Red:
+                    return "red";
+            }
+            throw new ArgumentException(
+                $"'{enumValue.ToString()}' is not a valid value for enum 'Health'"
+            );
+        }
+
         public static string GetStringValue(this ClusterHealthLevel enumValue)
         {
             switch (enumValue)
diff --git a/src/OpenSearch.Net/_Generated/Api/RequestParameters/RequestParameters.Cat.cs b/src/OpenSearch.Net/_Generated/Api/RequestParameters/RequestParameters.Cat.cs
new file mode 100644
index 0000000000..138cdec9fa
--- /dev/null
+++ b/src/OpenSearch.Net/_Generated/Api/RequestParameters/RequestParameters.Cat.cs
@@ -0,0 +1,857 @@
+/* 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.
+*
+*  Licensed to Elasticsearch B.V. under one or more contributor
+*  license agreements. See the NOTICE file distributed with
+*  this work for additional information regarding copyright
+*  ownership. Elasticsearch B.V. licenses this file to you under
+*  the Apache License, Version 2.0 (the "License"); you may
+*  not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing,
+*  software distributed under the License is distributed on an
+*  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+*  KIND, either express or implied.  See the License for the
+*  specific language governing permissions and limitations
+*  under the License.
+*/
+// ███╗   ██╗ ██████╗ ████████╗██╗ ██████╗███████╗
+// ████╗  ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝
+// ██╔██╗ ██║██║   ██║   ██║   ██║██║     █████╗
+// ██║╚██╗██║██║   ██║   ██║   ██║██║     ██╔══╝
+// ██║ ╚████║╚██████╔╝   ██║   ██║╚██████╗███████╗
+// ╚═╝  ╚═══╝ ╚═════╝    ╚═╝   ╚═╝ ╚═════╝╚══════╝
+// -----------------------------------------------
+//
+// This file is automatically generated
+// Please do not edit these files manually
+// Run the following in the root of the repos:
+//
+//      *NIX        :   ./build.sh codegen
+//      Windows     :   build.bat codegen
+//
+// -----------------------------------------------
+
+// ReSharper disable RedundantUsingDirective
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+
+// ReSharper disable once CheckNamespace
+namespace OpenSearch.Net.Specification.CatApi
+{
+    /// <summary>Request options for Aliases <para>https://opensearch.org/docs/latest/api-reference/cat/cat-aliases/</para></summary>
+    public partial class CatAliasesRequestParameters
+        : RequestParameters<CatAliasesRequestParameters>
+    {
+        public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
+        public override bool SupportsBody => false;
+
+        /// <summary>Whether to expand wildcard expression to concrete indices that are open, closed or both.</summary>
+        public ExpandWildcards? ExpandWildcards
+        {
+            get => Q<ExpandWildcards?>("expand_wildcards");
+            set => Q("expand_wildcards", value);
+        }
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public string Format
+        {
+            get => Q<string>("format");
+            set
+            {
+                Q("format", value);
+                SetAcceptHeader(value);
+            }
+        }
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public string[] Headers
+        {
+            get => Q<string[]>("h");
+            set => Q("h", value);
+        }
+
+        /// <summary>Return help information.</summary>
+        public bool? Help
+        {
+            get => Q<bool?>("help");
+            set => Q("help", value);
+        }
+
+        /// <summary>Return local information, do not retrieve the state from cluster-manager node.</summary>
+        public bool? Local
+        {
+            get => Q<bool?>("local");
+            set => Q("local", value);
+        }
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public string[] SortByColumns
+        {
+            get => Q<string[]>("s");
+            set => Q("s", value);
+        }
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public bool? Verbose
+        {
+            get => Q<bool?>("v");
+            set => Q("v", value);
+        }
+    }
+
+    /// <summary>Request options for Allocation <para>https://opensearch.org/docs/latest/api-reference/cat/cat-allocation/</para></summary>
+    public partial class CatAllocationRequestParameters
+        : RequestParameters<CatAllocationRequestParameters>
+    {
+        public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
+        public override bool SupportsBody => false;
+
+        /// <summary>The unit in which to display byte values.</summary>
+        public Bytes? Bytes
+        {
+            get => Q<Bytes?>("bytes");
+            set => Q("bytes", value);
+        }
+
+        /// <summary>Operation timeout for connection to cluster-manager node.</summary>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public TimeSpan ClusterManagerTimeout
+        {
+            get => Q<TimeSpan>("cluster_manager_timeout");
+            set => Q("cluster_manager_timeout", value);
+        }
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public string Format
+        {
+            get => Q<string>("format");
+            set
+            {
+                Q("format", value);
+                SetAcceptHeader(value);
+            }
+        }
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public string[] Headers
+        {
+            get => Q<string[]>("h");
+            set => Q("h", value);
+        }
+
+        /// <summary>Return help information.</summary>
+        public bool? Help
+        {
+            get => Q<bool?>("help");
+            set => Q("help", value);
+        }
+
+        /// <summary>Return local information, do not retrieve the state from cluster-manager node.</summary>
+        public bool? Local
+        {
+            get => Q<bool?>("local");
+            set => Q("local", value);
+        }
+
+        /// <summary>Operation timeout for connection to master node.</summary>
+        [Obsolete(
+            "Deprecated as of: 2.0.0, reason: To promote inclusive language, use 'cluster_manager_timeout' instead."
+        )]
+        public TimeSpan MasterTimeout
+        {
+            get => Q<TimeSpan>("master_timeout");
+            set => Q("master_timeout", value);
+        }
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public string[] SortByColumns
+        {
+            get => Q<string[]>("s");
+            set => Q("s", value);
+        }
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public bool? Verbose
+        {
+            get => Q<bool?>("v");
+            set => Q("v", value);
+        }
+    }
+
+    /// <summary>Request options for ClusterManager <para>https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/</para></summary>
+    public partial class CatClusterManagerRequestParameters
+        : RequestParameters<CatClusterManagerRequestParameters>
+    {
+        public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
+        public override bool SupportsBody => false;
+
+        /// <summary>Operation timeout for connection to cluster-manager node.</summary>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public TimeSpan ClusterManagerTimeout
+        {
+            get => Q<TimeSpan>("cluster_manager_timeout");
+            set => Q("cluster_manager_timeout", value);
+        }
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public string Format
+        {
+            get => Q<string>("format");
+            set
+            {
+                Q("format", value);
+                SetAcceptHeader(value);
+            }
+        }
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public string[] Headers
+        {
+            get => Q<string[]>("h");
+            set => Q("h", value);
+        }
+
+        /// <summary>Return help information.</summary>
+        public bool? Help
+        {
+            get => Q<bool?>("help");
+            set => Q("help", value);
+        }
+
+        /// <summary>Return local information, do not retrieve the state from cluster-manager node.</summary>
+        public bool? Local
+        {
+            get => Q<bool?>("local");
+            set => Q("local", value);
+        }
+
+        /// <summary>Operation timeout for connection to master node.</summary>
+        [Obsolete(
+            "Deprecated as of: 2.0.0, reason: To promote inclusive language, use 'cluster_manager_timeout' instead."
+        )]
+        public TimeSpan MasterTimeout
+        {
+            get => Q<TimeSpan>("master_timeout");
+            set => Q("master_timeout", value);
+        }
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public string[] SortByColumns
+        {
+            get => Q<string[]>("s");
+            set => Q("s", value);
+        }
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public bool? Verbose
+        {
+            get => Q<bool?>("v");
+            set => Q("v", value);
+        }
+    }
+
+    /// <summary>Request options for Count <para>https://opensearch.org/docs/latest/api-reference/cat/cat-count/</para></summary>
+    public partial class CatCountRequestParameters : RequestParameters<CatCountRequestParameters>
+    {
+        public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
+        public override bool SupportsBody => false;
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public string Format
+        {
+            get => Q<string>("format");
+            set
+            {
+                Q("format", value);
+                SetAcceptHeader(value);
+            }
+        }
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public string[] Headers
+        {
+            get => Q<string[]>("h");
+            set => Q("h", value);
+        }
+
+        /// <summary>Return help information.</summary>
+        public bool? Help
+        {
+            get => Q<bool?>("help");
+            set => Q("help", value);
+        }
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public string[] SortByColumns
+        {
+            get => Q<string[]>("s");
+            set => Q("s", value);
+        }
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public bool? Verbose
+        {
+            get => Q<bool?>("v");
+            set => Q("v", value);
+        }
+    }
+
+    /// <summary>Request options for Fielddata <para>https://opensearch.org/docs/latest/api-reference/cat/cat-field-data/</para></summary>
+    public partial class CatFielddataRequestParameters
+        : RequestParameters<CatFielddataRequestParameters>
+    {
+        public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
+        public override bool SupportsBody => false;
+
+        /// <summary>The unit in which to display byte values.</summary>
+        public Bytes? Bytes
+        {
+            get => Q<Bytes?>("bytes");
+            set => Q("bytes", value);
+        }
+
+        /// <summary>Comma-separated list of fields to return in the output.</summary>
+        public string[] Fields
+        {
+            get => Q<string[]>("fields");
+            set => Q("fields", value);
+        }
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public string Format
+        {
+            get => Q<string>("format");
+            set
+            {
+                Q("format", value);
+                SetAcceptHeader(value);
+            }
+        }
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public string[] Headers
+        {
+            get => Q<string[]>("h");
+            set => Q("h", value);
+        }
+
+        /// <summary>Return help information.</summary>
+        public bool? Help
+        {
+            get => Q<bool?>("help");
+            set => Q("help", value);
+        }
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public string[] SortByColumns
+        {
+            get => Q<string[]>("s");
+            set => Q("s", value);
+        }
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public bool? Verbose
+        {
+            get => Q<bool?>("v");
+            set => Q("v", value);
+        }
+    }
+
+    /// <summary>Request options for Health <para>https://opensearch.org/docs/latest/api-reference/cat/cat-health/</para></summary>
+    public partial class CatHealthRequestParameters : RequestParameters<CatHealthRequestParameters>
+    {
+        public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
+        public override bool SupportsBody => false;
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public string Format
+        {
+            get => Q<string>("format");
+            set
+            {
+                Q("format", value);
+                SetAcceptHeader(value);
+            }
+        }
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public string[] Headers
+        {
+            get => Q<string[]>("h");
+            set => Q("h", value);
+        }
+
+        /// <summary>Return help information.</summary>
+        public bool? Help
+        {
+            get => Q<bool?>("help");
+            set => Q("help", value);
+        }
+
+        /// <summary>Set to false to disable timestamping.</summary>
+        public bool? IncludeTimestamp
+        {
+            get => Q<bool?>("ts");
+            set => Q("ts", value);
+        }
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public string[] SortByColumns
+        {
+            get => Q<string[]>("s");
+            set => Q("s", value);
+        }
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public bool? Verbose
+        {
+            get => Q<bool?>("v");
+            set => Q("v", value);
+        }
+    }
+
+    /// <summary>Request options for Help <para>https://opensearch.org/docs/latest/api-reference/cat/index/</para></summary>
+    public partial class CatHelpRequestParameters : RequestParameters<CatHelpRequestParameters>
+    {
+        public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
+        public override bool SupportsBody => false;
+
+        /// <summary>Return help information.</summary>
+        public bool? Help
+        {
+            get => Q<bool?>("help");
+            set => Q("help", value);
+        }
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public string[] SortByColumns
+        {
+            get => Q<string[]>("s");
+            set => Q("s", value);
+        }
+    }
+
+    /// <summary>Request options for Indices <para>https://opensearch.org/docs/latest/api-reference/cat/cat-indices/</para></summary>
+    public partial class CatIndicesRequestParameters
+        : RequestParameters<CatIndicesRequestParameters>
+    {
+        public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
+        public override bool SupportsBody => false;
+
+        /// <summary>The unit in which to display byte values.</summary>
+        public Bytes? Bytes
+        {
+            get => Q<Bytes?>("bytes");
+            set => Q("bytes", value);
+        }
+
+        /// <summary>Operation timeout for connection to cluster-manager node.</summary>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public TimeSpan ClusterManagerTimeout
+        {
+            get => Q<TimeSpan>("cluster_manager_timeout");
+            set => Q("cluster_manager_timeout", value);
+        }
+
+        /// <summary>Whether to expand wildcard expression to concrete indices that are open, closed or both.</summary>
+        public ExpandWildcards? ExpandWildcards
+        {
+            get => Q<ExpandWildcards?>("expand_wildcards");
+            set => Q("expand_wildcards", value);
+        }
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public string Format
+        {
+            get => Q<string>("format");
+            set
+            {
+                Q("format", value);
+                SetAcceptHeader(value);
+            }
+        }
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public string[] Headers
+        {
+            get => Q<string[]>("h");
+            set => Q("h", value);
+        }
+
+        /// <summary>Health status ('green', 'yellow', or 'red') to filter only indices matching the specified health status.</summary>
+        public Health? Health
+        {
+            get => Q<Health?>("health");
+            set => Q("health", value);
+        }
+
+        /// <summary>Return help information.</summary>
+        public bool? Help
+        {
+            get => Q<bool?>("help");
+            set => Q("help", value);
+        }
+
+        /// <summary>If set to true segment stats will include stats for segments that are not currently loaded into memory.</summary>
+        public bool? IncludeUnloadedSegments
+        {
+            get => Q<bool?>("include_unloaded_segments");
+            set => Q("include_unloaded_segments", value);
+        }
+
+        /// <summary>Return local information, do not retrieve the state from cluster-manager node.</summary>
+        public bool? Local
+        {
+            get => Q<bool?>("local");
+            set => Q("local", value);
+        }
+
+        /// <summary>Operation timeout for connection to master node.</summary>
+        [Obsolete(
+            "Deprecated as of: 2.0.0, reason: To promote inclusive language, use 'cluster_manager_timeout' instead."
+        )]
+        public TimeSpan MasterTimeout
+        {
+            get => Q<TimeSpan>("master_timeout");
+            set => Q("master_timeout", value);
+        }
+
+        /// <summary>Set to true to return stats only for primary shards.</summary>
+        public bool? Pri
+        {
+            get => Q<bool?>("pri");
+            set => Q("pri", value);
+        }
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public string[] SortByColumns
+        {
+            get => Q<string[]>("s");
+            set => Q("s", value);
+        }
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public bool? Verbose
+        {
+            get => Q<bool?>("v");
+            set => Q("v", value);
+        }
+    }
+
+    /// <summary>Request options for Master <para>https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/</para></summary>
+    public partial class CatMasterRequestParameters : RequestParameters<CatMasterRequestParameters>
+    {
+        public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
+        public override bool SupportsBody => false;
+
+        /// <summary>Operation timeout for connection to cluster-manager node.</summary>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public TimeSpan ClusterManagerTimeout
+        {
+            get => Q<TimeSpan>("cluster_manager_timeout");
+            set => Q("cluster_manager_timeout", value);
+        }
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public string Format
+        {
+            get => Q<string>("format");
+            set
+            {
+                Q("format", value);
+                SetAcceptHeader(value);
+            }
+        }
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public string[] Headers
+        {
+            get => Q<string[]>("h");
+            set => Q("h", value);
+        }
+
+        /// <summary>Return help information.</summary>
+        public bool? Help
+        {
+            get => Q<bool?>("help");
+            set => Q("help", value);
+        }
+
+        /// <summary>Return local information, do not retrieve the state from cluster-manager node.</summary>
+        public bool? Local
+        {
+            get => Q<bool?>("local");
+            set => Q("local", value);
+        }
+
+        /// <summary>Operation timeout for connection to master node.</summary>
+        [Obsolete(
+            "Deprecated as of: 2.0.0, reason: To promote inclusive language, use 'cluster_manager_timeout' instead."
+        )]
+        public TimeSpan MasterTimeout
+        {
+            get => Q<TimeSpan>("master_timeout");
+            set => Q("master_timeout", value);
+        }
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public string[] SortByColumns
+        {
+            get => Q<string[]>("s");
+            set => Q("s", value);
+        }
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public bool? Verbose
+        {
+            get => Q<bool?>("v");
+            set => Q("v", value);
+        }
+    }
+
+    /// <summary>Request options for NodeAttributes <para>https://opensearch.org/docs/latest/api-reference/cat/cat-nodeattrs/</para></summary>
+    public partial class CatNodeAttributesRequestParameters
+        : RequestParameters<CatNodeAttributesRequestParameters>
+    {
+        public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
+        public override bool SupportsBody => false;
+
+        /// <summary>Operation timeout for connection to cluster-manager node.</summary>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public TimeSpan ClusterManagerTimeout
+        {
+            get => Q<TimeSpan>("cluster_manager_timeout");
+            set => Q("cluster_manager_timeout", value);
+        }
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public string Format
+        {
+            get => Q<string>("format");
+            set
+            {
+                Q("format", value);
+                SetAcceptHeader(value);
+            }
+        }
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public string[] Headers
+        {
+            get => Q<string[]>("h");
+            set => Q("h", value);
+        }
+
+        /// <summary>Return help information.</summary>
+        public bool? Help
+        {
+            get => Q<bool?>("help");
+            set => Q("help", value);
+        }
+
+        /// <summary>Return local information, do not retrieve the state from cluster-manager node.</summary>
+        public bool? Local
+        {
+            get => Q<bool?>("local");
+            set => Q("local", value);
+        }
+
+        /// <summary>Operation timeout for connection to master node.</summary>
+        [Obsolete(
+            "Deprecated as of: 2.0.0, reason: To promote inclusive language, use 'cluster_manager_timeout' instead."
+        )]
+        public TimeSpan MasterTimeout
+        {
+            get => Q<TimeSpan>("master_timeout");
+            set => Q("master_timeout", value);
+        }
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public string[] SortByColumns
+        {
+            get => Q<string[]>("s");
+            set => Q("s", value);
+        }
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public bool? Verbose
+        {
+            get => Q<bool?>("v");
+            set => Q("v", value);
+        }
+    }
+
+    /// <summary>Request options for Nodes <para>https://opensearch.org/docs/latest/api-reference/cat/cat-nodes/</para></summary>
+    public partial class CatNodesRequestParameters : RequestParameters<CatNodesRequestParameters>
+    {
+        public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
+        public override bool SupportsBody => false;
+
+        /// <summary>The unit in which to display byte values.</summary>
+        public Bytes? Bytes
+        {
+            get => Q<Bytes?>("bytes");
+            set => Q("bytes", value);
+        }
+
+        /// <summary>Operation timeout for connection to cluster-manager node.</summary>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public TimeSpan ClusterManagerTimeout
+        {
+            get => Q<TimeSpan>("cluster_manager_timeout");
+            set => Q("cluster_manager_timeout", value);
+        }
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public string Format
+        {
+            get => Q<string>("format");
+            set
+            {
+                Q("format", value);
+                SetAcceptHeader(value);
+            }
+        }
+
+        /// <summary>Return the full node ID instead of the shortened version.</summary>
+        public bool? FullId
+        {
+            get => Q<bool?>("full_id");
+            set => Q("full_id", value);
+        }
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public string[] Headers
+        {
+            get => Q<string[]>("h");
+            set => Q("h", value);
+        }
+
+        /// <summary>Return help information.</summary>
+        public bool? Help
+        {
+            get => Q<bool?>("help");
+            set => Q("help", value);
+        }
+
+        /// <summary>Return local information, do not retrieve the state from cluster-manager node.</summary>
+        [Obsolete(
+            "Deprecated as of: 1.0, reason: This parameter does not cause this API to act locally."
+        )]
+        public bool? Local
+        {
+            get => Q<bool?>("local");
+            set => Q("local", value);
+        }
+
+        /// <summary>Operation timeout for connection to master node.</summary>
+        [Obsolete(
+            "Deprecated as of: 2.0.0, reason: To promote inclusive language, use 'cluster_manager_timeout' instead."
+        )]
+        public TimeSpan MasterTimeout
+        {
+            get => Q<TimeSpan>("master_timeout");
+            set => Q("master_timeout", value);
+        }
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public string[] SortByColumns
+        {
+            get => Q<string[]>("s");
+            set => Q("s", value);
+        }
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public bool? Verbose
+        {
+            get => Q<bool?>("v");
+            set => Q("v", value);
+        }
+    }
+
+    /// <summary>Request options for PendingTasks <para>https://opensearch.org/docs/latest/api-reference/cat/cat-pending-tasks/</para></summary>
+    public partial class CatPendingTasksRequestParameters
+        : RequestParameters<CatPendingTasksRequestParameters>
+    {
+        public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
+        public override bool SupportsBody => false;
+
+        /// <summary>Operation timeout for connection to cluster-manager node.</summary>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public TimeSpan ClusterManagerTimeout
+        {
+            get => Q<TimeSpan>("cluster_manager_timeout");
+            set => Q("cluster_manager_timeout", value);
+        }
+
+        /// <summary>A short version of the Accept header, e.g. json, yaml.</summary>
+        public string Format
+        {
+            get => Q<string>("format");
+            set
+            {
+                Q("format", value);
+                SetAcceptHeader(value);
+            }
+        }
+
+        /// <summary>Comma-separated list of column names to display.</summary>
+        public string[] Headers
+        {
+            get => Q<string[]>("h");
+            set => Q("h", value);
+        }
+
+        /// <summary>Return help information.</summary>
+        public bool? Help
+        {
+            get => Q<bool?>("help");
+            set => Q("help", value);
+        }
+
+        /// <summary>Return local information, do not retrieve the state from cluster-manager node.</summary>
+        public bool? Local
+        {
+            get => Q<bool?>("local");
+            set => Q("local", value);
+        }
+
+        /// <summary>Operation timeout for connection to master node.</summary>
+        [Obsolete(
+            "Deprecated as of: 2.0.0, reason: To promote inclusive language, use 'cluster_manager_timeout' instead."
+        )]
+        public TimeSpan MasterTimeout
+        {
+            get => Q<TimeSpan>("master_timeout");
+            set => Q("master_timeout", value);
+        }
+
+        /// <summary>Comma-separated list of column names or column aliases to sort by.</summary>
+        public string[] SortByColumns
+        {
+            get => Q<string[]>("s");
+            set => Q("s", value);
+        }
+
+        /// <summary>Verbose mode. Display column headers.</summary>
+        public bool? Verbose
+        {
+            get => Q<bool?>("v");
+            set => Q("v", value);
+        }
+    }
+}
diff --git a/src/OpenSearch.Net/_Generated/IOpenSearchLowLevelClient.cs b/src/OpenSearch.Net/_Generated/IOpenSearchLowLevelClient.cs
index 8d7f5692b3..cc99433fef 100644
--- a/src/OpenSearch.Net/_Generated/IOpenSearchLowLevelClient.cs
+++ b/src/OpenSearch.Net/_Generated/IOpenSearchLowLevelClient.cs
@@ -50,6 +50,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using OpenSearch.Net;
+using OpenSearch.Net.Specification.CatApi;
 using OpenSearch.Net.Specification.ClusterApi;
 using OpenSearch.Net.Specification.DanglingIndicesApi;
 using OpenSearch.Net.Specification.HttpApi;
@@ -66,6 +67,9 @@ namespace OpenSearch.Net
     /// </summary>
     public partial interface IOpenSearchLowLevelClient
     {
+        /// <summary>Cat APIs</summary>
+        LowLevelCatNamespace Cat { get; }
+
         /// <summary>Cluster APIs</summary>
         LowLevelClusterNamespace Cluster { get; }
 
diff --git a/src/OpenSearch.Net/_Generated/OpenSearchLowLevelClient.Cat.cs b/src/OpenSearch.Net/_Generated/OpenSearchLowLevelClient.Cat.cs
new file mode 100644
index 0000000000..283fc2ba5c
--- /dev/null
+++ b/src/OpenSearch.Net/_Generated/OpenSearchLowLevelClient.Cat.cs
@@ -0,0 +1,520 @@
+/* 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.
+*
+*  Licensed to Elasticsearch B.V. under one or more contributor
+*  license agreements. See the NOTICE file distributed with
+*  this work for additional information regarding copyright
+*  ownership. Elasticsearch B.V. licenses this file to you under
+*  the Apache License, Version 2.0 (the "License"); you may
+*  not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing,
+*  software distributed under the License is distributed on an
+*  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+*  KIND, either express or implied.  See the License for the
+*  specific language governing permissions and limitations
+*  under the License.
+*/
+// ███╗   ██╗ ██████╗ ████████╗██╗ ██████╗███████╗
+// ████╗  ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝
+// ██╔██╗ ██║██║   ██║   ██║   ██║██║     █████╗
+// ██║╚██╗██║██║   ██║   ██║   ██║██║     ██╔══╝
+// ██║ ╚████║╚██████╔╝   ██║   ██║╚██████╗███████╗
+// ╚═╝  ╚═══╝ ╚═════╝    ╚═╝   ╚═╝ ╚═════╝╚══════╝
+// -----------------------------------------------
+//
+// This file is automatically generated
+// Please do not edit these files manually
+// Run the following in the root of the repos:
+//
+//      *NIX        :   ./build.sh codegen
+//      Windows     :   build.bat codegen
+//
+// -----------------------------------------------
+// ReSharper disable RedundantUsingDirective
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using OpenSearch.Net;
+using static OpenSearch.Net.HttpMethod;
+
+// ReSharper disable InterpolatedStringExpressionIsNotIFormattable
+// ReSharper disable once CheckNamespace
+// ReSharper disable InterpolatedStringExpressionIsNotIFormattable
+// ReSharper disable RedundantExtendsListEntry
+namespace OpenSearch.Net.Specification.CatApi
+{
+    /// <summary>
+    /// Cat APIs.
+    /// <para>Not intended to be instantiated directly. Use the <see cref="IOpenSearchLowLevelClient.Cat"/> property
+    /// on <see cref="IOpenSearchLowLevelClient"/>.
+    /// </para>
+    /// </summary>
+    public partial class LowLevelCatNamespace : NamespacedClientProxy
+    {
+        internal LowLevelCatNamespace(OpenSearchLowLevelClient client)
+            : base(client) { }
+
+        protected override string ContentType => "text/plain";
+
+        /// <summary>GET on /_cat/aliases <para>https://opensearch.org/docs/latest/api-reference/cat/cat-aliases/</para></summary>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        public TResponse Aliases<TResponse>(CatAliasesRequestParameters requestParameters = null)
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequest<TResponse>(GET, "_cat/aliases", null, RequestParams(requestParameters));
+
+        /// <summary>GET on /_cat/aliases <para>https://opensearch.org/docs/latest/api-reference/cat/cat-aliases/</para></summary>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        [MapsApi("cat.aliases", "")]
+        public Task<TResponse> AliasesAsync<TResponse>(
+            CatAliasesRequestParameters requestParameters = null,
+            CancellationToken ctx = default
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequestAsync<TResponse>(
+                GET,
+                "_cat/aliases",
+                ctx,
+                null,
+                RequestParams(requestParameters)
+            );
+
+        /// <summary>GET on /_cat/aliases/{name} <para>https://opensearch.org/docs/latest/api-reference/cat/cat-aliases/</para></summary>
+        /// <param name="name">Comma-separated list of alias names.</param>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        public TResponse Aliases<TResponse>(
+            string name,
+            CatAliasesRequestParameters requestParameters = null
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequest<TResponse>(
+                GET,
+                Url($"_cat/aliases/{name:name}"),
+                null,
+                RequestParams(requestParameters)
+            );
+
+        /// <summary>GET on /_cat/aliases/{name} <para>https://opensearch.org/docs/latest/api-reference/cat/cat-aliases/</para></summary>
+        /// <param name="name">Comma-separated list of alias names.</param>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        [MapsApi("cat.aliases", "name")]
+        public Task<TResponse> AliasesAsync<TResponse>(
+            string name,
+            CatAliasesRequestParameters requestParameters = null,
+            CancellationToken ctx = default
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequestAsync<TResponse>(
+                GET,
+                Url($"_cat/aliases/{name:name}"),
+                ctx,
+                null,
+                RequestParams(requestParameters)
+            );
+
+        /// <summary>GET on /_cat/allocation <para>https://opensearch.org/docs/latest/api-reference/cat/cat-allocation/</para></summary>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        public TResponse Allocation<TResponse>(
+            CatAllocationRequestParameters requestParameters = null
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequest<TResponse>(GET, "_cat/allocation", null, RequestParams(requestParameters));
+
+        /// <summary>GET on /_cat/allocation <para>https://opensearch.org/docs/latest/api-reference/cat/cat-allocation/</para></summary>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        [MapsApi("cat.allocation", "")]
+        public Task<TResponse> AllocationAsync<TResponse>(
+            CatAllocationRequestParameters requestParameters = null,
+            CancellationToken ctx = default
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequestAsync<TResponse>(
+                GET,
+                "_cat/allocation",
+                ctx,
+                null,
+                RequestParams(requestParameters)
+            );
+
+        /// <summary>GET on /_cat/allocation/{node_id} <para>https://opensearch.org/docs/latest/api-reference/cat/cat-allocation/</para></summary>
+        /// <param name="nodeId">Comma-separated list of node IDs or names to limit the returned information.</param>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        public TResponse Allocation<TResponse>(
+            string nodeId,
+            CatAllocationRequestParameters requestParameters = null
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequest<TResponse>(
+                GET,
+                Url($"_cat/allocation/{nodeId:nodeId}"),
+                null,
+                RequestParams(requestParameters)
+            );
+
+        /// <summary>GET on /_cat/allocation/{node_id} <para>https://opensearch.org/docs/latest/api-reference/cat/cat-allocation/</para></summary>
+        /// <param name="nodeId">Comma-separated list of node IDs or names to limit the returned information.</param>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        [MapsApi("cat.allocation", "node_id")]
+        public Task<TResponse> AllocationAsync<TResponse>(
+            string nodeId,
+            CatAllocationRequestParameters requestParameters = null,
+            CancellationToken ctx = default
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequestAsync<TResponse>(
+                GET,
+                Url($"_cat/allocation/{nodeId:nodeId}"),
+                ctx,
+                null,
+                RequestParams(requestParameters)
+            );
+
+        /// <summary>GET on /_cat/cluster_manager <para>https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/</para></summary>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        public TResponse ClusterManager<TResponse>(
+            CatClusterManagerRequestParameters requestParameters = null
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequest<TResponse>(
+                GET,
+                "_cat/cluster_manager",
+                null,
+                RequestParams(requestParameters)
+            );
+
+        /// <summary>GET on /_cat/cluster_manager <para>https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/</para></summary>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        /// <remarks>Supported by OpenSearch servers of version 2.0.0 or greater.</remarks>
+        [MapsApi("cat.cluster_manager", "")]
+        public Task<TResponse> ClusterManagerAsync<TResponse>(
+            CatClusterManagerRequestParameters requestParameters = null,
+            CancellationToken ctx = default
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequestAsync<TResponse>(
+                GET,
+                "_cat/cluster_manager",
+                ctx,
+                null,
+                RequestParams(requestParameters)
+            );
+
+        /// <summary>GET on /_cat/count <para>https://opensearch.org/docs/latest/api-reference/cat/cat-count/</para></summary>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        public TResponse Count<TResponse>(CatCountRequestParameters requestParameters = null)
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequest<TResponse>(GET, "_cat/count", null, RequestParams(requestParameters));
+
+        /// <summary>GET on /_cat/count <para>https://opensearch.org/docs/latest/api-reference/cat/cat-count/</para></summary>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        [MapsApi("cat.count", "")]
+        public Task<TResponse> CountAsync<TResponse>(
+            CatCountRequestParameters requestParameters = null,
+            CancellationToken ctx = default
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequestAsync<TResponse>(
+                GET,
+                "_cat/count",
+                ctx,
+                null,
+                RequestParams(requestParameters)
+            );
+
+        /// <summary>GET on /_cat/count/{index} <para>https://opensearch.org/docs/latest/api-reference/cat/cat-count/</para></summary>
+        /// <param name="index">Comma-separated list of indices to limit the returned information.</param>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        public TResponse Count<TResponse>(
+            string index,
+            CatCountRequestParameters requestParameters = null
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequest<TResponse>(
+                GET,
+                Url($"_cat/count/{index:index}"),
+                null,
+                RequestParams(requestParameters)
+            );
+
+        /// <summary>GET on /_cat/count/{index} <para>https://opensearch.org/docs/latest/api-reference/cat/cat-count/</para></summary>
+        /// <param name="index">Comma-separated list of indices to limit the returned information.</param>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        [MapsApi("cat.count", "index")]
+        public Task<TResponse> CountAsync<TResponse>(
+            string index,
+            CatCountRequestParameters requestParameters = null,
+            CancellationToken ctx = default
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequestAsync<TResponse>(
+                GET,
+                Url($"_cat/count/{index:index}"),
+                ctx,
+                null,
+                RequestParams(requestParameters)
+            );
+
+        /// <summary>GET on /_cat/fielddata <para>https://opensearch.org/docs/latest/api-reference/cat/cat-field-data/</para></summary>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        public TResponse Fielddata<TResponse>(
+            CatFielddataRequestParameters requestParameters = null
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequest<TResponse>(GET, "_cat/fielddata", null, RequestParams(requestParameters));
+
+        /// <summary>GET on /_cat/fielddata <para>https://opensearch.org/docs/latest/api-reference/cat/cat-field-data/</para></summary>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        [MapsApi("cat.fielddata", "")]
+        public Task<TResponse> FielddataAsync<TResponse>(
+            CatFielddataRequestParameters requestParameters = null,
+            CancellationToken ctx = default
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequestAsync<TResponse>(
+                GET,
+                "_cat/fielddata",
+                ctx,
+                null,
+                RequestParams(requestParameters)
+            );
+
+        /// <summary>GET on /_cat/fielddata/{fields} <para>https://opensearch.org/docs/latest/api-reference/cat/cat-field-data/</para></summary>
+        /// <param name="fields">Comma-separated list of fields to return the fielddata size.</param>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        public TResponse Fielddata<TResponse>(
+            string fields,
+            CatFielddataRequestParameters requestParameters = null
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequest<TResponse>(
+                GET,
+                Url($"_cat/fielddata/{fields:fields}"),
+                null,
+                RequestParams(requestParameters)
+            );
+
+        /// <summary>GET on /_cat/fielddata/{fields} <para>https://opensearch.org/docs/latest/api-reference/cat/cat-field-data/</para></summary>
+        /// <param name="fields">Comma-separated list of fields to return the fielddata size.</param>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        [MapsApi("cat.fielddata", "fields")]
+        public Task<TResponse> FielddataAsync<TResponse>(
+            string fields,
+            CatFielddataRequestParameters requestParameters = null,
+            CancellationToken ctx = default
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequestAsync<TResponse>(
+                GET,
+                Url($"_cat/fielddata/{fields:fields}"),
+                ctx,
+                null,
+                RequestParams(requestParameters)
+            );
+
+        /// <summary>GET on /_cat/health <para>https://opensearch.org/docs/latest/api-reference/cat/cat-health/</para></summary>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        public TResponse Health<TResponse>(CatHealthRequestParameters requestParameters = null)
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequest<TResponse>(GET, "_cat/health", null, RequestParams(requestParameters));
+
+        /// <summary>GET on /_cat/health <para>https://opensearch.org/docs/latest/api-reference/cat/cat-health/</para></summary>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        [MapsApi("cat.health", "")]
+        public Task<TResponse> HealthAsync<TResponse>(
+            CatHealthRequestParameters requestParameters = null,
+            CancellationToken ctx = default
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequestAsync<TResponse>(
+                GET,
+                "_cat/health",
+                ctx,
+                null,
+                RequestParams(requestParameters)
+            );
+
+        /// <summary>GET on /_cat <para>https://opensearch.org/docs/latest/api-reference/cat/index/</para></summary>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        public TResponse Help<TResponse>(CatHelpRequestParameters requestParameters = null)
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequest<TResponse>(GET, "_cat", null, RequestParams(requestParameters));
+
+        /// <summary>GET on /_cat <para>https://opensearch.org/docs/latest/api-reference/cat/index/</para></summary>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        [MapsApi("cat.help", "")]
+        public Task<TResponse> HelpAsync<TResponse>(
+            CatHelpRequestParameters requestParameters = null,
+            CancellationToken ctx = default
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequestAsync<TResponse>(GET, "_cat", ctx, null, RequestParams(requestParameters));
+
+        /// <summary>GET on /_cat/indices <para>https://opensearch.org/docs/latest/api-reference/cat/cat-indices/</para></summary>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        public TResponse Indices<TResponse>(CatIndicesRequestParameters requestParameters = null)
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequest<TResponse>(GET, "_cat/indices", null, RequestParams(requestParameters));
+
+        /// <summary>GET on /_cat/indices <para>https://opensearch.org/docs/latest/api-reference/cat/cat-indices/</para></summary>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        [MapsApi("cat.indices", "")]
+        public Task<TResponse> IndicesAsync<TResponse>(
+            CatIndicesRequestParameters requestParameters = null,
+            CancellationToken ctx = default
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequestAsync<TResponse>(
+                GET,
+                "_cat/indices",
+                ctx,
+                null,
+                RequestParams(requestParameters)
+            );
+
+        /// <summary>GET on /_cat/indices/{index} <para>https://opensearch.org/docs/latest/api-reference/cat/cat-indices/</para></summary>
+        /// <param name="index">Comma-separated list of indices to limit the returned information.</param>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        public TResponse Indices<TResponse>(
+            string index,
+            CatIndicesRequestParameters requestParameters = null
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequest<TResponse>(
+                GET,
+                Url($"_cat/indices/{index:index}"),
+                null,
+                RequestParams(requestParameters)
+            );
+
+        /// <summary>GET on /_cat/indices/{index} <para>https://opensearch.org/docs/latest/api-reference/cat/cat-indices/</para></summary>
+        /// <param name="index">Comma-separated list of indices to limit the returned information.</param>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        [MapsApi("cat.indices", "index")]
+        public Task<TResponse> IndicesAsync<TResponse>(
+            string index,
+            CatIndicesRequestParameters requestParameters = null,
+            CancellationToken ctx = default
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequestAsync<TResponse>(
+                GET,
+                Url($"_cat/indices/{index:index}"),
+                ctx,
+                null,
+                RequestParams(requestParameters)
+            );
+
+        /// <summary>GET on /_cat/master <para>https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/</para></summary>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        [Obsolete(
+            "Deprecated in version 2.0: To promote inclusive language, please use '/_cat/cluster_manager' instead."
+        )]
+        public TResponse Master<TResponse>(CatMasterRequestParameters requestParameters = null)
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequest<TResponse>(GET, "_cat/master", null, RequestParams(requestParameters));
+
+        /// <summary>GET on /_cat/master <para>https://opensearch.org/docs/latest/api-reference/cat/cat-cluster_manager/</para></summary>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        [Obsolete(
+            "Deprecated in version 2.0: To promote inclusive language, please use '/_cat/cluster_manager' instead."
+        )]
+        [MapsApi("cat.master", "")]
+        public Task<TResponse> MasterAsync<TResponse>(
+            CatMasterRequestParameters requestParameters = null,
+            CancellationToken ctx = default
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequestAsync<TResponse>(
+                GET,
+                "_cat/master",
+                ctx,
+                null,
+                RequestParams(requestParameters)
+            );
+
+        /// <summary>GET on /_cat/nodeattrs <para>https://opensearch.org/docs/latest/api-reference/cat/cat-nodeattrs/</para></summary>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        public TResponse NodeAttributes<TResponse>(
+            CatNodeAttributesRequestParameters requestParameters = null
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequest<TResponse>(GET, "_cat/nodeattrs", null, RequestParams(requestParameters));
+
+        /// <summary>GET on /_cat/nodeattrs <para>https://opensearch.org/docs/latest/api-reference/cat/cat-nodeattrs/</para></summary>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        [MapsApi("cat.nodeattrs", "")]
+        public Task<TResponse> NodeAttributesAsync<TResponse>(
+            CatNodeAttributesRequestParameters requestParameters = null,
+            CancellationToken ctx = default
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequestAsync<TResponse>(
+                GET,
+                "_cat/nodeattrs",
+                ctx,
+                null,
+                RequestParams(requestParameters)
+            );
+
+        /// <summary>GET on /_cat/nodes <para>https://opensearch.org/docs/latest/api-reference/cat/cat-nodes/</para></summary>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        public TResponse Nodes<TResponse>(CatNodesRequestParameters requestParameters = null)
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequest<TResponse>(GET, "_cat/nodes", null, RequestParams(requestParameters));
+
+        /// <summary>GET on /_cat/nodes <para>https://opensearch.org/docs/latest/api-reference/cat/cat-nodes/</para></summary>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        [MapsApi("cat.nodes", "")]
+        public Task<TResponse> NodesAsync<TResponse>(
+            CatNodesRequestParameters requestParameters = null,
+            CancellationToken ctx = default
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequestAsync<TResponse>(
+                GET,
+                "_cat/nodes",
+                ctx,
+                null,
+                RequestParams(requestParameters)
+            );
+
+        /// <summary>GET on /_cat/pending_tasks <para>https://opensearch.org/docs/latest/api-reference/cat/cat-pending-tasks/</para></summary>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        public TResponse PendingTasks<TResponse>(
+            CatPendingTasksRequestParameters requestParameters = null
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequest<TResponse>(GET, "_cat/pending_tasks", null, RequestParams(requestParameters));
+
+        /// <summary>GET on /_cat/pending_tasks <para>https://opensearch.org/docs/latest/api-reference/cat/cat-pending-tasks/</para></summary>
+        /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
+        [MapsApi("cat.pending_tasks", "")]
+        public Task<TResponse> PendingTasksAsync<TResponse>(
+            CatPendingTasksRequestParameters requestParameters = null,
+            CancellationToken ctx = default
+        )
+            where TResponse : class, IOpenSearchResponse, new() =>
+            DoRequestAsync<TResponse>(
+                GET,
+                "_cat/pending_tasks",
+                ctx,
+                null,
+                RequestParams(requestParameters)
+            );
+    }
+}
diff --git a/src/OpenSearch.Net/_Generated/OpenSearchLowLevelClient.cs b/src/OpenSearch.Net/_Generated/OpenSearchLowLevelClient.cs
index 3b60d35f12..23812f522c 100644
--- a/src/OpenSearch.Net/_Generated/OpenSearchLowLevelClient.cs
+++ b/src/OpenSearch.Net/_Generated/OpenSearchLowLevelClient.cs
@@ -50,6 +50,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using OpenSearch.Net;
+using OpenSearch.Net.Specification.CatApi;
 using OpenSearch.Net.Specification.ClusterApi;
 using OpenSearch.Net.Specification.DanglingIndicesApi;
 using OpenSearch.Net.Specification.HttpApi;
@@ -69,6 +70,7 @@ namespace OpenSearch.Net
     /// </summary>
     public partial class OpenSearchLowLevelClient : IOpenSearchLowLevelClient
     {
+        public LowLevelCatNamespace Cat { get; private set; }
         public LowLevelClusterNamespace Cluster { get; private set; }
         public LowLevelDanglingIndicesNamespace DanglingIndices { get; private set; }
         public LowLevelIndicesNamespace Indices { get; private set; }
@@ -80,6 +82,7 @@ public partial class OpenSearchLowLevelClient : IOpenSearchLowLevelClient
 
         partial void SetupGeneratedNamespaces()
         {
+            Cat = new LowLevelCatNamespace(this);
             Cluster = new LowLevelClusterNamespace(this);
             DanglingIndices = new LowLevelDanglingIndicesNamespace(this);
             Indices = new LowLevelIndicesNamespace(this);
diff --git a/tests/Tests.Reproduce/GithubIssue4243.cs b/tests/Tests.Reproduce/GithubIssue4243.cs
index 8bdefd27f5..865fa360ef 100644
--- a/tests/Tests.Reproduce/GithubIssue4243.cs
+++ b/tests/Tests.Reproduce/GithubIssue4243.cs
@@ -47,7 +47,9 @@ public async Task UsingFormatJsonIsSuccessfulResponse()
 			var lowLevelClient = _cluster.Client.LowLevel;
 
 			var response = _cluster.ClusterConfiguration.Version < "2.0.0"
+#pragma warning disable CS0618 // Type or member is obsolete
 				? await lowLevelClient.Cat.MasterAsync<StringResponse>(new CatMasterRequestParameters { Format = "JSON" })
+#pragma warning restore CS0618 // Type or member is obsolete
 				: await lowLevelClient.Cat.ClusterManagerAsync<StringResponse>(new CatClusterManagerRequestParameters { Format = "JSON" });
 
 			response.Success.Should().BeTrue();
diff --git a/tests/Tests/Cat/CatMaster/CatMasterApiTests.cs b/tests/Tests/Cat/CatMaster/CatMasterApiTests.cs
index b264b16ae1..899a113f36 100644
--- a/tests/Tests/Cat/CatMaster/CatMasterApiTests.cs
+++ b/tests/Tests/Cat/CatMaster/CatMasterApiTests.cs
@@ -33,6 +33,7 @@
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 namespace Tests.Cat.CatMaster
 {
diff --git a/tests/Tests/Cat/CatMaster/CatMasterUrlTests.cs b/tests/Tests/Cat/CatMaster/CatMasterUrlTests.cs
index 932e9b1f47..62477e5c75 100644
--- a/tests/Tests/Cat/CatMaster/CatMasterUrlTests.cs
+++ b/tests/Tests/Cat/CatMaster/CatMasterUrlTests.cs
@@ -31,6 +31,7 @@
 using OpenSearch.Client;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 namespace Tests.Cat.CatMaster
 {