diff --git a/output/openapi/elasticsearch-openapi.json b/output/openapi/elasticsearch-openapi.json
index 1292a8d040..2c5fd1f407 100644
--- a/output/openapi/elasticsearch-openapi.json
+++ b/output/openapi/elasticsearch-openapi.json
@@ -1153,9 +1153,6 @@
         "description": "Get a snapshot of the number of shards allocated to each data node and their disk space.\n\nIMPORTANT: CAT APIs are only intended for human consumption using the command line or Kibana console. They are not intended for use by applications.\n\n## Required authorization\n\n* Cluster privileges: `monitor`\n",
         "operationId": "cat-allocation",
         "parameters": [
-          {
-            "$ref": "#/components/parameters/cat.allocation-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.allocation-h"
           },
@@ -1195,9 +1192,6 @@
           {
             "$ref": "#/components/parameters/cat.allocation-node_id"
           },
-          {
-            "$ref": "#/components/parameters/cat.allocation-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.allocation-h"
           },
@@ -1372,9 +1366,6 @@
         "description": "Get the amount of heap memory currently used by the field data cache on every data node in the cluster.\n\nIMPORTANT: cat APIs are only intended for human consumption using the command line or Kibana console.\nThey are not intended for use by applications. For application consumption, use the nodes stats API.\n\n## Required authorization\n\n* Cluster privileges: `monitor`\n",
         "operationId": "cat-fielddata",
         "parameters": [
-          {
-            "$ref": "#/components/parameters/cat.fielddata-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.fielddata-fields_"
           },
@@ -1411,9 +1402,6 @@
           {
             "$ref": "#/components/parameters/cat.fielddata-fields"
           },
-          {
-            "$ref": "#/components/parameters/cat.fielddata-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.fielddata-fields_"
           },
@@ -1447,16 +1435,6 @@
         "description": "IMPORTANT: CAT APIs are only intended for human consumption using the command line or Kibana console.\nThey are not intended for use by applications. For application consumption, use the cluster health API.\nThis API is often used to check malfunctioning clusters.\nTo help you track cluster health alongside log files and alerting systems, the API returns timestamps in two formats:\n`HH:MM:SS`, which is human-readable but includes no date information;\n`Unix epoch time`, which is machine-sortable and includes date information.\nThe latter format is useful for cluster recoveries that take multiple days.\nYou can use the cat health API to verify cluster health across multiple nodes.\nYou also can use the API to track the recovery of a large cluster over a longer period of time.\n\n## Required authorization\n\n* Cluster privileges: `monitor`\n",
         "operationId": "cat-health",
         "parameters": [
-          {
-            "in": "query",
-            "name": "time",
-            "description": "The unit used to display time values.",
-            "deprecated": false,
-            "schema": {
-              "$ref": "#/components/schemas/_types.TimeUnit"
-            },
-            "style": "form"
-          },
           {
             "in": "query",
             "name": "ts",
@@ -1556,9 +1534,6 @@
         "description": "Get high-level information about indices in a cluster, including backing indices for data streams.\n\nUse this request to get the following information for each index in a cluster:\n- shard count\n- document count\n- deleted document count\n- primary store size\n- total store size of all shards, including shard replicas\n\nThese metrics are retrieved directly from Lucene, which Elasticsearch uses internally to power indexing and search. As a result, all document counts include hidden nested documents.\nTo get an accurate count of Elasticsearch documents, use the cat count or count APIs.\n\nCAT APIs are only intended for human consumption using the command line or Kibana console.\nThey are not intended for use by applications. For application consumption, use an index endpoint.\n\n## Required authorization\n\n* Index privileges: `monitor`\n* Cluster privileges: `monitor`\n",
         "operationId": "cat-indices",
         "parameters": [
-          {
-            "$ref": "#/components/parameters/cat.indices-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.indices-expand_wildcards"
           },
@@ -1571,9 +1546,6 @@
           {
             "$ref": "#/components/parameters/cat.indices-pri"
           },
-          {
-            "$ref": "#/components/parameters/cat.indices-time"
-          },
           {
             "$ref": "#/components/parameters/cat.indices-master_timeout"
           },
@@ -1610,9 +1582,6 @@
           {
             "$ref": "#/components/parameters/cat.indices-index"
           },
-          {
-            "$ref": "#/components/parameters/cat.indices-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.indices-expand_wildcards"
           },
@@ -1625,9 +1594,6 @@
           {
             "$ref": "#/components/parameters/cat.indices-pri"
           },
-          {
-            "$ref": "#/components/parameters/cat.indices-time"
-          },
           {
             "$ref": "#/components/parameters/cat.indices-master_timeout"
           },
@@ -1744,17 +1710,11 @@
           {
             "$ref": "#/components/parameters/cat.ml_data_frame_analytics-allow_no_match"
           },
-          {
-            "$ref": "#/components/parameters/cat.ml_data_frame_analytics-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.ml_data_frame_analytics-h"
           },
           {
             "$ref": "#/components/parameters/cat.ml_data_frame_analytics-s"
-          },
-          {
-            "$ref": "#/components/parameters/cat.ml_data_frame_analytics-time"
           }
         ],
         "responses": {
@@ -1786,17 +1746,11 @@
           {
             "$ref": "#/components/parameters/cat.ml_data_frame_analytics-allow_no_match"
           },
-          {
-            "$ref": "#/components/parameters/cat.ml_data_frame_analytics-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.ml_data_frame_analytics-h"
           },
           {
             "$ref": "#/components/parameters/cat.ml_data_frame_analytics-s"
-          },
-          {
-            "$ref": "#/components/parameters/cat.ml_data_frame_analytics-time"
           }
         ],
         "responses": {
@@ -1830,9 +1784,6 @@
           },
           {
             "$ref": "#/components/parameters/cat.ml_datafeeds-s"
-          },
-          {
-            "$ref": "#/components/parameters/cat.ml_datafeeds-time"
           }
         ],
         "responses": {
@@ -1869,9 +1820,6 @@
           },
           {
             "$ref": "#/components/parameters/cat.ml_datafeeds-s"
-          },
-          {
-            "$ref": "#/components/parameters/cat.ml_datafeeds-time"
           }
         ],
         "responses": {
@@ -1900,17 +1848,11 @@
           {
             "$ref": "#/components/parameters/cat.ml_jobs-allow_no_match"
           },
-          {
-            "$ref": "#/components/parameters/cat.ml_jobs-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.ml_jobs-h"
           },
           {
             "$ref": "#/components/parameters/cat.ml_jobs-s"
-          },
-          {
-            "$ref": "#/components/parameters/cat.ml_jobs-time"
           }
         ],
         "responses": {
@@ -1942,17 +1884,11 @@
           {
             "$ref": "#/components/parameters/cat.ml_jobs-allow_no_match"
           },
-          {
-            "$ref": "#/components/parameters/cat.ml_jobs-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.ml_jobs-h"
           },
           {
             "$ref": "#/components/parameters/cat.ml_jobs-s"
-          },
-          {
-            "$ref": "#/components/parameters/cat.ml_jobs-time"
           }
         ],
         "responses": {
@@ -1981,9 +1917,6 @@
           {
             "$ref": "#/components/parameters/cat.ml_trained_models-allow_no_match"
           },
-          {
-            "$ref": "#/components/parameters/cat.ml_trained_models-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.ml_trained_models-h"
           },
@@ -1995,9 +1928,6 @@
           },
           {
             "$ref": "#/components/parameters/cat.ml_trained_models-size"
-          },
-          {
-            "$ref": "#/components/parameters/cat.ml_trained_models-time"
           }
         ],
         "responses": {
@@ -2029,9 +1959,6 @@
           {
             "$ref": "#/components/parameters/cat.ml_trained_models-allow_no_match"
           },
-          {
-            "$ref": "#/components/parameters/cat.ml_trained_models-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.ml_trained_models-h"
           },
@@ -2043,9 +1970,6 @@
           },
           {
             "$ref": "#/components/parameters/cat.ml_trained_models-size"
-          },
-          {
-            "$ref": "#/components/parameters/cat.ml_trained_models-time"
           }
         ],
         "responses": {
@@ -2157,16 +2081,6 @@
         "description": "Get information about the nodes in a cluster.\nIMPORTANT: cat APIs are only intended for human consumption using the command line or Kibana console. They are not intended for use by applications. For application consumption, use the nodes info API.\n\n## Required authorization\n\n* Cluster privileges: `monitor`\n",
         "operationId": "cat-nodes",
         "parameters": [
-          {
-            "in": "query",
-            "name": "bytes",
-            "description": "The unit used to display byte values.",
-            "deprecated": false,
-            "schema": {
-              "$ref": "#/components/schemas/_types.Bytes"
-            },
-            "style": "form"
-          },
           {
             "in": "query",
             "name": "full_id",
@@ -2223,16 +2137,6 @@
               "$ref": "#/components/schemas/_types.Duration"
             },
             "style": "form"
-          },
-          {
-            "in": "query",
-            "name": "time",
-            "description": "The unit used to display time values.",
-            "deprecated": false,
-            "schema": {
-              "$ref": "#/components/schemas/_types.TimeUnit"
-            },
-            "style": "form"
           }
         ],
         "responses": {
@@ -2319,16 +2223,6 @@
               "$ref": "#/components/schemas/_types.Duration"
             },
             "style": "form"
-          },
-          {
-            "in": "query",
-            "name": "time",
-            "description": "Unit used to display time values.",
-            "deprecated": false,
-            "schema": {
-              "$ref": "#/components/schemas/_types.TimeUnit"
-            },
-            "style": "form"
           }
         ],
         "responses": {
@@ -2463,9 +2357,6 @@
           {
             "$ref": "#/components/parameters/cat.recovery-active_only"
           },
-          {
-            "$ref": "#/components/parameters/cat.recovery-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.recovery-detailed"
           },
@@ -2477,9 +2368,6 @@
           },
           {
             "$ref": "#/components/parameters/cat.recovery-s"
-          },
-          {
-            "$ref": "#/components/parameters/cat.recovery-time"
           }
         ],
         "responses": {
@@ -2511,9 +2399,6 @@
           {
             "$ref": "#/components/parameters/cat.recovery-active_only"
           },
-          {
-            "$ref": "#/components/parameters/cat.recovery-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.recovery-detailed"
           },
@@ -2525,9 +2410,6 @@
           },
           {
             "$ref": "#/components/parameters/cat.recovery-s"
-          },
-          {
-            "$ref": "#/components/parameters/cat.recovery-time"
           }
         ],
         "responses": {
@@ -2633,9 +2515,6 @@
         "description": "Get low-level information about the Lucene segments in index shards.\nFor data streams, the API returns information about the backing indices.\nIMPORTANT: cat APIs are only intended for human consumption using the command line or Kibana console. They are not intended for use by applications. For application consumption, use the index segments API.\n\n## Required authorization\n\n* Index privileges: `monitor`\n* Cluster privileges: `monitor`\n",
         "operationId": "cat-segments",
         "parameters": [
-          {
-            "$ref": "#/components/parameters/cat.segments-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.segments-h"
           },
@@ -2675,9 +2554,6 @@
           {
             "$ref": "#/components/parameters/cat.segments-index"
           },
-          {
-            "$ref": "#/components/parameters/cat.segments-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.segments-h"
           },
@@ -2714,9 +2590,6 @@
         "description": "Get information about the shards in a cluster.\nFor data streams, the API returns information about the backing indices.\nIMPORTANT: cat APIs are only intended for human consumption using the command line or Kibana console. They are not intended for use by applications.\n\n## Required authorization\n\n* Index privileges: `monitor`\n* Cluster privileges: `monitor`\n",
         "operationId": "cat-shards",
         "parameters": [
-          {
-            "$ref": "#/components/parameters/cat.shards-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.shards-h"
           },
@@ -2725,9 +2598,6 @@
           },
           {
             "$ref": "#/components/parameters/cat.shards-master_timeout"
-          },
-          {
-            "$ref": "#/components/parameters/cat.shards-time"
           }
         ],
         "responses": {
@@ -2756,9 +2626,6 @@
           {
             "$ref": "#/components/parameters/cat.shards-index"
           },
-          {
-            "$ref": "#/components/parameters/cat.shards-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.shards-h"
           },
@@ -2767,9 +2634,6 @@
           },
           {
             "$ref": "#/components/parameters/cat.shards-master_timeout"
-          },
-          {
-            "$ref": "#/components/parameters/cat.shards-time"
           }
         ],
         "responses": {
@@ -2806,9 +2670,6 @@
           },
           {
             "$ref": "#/components/parameters/cat.snapshots-master_timeout"
-          },
-          {
-            "$ref": "#/components/parameters/cat.snapshots-time"
           }
         ],
         "responses": {
@@ -2848,9 +2709,6 @@
           },
           {
             "$ref": "#/components/parameters/cat.snapshots-master_timeout"
-          },
-          {
-            "$ref": "#/components/parameters/cat.snapshots-time"
           }
         ],
         "responses": {
@@ -2942,16 +2800,6 @@
             },
             "style": "form"
           },
-          {
-            "in": "query",
-            "name": "time",
-            "description": "Unit used to display time values.",
-            "deprecated": false,
-            "schema": {
-              "$ref": "#/components/schemas/_types.TimeUnit"
-            },
-            "style": "form"
-          },
           {
             "in": "query",
             "name": "timeout",
@@ -3093,9 +2941,6 @@
           {
             "$ref": "#/components/parameters/cat.thread_pool-s"
           },
-          {
-            "$ref": "#/components/parameters/cat.thread_pool-time"
-          },
           {
             "$ref": "#/components/parameters/cat.thread_pool-local"
           },
@@ -3135,9 +2980,6 @@
           {
             "$ref": "#/components/parameters/cat.thread_pool-s"
           },
-          {
-            "$ref": "#/components/parameters/cat.thread_pool-time"
-          },
           {
             "$ref": "#/components/parameters/cat.thread_pool-local"
           },
@@ -3180,9 +3022,6 @@
           {
             "$ref": "#/components/parameters/cat.transforms-s"
           },
-          {
-            "$ref": "#/components/parameters/cat.transforms-time"
-          },
           {
             "$ref": "#/components/parameters/cat.transforms-size"
           }
@@ -3225,9 +3064,6 @@
           {
             "$ref": "#/components/parameters/cat.transforms-s"
           },
-          {
-            "$ref": "#/components/parameters/cat.transforms-time"
-          },
           {
             "$ref": "#/components/parameters/cat.transforms-size"
           }
@@ -44914,7 +44750,7 @@
             "description": "The period to wait for a connection to the master node.\nIf no response is received before the timeout expires, the request fails and returns an error.",
             "deprecated": false,
             "schema": {
-              "$ref": "#/components/schemas/_types.TimeUnit"
+              "$ref": "#/components/schemas/_types.Duration"
             },
             "style": "form"
           },
@@ -44924,7 +44760,7 @@
             "description": "The period to wait for a response.\nIf no response is received before the timeout expires, the request fails and returns an error.",
             "deprecated": false,
             "schema": {
-              "$ref": "#/components/schemas/_types.TimeUnit"
+              "$ref": "#/components/schemas/_types.Duration"
             },
             "style": "form"
           }
@@ -45016,7 +44852,7 @@
             "description": "Period to wait for a connection to the master node. If no response is received before the timeout expires, the request fails and returns an error.",
             "deprecated": false,
             "schema": {
-              "$ref": "#/components/schemas/_types.TimeUnit"
+              "$ref": "#/components/schemas/_types.Duration"
             },
             "style": "form"
           },
@@ -45026,7 +44862,7 @@
             "description": "Period to wait for a response. If no response is received before the timeout expires, the request fails and returns an error.",
             "deprecated": false,
             "schema": {
-              "$ref": "#/components/schemas/_types.TimeUnit"
+              "$ref": "#/components/schemas/_types.Duration"
             },
             "style": "form"
           }
@@ -71423,17 +71259,6 @@
           }
         ]
       },
-      "_types.Bytes": {
-        "type": "string",
-        "enum": [
-          "b",
-          "kb",
-          "mb",
-          "gb",
-          "tb",
-          "pb"
-        ]
-      },
       "cat._types.CatAllocationColumns": {
         "oneOf": [
           {
@@ -71907,18 +71732,6 @@
           }
         }
       },
-      "_types.TimeUnit": {
-        "type": "string",
-        "enum": [
-          "nanos",
-          "micros",
-          "ms",
-          "s",
-          "m",
-          "h",
-          "d"
-        ]
-      },
       "cat._types.CatHealthColumns": {
         "oneOf": [
           {
@@ -135804,16 +135617,6 @@
         },
         "style": "simple"
       },
-      "cat.allocation-bytes": {
-        "in": "query",
-        "name": "bytes",
-        "description": "The unit used to display byte values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.Bytes"
-        },
-        "style": "form"
-      },
       "cat.allocation-h": {
         "in": "query",
         "name": "h",
@@ -135947,16 +135750,6 @@
         },
         "style": "simple"
       },
-      "cat.fielddata-bytes": {
-        "in": "query",
-        "name": "bytes",
-        "description": "The unit used to display byte values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.Bytes"
-        },
-        "style": "form"
-      },
       "cat.fielddata-fields_": {
         "in": "query",
         "name": "fields",
@@ -135998,16 +135791,6 @@
         },
         "style": "simple"
       },
-      "cat.indices-bytes": {
-        "in": "query",
-        "name": "bytes",
-        "description": "The unit used to display byte values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.Bytes"
-        },
-        "style": "form"
-      },
       "cat.indices-expand_wildcards": {
         "in": "query",
         "name": "expand_wildcards",
@@ -136048,16 +135831,6 @@
         },
         "style": "form"
       },
-      "cat.indices-time": {
-        "in": "query",
-        "name": "time",
-        "description": "The unit used to display time values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.TimeUnit"
-        },
-        "style": "form"
-      },
       "cat.indices-master_timeout": {
         "in": "query",
         "name": "master_timeout",
@@ -136109,16 +135882,6 @@
         },
         "style": "form"
       },
-      "cat.ml_data_frame_analytics-bytes": {
-        "in": "query",
-        "name": "bytes",
-        "description": "The unit in which to display byte values",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.Bytes"
-        },
-        "style": "form"
-      },
       "cat.ml_data_frame_analytics-h": {
         "in": "query",
         "name": "h",
@@ -136139,16 +135902,6 @@
         },
         "style": "form"
       },
-      "cat.ml_data_frame_analytics-time": {
-        "in": "query",
-        "name": "time",
-        "description": "Unit used to display time values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.TimeUnit"
-        },
-        "style": "form"
-      },
       "cat.ml_datafeeds-datafeed_id": {
         "in": "path",
         "name": "datafeed_id",
@@ -136190,16 +135943,6 @@
         },
         "style": "form"
       },
-      "cat.ml_datafeeds-time": {
-        "in": "query",
-        "name": "time",
-        "description": "The unit used to display time values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.TimeUnit"
-        },
-        "style": "form"
-      },
       "cat.ml_jobs-job_id": {
         "in": "path",
         "name": "job_id",
@@ -136221,16 +135964,6 @@
         },
         "style": "form"
       },
-      "cat.ml_jobs-bytes": {
-        "in": "query",
-        "name": "bytes",
-        "description": "The unit used to display byte values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.Bytes"
-        },
-        "style": "form"
-      },
       "cat.ml_jobs-h": {
         "in": "query",
         "name": "h",
@@ -136251,16 +135984,6 @@
         },
         "style": "form"
       },
-      "cat.ml_jobs-time": {
-        "in": "query",
-        "name": "time",
-        "description": "The unit used to display time values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.TimeUnit"
-        },
-        "style": "form"
-      },
       "cat.ml_trained_models-model_id": {
         "in": "path",
         "name": "model_id",
@@ -136282,16 +136005,6 @@
         },
         "style": "form"
       },
-      "cat.ml_trained_models-bytes": {
-        "in": "query",
-        "name": "bytes",
-        "description": "The unit used to display byte values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.Bytes"
-        },
-        "style": "form"
-      },
       "cat.ml_trained_models-h": {
         "in": "query",
         "name": "h",
@@ -136332,16 +136045,6 @@
         },
         "style": "form"
       },
-      "cat.ml_trained_models-time": {
-        "in": "query",
-        "name": "time",
-        "description": "Unit used to display time values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.TimeUnit"
-        },
-        "style": "form"
-      },
       "cat.recovery-index": {
         "in": "path",
         "name": "index",
@@ -136363,16 +136066,6 @@
         },
         "style": "form"
       },
-      "cat.recovery-bytes": {
-        "in": "query",
-        "name": "bytes",
-        "description": "The unit used to display byte values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.Bytes"
-        },
-        "style": "form"
-      },
       "cat.recovery-detailed": {
         "in": "query",
         "name": "detailed",
@@ -136413,16 +136106,6 @@
         },
         "style": "form"
       },
-      "cat.recovery-time": {
-        "in": "query",
-        "name": "time",
-        "description": "The unit used to display time values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.TimeUnit"
-        },
-        "style": "form"
-      },
       "cat.segments-index": {
         "in": "path",
         "name": "index",
@@ -136434,16 +136117,6 @@
         },
         "style": "simple"
       },
-      "cat.segments-bytes": {
-        "in": "query",
-        "name": "bytes",
-        "description": "The unit used to display byte values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.Bytes"
-        },
-        "style": "form"
-      },
       "cat.segments-h": {
         "in": "query",
         "name": "h",
@@ -136495,16 +136168,6 @@
         },
         "style": "simple"
       },
-      "cat.shards-bytes": {
-        "in": "query",
-        "name": "bytes",
-        "description": "The unit used to display byte values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.Bytes"
-        },
-        "style": "form"
-      },
       "cat.shards-h": {
         "in": "query",
         "name": "h",
@@ -136535,16 +136198,6 @@
         },
         "style": "form"
       },
-      "cat.shards-time": {
-        "in": "query",
-        "name": "time",
-        "description": "The unit used to display time values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.TimeUnit"
-        },
-        "style": "form"
-      },
       "cat.snapshots-repository": {
         "in": "path",
         "name": "repository",
@@ -136596,16 +136249,6 @@
         },
         "style": "form"
       },
-      "cat.snapshots-time": {
-        "in": "query",
-        "name": "time",
-        "description": "Unit used to display time values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.TimeUnit"
-        },
-        "style": "form"
-      },
       "cat.templates-name": {
         "in": "path",
         "name": "name",
@@ -136688,16 +136331,6 @@
         },
         "style": "form"
       },
-      "cat.thread_pool-time": {
-        "in": "query",
-        "name": "time",
-        "description": "The unit used to display time values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.TimeUnit"
-        },
-        "style": "form"
-      },
       "cat.thread_pool-local": {
         "in": "query",
         "name": "local",
@@ -136769,16 +136402,6 @@
         },
         "style": "form"
       },
-      "cat.transforms-time": {
-        "in": "query",
-        "name": "time",
-        "description": "The unit used to display time values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.TimeUnit"
-        },
-        "style": "form"
-      },
       "cat.transforms-size": {
         "in": "query",
         "name": "size",
@@ -144359,7 +143982,7 @@
         "description": "Period to wait for a connection to the master node. If no response is received before the timeout expires, the request fails and returns an error.",
         "deprecated": false,
         "schema": {
-          "$ref": "#/components/schemas/_types.TimeUnit"
+          "$ref": "#/components/schemas/_types.Duration"
         },
         "style": "form"
       },
diff --git a/output/openapi/elasticsearch-serverless-openapi.json b/output/openapi/elasticsearch-serverless-openapi.json
index 53ec3f7b5e..111207d7d1 100644
--- a/output/openapi/elasticsearch-serverless-openapi.json
+++ b/output/openapi/elasticsearch-serverless-openapi.json
@@ -1032,9 +1032,6 @@
         "description": "Get high-level information about indices in a cluster, including backing indices for data streams.\n\nUse this request to get the following information for each index in a cluster:\n- shard count\n- document count\n- deleted document count\n- primary store size\n- total store size of all shards, including shard replicas\n\nThese metrics are retrieved directly from Lucene, which Elasticsearch uses internally to power indexing and search. As a result, all document counts include hidden nested documents.\nTo get an accurate count of Elasticsearch documents, use the cat count or count APIs.\n\nCAT APIs are only intended for human consumption using the command line or Kibana console.\nThey are not intended for use by applications. For application consumption, use an index endpoint.\n\n## Required authorization\n\n* Index privileges: `monitor`\n* Cluster privileges: `monitor`\n",
         "operationId": "cat-indices",
         "parameters": [
-          {
-            "$ref": "#/components/parameters/cat.indices-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.indices-expand_wildcards"
           },
@@ -1047,9 +1044,6 @@
           {
             "$ref": "#/components/parameters/cat.indices-pri"
           },
-          {
-            "$ref": "#/components/parameters/cat.indices-time"
-          },
           {
             "$ref": "#/components/parameters/cat.indices-master_timeout"
           },
@@ -1086,9 +1080,6 @@
           {
             "$ref": "#/components/parameters/cat.indices-index"
           },
-          {
-            "$ref": "#/components/parameters/cat.indices-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.indices-expand_wildcards"
           },
@@ -1101,9 +1092,6 @@
           {
             "$ref": "#/components/parameters/cat.indices-pri"
           },
-          {
-            "$ref": "#/components/parameters/cat.indices-time"
-          },
           {
             "$ref": "#/components/parameters/cat.indices-master_timeout"
           },
@@ -1140,17 +1128,11 @@
           {
             "$ref": "#/components/parameters/cat.ml_data_frame_analytics-allow_no_match"
           },
-          {
-            "$ref": "#/components/parameters/cat.ml_data_frame_analytics-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.ml_data_frame_analytics-h"
           },
           {
             "$ref": "#/components/parameters/cat.ml_data_frame_analytics-s"
-          },
-          {
-            "$ref": "#/components/parameters/cat.ml_data_frame_analytics-time"
           }
         ],
         "responses": {
@@ -1182,17 +1164,11 @@
           {
             "$ref": "#/components/parameters/cat.ml_data_frame_analytics-allow_no_match"
           },
-          {
-            "$ref": "#/components/parameters/cat.ml_data_frame_analytics-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.ml_data_frame_analytics-h"
           },
           {
             "$ref": "#/components/parameters/cat.ml_data_frame_analytics-s"
-          },
-          {
-            "$ref": "#/components/parameters/cat.ml_data_frame_analytics-time"
           }
         ],
         "responses": {
@@ -1226,9 +1202,6 @@
           },
           {
             "$ref": "#/components/parameters/cat.ml_datafeeds-s"
-          },
-          {
-            "$ref": "#/components/parameters/cat.ml_datafeeds-time"
           }
         ],
         "responses": {
@@ -1265,9 +1238,6 @@
           },
           {
             "$ref": "#/components/parameters/cat.ml_datafeeds-s"
-          },
-          {
-            "$ref": "#/components/parameters/cat.ml_datafeeds-time"
           }
         ],
         "responses": {
@@ -1296,17 +1266,11 @@
           {
             "$ref": "#/components/parameters/cat.ml_jobs-allow_no_match"
           },
-          {
-            "$ref": "#/components/parameters/cat.ml_jobs-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.ml_jobs-h"
           },
           {
             "$ref": "#/components/parameters/cat.ml_jobs-s"
-          },
-          {
-            "$ref": "#/components/parameters/cat.ml_jobs-time"
           }
         ],
         "responses": {
@@ -1338,17 +1302,11 @@
           {
             "$ref": "#/components/parameters/cat.ml_jobs-allow_no_match"
           },
-          {
-            "$ref": "#/components/parameters/cat.ml_jobs-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.ml_jobs-h"
           },
           {
             "$ref": "#/components/parameters/cat.ml_jobs-s"
-          },
-          {
-            "$ref": "#/components/parameters/cat.ml_jobs-time"
           }
         ],
         "responses": {
@@ -1377,9 +1335,6 @@
           {
             "$ref": "#/components/parameters/cat.ml_trained_models-allow_no_match"
           },
-          {
-            "$ref": "#/components/parameters/cat.ml_trained_models-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.ml_trained_models-h"
           },
@@ -1391,9 +1346,6 @@
           },
           {
             "$ref": "#/components/parameters/cat.ml_trained_models-size"
-          },
-          {
-            "$ref": "#/components/parameters/cat.ml_trained_models-time"
           }
         ],
         "responses": {
@@ -1425,9 +1377,6 @@
           {
             "$ref": "#/components/parameters/cat.ml_trained_models-allow_no_match"
           },
-          {
-            "$ref": "#/components/parameters/cat.ml_trained_models-bytes"
-          },
           {
             "$ref": "#/components/parameters/cat.ml_trained_models-h"
           },
@@ -1439,9 +1388,6 @@
           },
           {
             "$ref": "#/components/parameters/cat.ml_trained_models-size"
-          },
-          {
-            "$ref": "#/components/parameters/cat.ml_trained_models-time"
           }
         ],
         "responses": {
@@ -1479,9 +1425,6 @@
           {
             "$ref": "#/components/parameters/cat.transforms-s"
           },
-          {
-            "$ref": "#/components/parameters/cat.transforms-time"
-          },
           {
             "$ref": "#/components/parameters/cat.transforms-size"
           }
@@ -1524,9 +1467,6 @@
           {
             "$ref": "#/components/parameters/cat.transforms-s"
           },
-          {
-            "$ref": "#/components/parameters/cat.transforms-time"
-          },
           {
             "$ref": "#/components/parameters/cat.transforms-size"
           }
@@ -47086,17 +47026,6 @@
         "description": "Time of day, expressed as HH:MM:SS",
         "type": "string"
       },
-      "_types.Bytes": {
-        "type": "string",
-        "enum": [
-          "b",
-          "kb",
-          "mb",
-          "gb",
-          "tb",
-          "pb"
-        ]
-      },
       "_types.HealthStatus": {
         "type": "string",
         "enum": [
@@ -47110,18 +47039,6 @@
           "unavailable"
         ]
       },
-      "_types.TimeUnit": {
-        "type": "string",
-        "enum": [
-          "nanos",
-          "micros",
-          "ms",
-          "s",
-          "m",
-          "h",
-          "d"
-        ]
-      },
       "cat._types.CatIndicesColumns": {
         "oneOf": [
           {
@@ -82528,16 +82445,6 @@
         },
         "style": "simple"
       },
-      "cat.indices-bytes": {
-        "in": "query",
-        "name": "bytes",
-        "description": "The unit used to display byte values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.Bytes"
-        },
-        "style": "form"
-      },
       "cat.indices-expand_wildcards": {
         "in": "query",
         "name": "expand_wildcards",
@@ -82578,16 +82485,6 @@
         },
         "style": "form"
       },
-      "cat.indices-time": {
-        "in": "query",
-        "name": "time",
-        "description": "The unit used to display time values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.TimeUnit"
-        },
-        "style": "form"
-      },
       "cat.indices-master_timeout": {
         "in": "query",
         "name": "master_timeout",
@@ -82639,16 +82536,6 @@
         },
         "style": "form"
       },
-      "cat.ml_data_frame_analytics-bytes": {
-        "in": "query",
-        "name": "bytes",
-        "description": "The unit in which to display byte values",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.Bytes"
-        },
-        "style": "form"
-      },
       "cat.ml_data_frame_analytics-h": {
         "in": "query",
         "name": "h",
@@ -82669,16 +82556,6 @@
         },
         "style": "form"
       },
-      "cat.ml_data_frame_analytics-time": {
-        "in": "query",
-        "name": "time",
-        "description": "Unit used to display time values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.TimeUnit"
-        },
-        "style": "form"
-      },
       "cat.ml_datafeeds-datafeed_id": {
         "in": "path",
         "name": "datafeed_id",
@@ -82720,16 +82597,6 @@
         },
         "style": "form"
       },
-      "cat.ml_datafeeds-time": {
-        "in": "query",
-        "name": "time",
-        "description": "The unit used to display time values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.TimeUnit"
-        },
-        "style": "form"
-      },
       "cat.ml_jobs-job_id": {
         "in": "path",
         "name": "job_id",
@@ -82751,16 +82618,6 @@
         },
         "style": "form"
       },
-      "cat.ml_jobs-bytes": {
-        "in": "query",
-        "name": "bytes",
-        "description": "The unit used to display byte values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.Bytes"
-        },
-        "style": "form"
-      },
       "cat.ml_jobs-h": {
         "in": "query",
         "name": "h",
@@ -82781,16 +82638,6 @@
         },
         "style": "form"
       },
-      "cat.ml_jobs-time": {
-        "in": "query",
-        "name": "time",
-        "description": "The unit used to display time values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.TimeUnit"
-        },
-        "style": "form"
-      },
       "cat.ml_trained_models-model_id": {
         "in": "path",
         "name": "model_id",
@@ -82812,16 +82659,6 @@
         },
         "style": "form"
       },
-      "cat.ml_trained_models-bytes": {
-        "in": "query",
-        "name": "bytes",
-        "description": "The unit used to display byte values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.Bytes"
-        },
-        "style": "form"
-      },
       "cat.ml_trained_models-h": {
         "in": "query",
         "name": "h",
@@ -82862,16 +82699,6 @@
         },
         "style": "form"
       },
-      "cat.ml_trained_models-time": {
-        "in": "query",
-        "name": "time",
-        "description": "Unit used to display time values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.TimeUnit"
-        },
-        "style": "form"
-      },
       "cat.transforms-transform_id": {
         "in": "path",
         "name": "transform_id",
@@ -82923,16 +82750,6 @@
         },
         "style": "form"
       },
-      "cat.transforms-time": {
-        "in": "query",
-        "name": "time",
-        "description": "The unit used to display time values.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types.TimeUnit"
-        },
-        "style": "form"
-      },
       "cat.transforms-size": {
         "in": "query",
         "name": "size",
diff --git a/output/schema/schema.json b/output/schema/schema.json
index a66cf963cb..414817de9d 100644
--- a/output/schema/schema.json
+++ b/output/schema/schema.json
@@ -105553,18 +105553,6 @@
         }
       ],
       "query": [
-        {
-          "description": "The unit used to display byte values.",
-          "name": "bytes",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "Bytes",
-              "namespace": "_types"
-            }
-          }
-        },
         {
           "description": "A comma-separated list of columns names to display. It supports simple wildcards.",
           "name": "h",
@@ -105616,7 +105604,7 @@
           }
         }
       ],
-      "specLocation": "cat/allocation/CatAllocationRequest.ts#L24-L78"
+      "specLocation": "cat/allocation/CatAllocationRequest.ts#L24-L76"
     },
     {
       "kind": "response",
@@ -106254,18 +106242,6 @@
         }
       ],
       "query": [
-        {
-          "description": "The unit used to display byte values.",
-          "name": "bytes",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "Bytes",
-              "namespace": "_types"
-            }
-          }
-        },
         {
           "description": "Comma-separated list of fields used to limit returned information.",
           "name": "fields",
@@ -106303,7 +106279,7 @@
           }
         }
       ],
-      "specLocation": "cat/fielddata/CatFielddataRequest.ts#L23-L70"
+      "specLocation": "cat/fielddata/CatFielddataRequest.ts#L23-L68"
     },
     {
       "kind": "response",
@@ -106665,18 +106641,6 @@
       },
       "path": [],
       "query": [
-        {
-          "description": "The unit used to display time values.",
-          "name": "time",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "TimeUnit",
-              "namespace": "_types"
-            }
-          }
-        },
         {
           "description": "If true, returns `HH:MM:SS` and Unix epoch timestamps.",
           "name": "ts",
@@ -106715,7 +106679,7 @@
           }
         }
       ],
-      "specLocation": "cat/health/CatHealthRequest.ts#L24-L70"
+      "specLocation": "cat/health/CatHealthRequest.ts#L23-L65"
     },
     {
       "kind": "response",
@@ -108919,18 +108883,6 @@
         }
       ],
       "query": [
-        {
-          "description": "The unit used to display byte values.",
-          "name": "bytes",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "Bytes",
-              "namespace": "_types"
-            }
-          }
-        },
         {
           "description": "The type of index that wildcard patterns can match.",
           "name": "expand_wildcards",
@@ -108981,18 +108933,6 @@
             }
           }
         },
-        {
-          "description": "The unit used to display time values.",
-          "name": "time",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "TimeUnit",
-              "namespace": "_types"
-            }
-          }
-        },
         {
           "description": "Period to wait for a connection to the master node.",
           "name": "master_timeout",
@@ -109031,7 +108971,7 @@
           }
         }
       ],
-      "specLocation": "cat/indices/CatIndicesRequest.ts#L30-L109"
+      "specLocation": "cat/indices/CatIndicesRequest.ts#L24-L99"
     },
     {
       "kind": "response",
@@ -109594,18 +109534,6 @@
             }
           }
         },
-        {
-          "description": "The unit in which to display byte values",
-          "name": "bytes",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "Bytes",
-              "namespace": "_types"
-            }
-          }
-        },
         {
           "description": "Comma-separated list of column names to display.",
           "name": "h",
@@ -109630,21 +109558,9 @@
               "namespace": "cat._types"
             }
           }
-        },
-        {
-          "description": "Unit used to display time values.",
-          "name": "time",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "TimeUnit",
-              "namespace": "_types"
-            }
-          }
         }
       ],
-      "specLocation": "cat/ml_data_frame_analytics/CatDataFrameAnalyticsRequest.ts#L24-L70"
+      "specLocation": "cat/ml_data_frame_analytics/CatDataFrameAnalyticsRequest.ts#L23-L64"
     },
     {
       "kind": "response",
@@ -109973,21 +109889,9 @@
               "namespace": "cat._types"
             }
           }
-        },
-        {
-          "description": "The unit used to display time values.",
-          "name": "time",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "TimeUnit",
-              "namespace": "_types"
-            }
-          }
         }
       ],
-      "specLocation": "cat/ml_datafeeds/CatDatafeedsRequest.ts#L24-L85"
+      "specLocation": "cat/ml_datafeeds/CatDatafeedsRequest.ts#L23-L80"
     },
     {
       "kind": "response",
@@ -111058,18 +110962,6 @@
             }
           }
         },
-        {
-          "description": "The unit used to display byte values.",
-          "name": "bytes",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "Bytes",
-              "namespace": "_types"
-            }
-          }
-        },
         {
           "description": "Comma-separated list of column names to display.",
           "name": "h",
@@ -111094,21 +110986,9 @@
               "namespace": "cat._types"
             }
           }
-        },
-        {
-          "description": "The unit used to display time values.",
-          "name": "time",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "TimeUnit",
-              "namespace": "_types"
-            }
-          }
         }
       ],
-      "specLocation": "cat/ml_jobs/CatJobsRequest.ts#L24-L89"
+      "specLocation": "cat/ml_jobs/CatJobsRequest.ts#L23-L80"
     },
     {
       "kind": "response",
@@ -111217,18 +111097,6 @@
             }
           }
         },
-        {
-          "description": "The unit used to display byte values.",
-          "name": "bytes",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "Bytes",
-              "namespace": "_types"
-            }
-          }
-        },
         {
           "description": "A comma-separated list of column names to display.",
           "name": "h",
@@ -111276,21 +111144,9 @@
               "namespace": "_types"
             }
           }
-        },
-        {
-          "description": "Unit used to display time values.",
-          "name": "time",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "TimeUnit",
-              "namespace": "_types"
-            }
-          }
         }
       ],
-      "specLocation": "cat/ml_trained_models/CatTrainedModelsRequest.ts#L25-L80"
+      "specLocation": "cat/ml_trained_models/CatTrainedModelsRequest.ts#L24-L73"
     },
     {
       "kind": "response",
@@ -113431,18 +113287,6 @@
       },
       "path": [],
       "query": [
-        {
-          "description": "The unit used to display byte values.",
-          "name": "bytes",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "Bytes",
-              "namespace": "_types"
-            }
-          }
-        },
         {
           "description": "If `true`, return the full node ID. If `false`, return the shortened node ID.",
           "name": "full_id",
@@ -113518,21 +113362,9 @@
               "namespace": "_types"
             }
           }
-        },
-        {
-          "description": "The unit used to display time values.",
-          "name": "time",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "TimeUnit",
-              "namespace": "_types"
-            }
-          }
         }
       ],
-      "specLocation": "cat/nodes/CatNodesRequest.ts#L24-L79"
+      "specLocation": "cat/nodes/CatNodesRequest.ts#L24-L71"
     },
     {
       "kind": "response",
@@ -113740,21 +113572,9 @@
               "namespace": "_types"
             }
           }
-        },
-        {
-          "description": "Unit used to display time values.",
-          "name": "time",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "TimeUnit",
-              "namespace": "_types"
-            }
-          }
         }
       ],
-      "specLocation": "cat/pending_tasks/CatPendingTasksRequest.ts#L24-L71"
+      "specLocation": "cat/pending_tasks/CatPendingTasksRequest.ts#L24-L67"
     },
     {
       "kind": "response",
@@ -114528,18 +114348,6 @@
             }
           }
         },
-        {
-          "description": "The unit used to display byte values.",
-          "name": "bytes",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "Bytes",
-              "namespace": "_types"
-            }
-          }
-        },
         {
           "description": "If `true`, the response includes detailed information about shard recoveries.",
           "name": "detailed",
@@ -114589,21 +114397,9 @@
               "namespace": "_types"
             }
           }
-        },
-        {
-          "description": "The unit used to display time values.",
-          "name": "time",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "TimeUnit",
-              "namespace": "_types"
-            }
-          }
         }
       ],
-      "specLocation": "cat/recovery/CatRecoveryRequest.ts#L24-L92"
+      "specLocation": "cat/recovery/CatRecoveryRequest.ts#L23-L83"
     },
     {
       "kind": "response",
@@ -114884,18 +114680,6 @@
         }
       ],
       "query": [
-        {
-          "description": "The unit used to display byte values.",
-          "name": "bytes",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "Bytes",
-              "namespace": "_types"
-            }
-          }
-        },
         {
           "description": "A comma-separated list of columns names to display.\nIt supports simple wildcards.",
           "name": "h",
@@ -114948,7 +114732,7 @@
           }
         }
       ],
-      "specLocation": "cat/segments/CatSegmentsRequest.ts#L24-L87"
+      "specLocation": "cat/segments/CatSegmentsRequest.ts#L24-L83"
     },
     {
       "kind": "response",
@@ -115284,18 +115068,6 @@
         }
       ],
       "query": [
-        {
-          "description": "The unit used to display byte values.",
-          "name": "bytes",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "Bytes",
-              "namespace": "_types"
-            }
-          }
-        },
         {
           "description": "List of columns to appear in the response. Supports simple wildcards.",
           "name": "h",
@@ -115332,21 +115104,9 @@
               "namespace": "_types"
             }
           }
-        },
-        {
-          "description": "The unit used to display time values.",
-          "name": "time",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "TimeUnit",
-              "namespace": "_types"
-            }
-          }
         }
       ],
-      "specLocation": "cat/shards/CatShardsRequest.ts#L24-L81"
+      "specLocation": "cat/shards/CatShardsRequest.ts#L24-L73"
     },
     {
       "kind": "response",
@@ -116794,21 +116554,9 @@
               "namespace": "_types"
             }
           }
-        },
-        {
-          "description": "Unit used to display time values.",
-          "name": "time",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "TimeUnit",
-              "namespace": "_types"
-            }
-          }
         }
       ],
-      "specLocation": "cat/snapshots/CatSnapshotsRequest.ts#L24-L84"
+      "specLocation": "cat/snapshots/CatSnapshotsRequest.ts#L24-L80"
     },
     {
       "kind": "response",
@@ -117216,18 +116964,6 @@
             }
           }
         },
-        {
-          "description": "Unit used to display time values.",
-          "name": "time",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "TimeUnit",
-              "namespace": "_types"
-            }
-          }
-        },
         {
           "description": "Period to wait for a response.\nIf no response is received before the timeout expires, the request fails and returns an error.",
           "name": "timeout",
@@ -117255,7 +116991,7 @@
           }
         }
       ],
-      "specLocation": "cat/tasks/CatTasksRequest.ts#L24-L82"
+      "specLocation": "cat/tasks/CatTasksRequest.ts#L24-L78"
     },
     {
       "kind": "response",
@@ -117866,18 +117602,6 @@
             }
           }
         },
-        {
-          "description": "The unit used to display time values.",
-          "name": "time",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "TimeUnit",
-              "namespace": "_types"
-            }
-          }
-        },
         {
           "description": "If `true`, the request computes the list of selected nodes from the\nlocal cluster state. If `false` the list of selected nodes are computed\nfrom the cluster state of the master node. In both cases the coordinating\nnode will send requests for further information to each selected node.",
           "name": "local",
@@ -117905,7 +117629,7 @@
           }
         }
       ],
-      "specLocation": "cat/thread_pool/CatThreadPoolRequest.ts#L24-L83"
+      "specLocation": "cat/thread_pool/CatThreadPoolRequest.ts#L24-L79"
     },
     {
       "kind": "response",
@@ -118416,18 +118140,6 @@
             }
           }
         },
-        {
-          "description": "The unit used to display time values.",
-          "name": "time",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "TimeUnit",
-              "namespace": "_types"
-            }
-          }
-        },
         {
           "description": "The maximum number of transforms to obtain.",
           "name": "size",
@@ -118442,7 +118154,7 @@
           }
         }
       ],
-      "specLocation": "cat/transforms/CatTransformsRequest.ts#L25-L89"
+      "specLocation": "cat/transforms/CatTransformsRequest.ts#L24-L84"
     },
     {
       "kind": "response",
@@ -248089,7 +247801,7 @@
           "type": {
             "kind": "instance_of",
             "type": {
-              "name": "TimeUnit",
+              "name": "Duration",
               "namespace": "_types"
             }
           }
@@ -248102,7 +247814,7 @@
           "type": {
             "kind": "instance_of",
             "type": {
-              "name": "TimeUnit",
+              "name": "Duration",
               "namespace": "_types"
             }
           }
@@ -248357,7 +248069,7 @@
           "type": {
             "kind": "instance_of",
             "type": {
-              "name": "TimeUnit",
+              "name": "Duration",
               "namespace": "_types"
             }
           }
@@ -248582,7 +248294,7 @@
           "type": {
             "kind": "instance_of",
             "type": {
-              "name": "TimeUnit",
+              "name": "Duration",
               "namespace": "_types"
             }
           }
@@ -248595,7 +248307,7 @@
           "type": {
             "kind": "instance_of",
             "type": {
-              "name": "TimeUnit",
+              "name": "Duration",
               "namespace": "_types"
             }
           }
@@ -276624,7 +276336,7 @@
         "namespace": "_spec_utils"
       },
       "properties": [],
-      "specLocation": "_spec_utils/behaviors.ts#L20-L28"
+      "specLocation": "_spec_utils/behaviors.ts#L23-L31"
     },
     {
       "kind": "interface",
@@ -276644,7 +276356,7 @@
         "namespace": "_spec_utils"
       },
       "properties": [],
-      "specLocation": "_spec_utils/behaviors.ts#L30-L39"
+      "specLocation": "_spec_utils/behaviors.ts#L33-L42"
     },
     {
       "kind": "interface",
@@ -276721,7 +276433,7 @@
           }
         }
       ],
-      "specLocation": "_spec_utils/behaviors.ts#L41-L75"
+      "specLocation": "_spec_utils/behaviors.ts#L44-L78"
     },
     {
       "kind": "interface",
@@ -276737,7 +276449,7 @@
         "namespace": "_spec_utils"
       },
       "properties": [],
-      "specLocation": "_spec_utils/behaviors.ts#L102-L108"
+      "specLocation": "_spec_utils/behaviors.ts#L120-L126"
     },
     {
       "kind": "interface",
@@ -276785,9 +276497,33 @@
               "namespace": "_builtins"
             }
           }
+        },
+        {
+          "description": "Sets the units for columns that contain a byte-size value.\nNote that byte-size value units work in terms of powers of 1024. For instance `1kb` means 1024 bytes, not 1000 bytes.\nIf omitted, byte-size values are rendered with a suffix such as `kb`, `mb`, or `gb`, chosen such that the numeric value of the column is as small as possible whilst still being at least `1.0`.\nIf given, byte-size values are rendered as an integer with no suffix, representing the value of the column in the chosen unit.\nValues that are not an exact multiple of the chosen unit are rounded down.",
+          "name": "bytes",
+          "required": false,
+          "type": {
+            "kind": "instance_of",
+            "type": {
+              "name": "Bytes",
+              "namespace": "_types"
+            }
+          }
+        },
+        {
+          "description": "Sets the units for columns that contain a time duration.\nIf omitted, time duration values are rendered with a suffix such as `ms`, `s`, `m` or `h`, chosen such that the numeric value of the column is as small as possible whilst still being at least `1.0`.\nIf given, time duration values are rendered as an integer with no suffix.\nValues that are not an exact multiple of the chosen unit are rounded down.",
+          "name": "time",
+          "required": false,
+          "type": {
+            "kind": "instance_of",
+            "type": {
+              "name": "TimeUnit",
+              "namespace": "_types"
+            }
+          }
         }
       ],
-      "specLocation": "_spec_utils/behaviors.ts#L77-L100"
+      "specLocation": "_spec_utils/behaviors.ts#L80-L118"
     }
   ]
 }
\ No newline at end of file
diff --git a/output/schema/validation-errors.json b/output/schema/validation-errors.json
index 6d18a016b7..e54db8e4c4 100644
--- a/output/schema/validation-errors.json
+++ b/output/schema/validation-errors.json
@@ -1,5 +1,122 @@
 {
-  "endpointErrors": {},
+  "endpointErrors": {
+    "cat.aliases": {
+      "request": [
+        "Request: query parameter 'bytes' does not exist in the json spec",
+        "Request: query parameter 'time' does not exist in the json spec"
+      ],
+      "response": []
+    },
+    "cat.allocation": {
+      "request": [
+        "Request: query parameter 'time' does not exist in the json spec"
+      ],
+      "response": []
+    },
+    "cat.component_templates": {
+      "request": [
+        "Request: query parameter 'bytes' does not exist in the json spec",
+        "Request: query parameter 'time' does not exist in the json spec"
+      ],
+      "response": []
+    },
+    "cat.count": {
+      "request": [
+        "Request: query parameter 'bytes' does not exist in the json spec",
+        "Request: query parameter 'time' does not exist in the json spec"
+      ],
+      "response": []
+    },
+    "cat.fielddata": {
+      "request": [
+        "Request: query parameter 'time' does not exist in the json spec"
+      ],
+      "response": []
+    },
+    "cat.health": {
+      "request": [
+        "Request: query parameter 'bytes' does not exist in the json spec"
+      ],
+      "response": []
+    },
+    "cat.master": {
+      "request": [
+        "Request: query parameter 'bytes' does not exist in the json spec",
+        "Request: query parameter 'time' does not exist in the json spec"
+      ],
+      "response": []
+    },
+    "cat.ml_datafeeds": {
+      "request": [
+        "Request: query parameter 'bytes' does not exist in the json spec"
+      ],
+      "response": []
+    },
+    "cat.nodeattrs": {
+      "request": [
+        "Request: query parameter 'bytes' does not exist in the json spec",
+        "Request: query parameter 'time' does not exist in the json spec"
+      ],
+      "response": []
+    },
+    "cat.pending_tasks": {
+      "request": [
+        "Request: query parameter 'bytes' does not exist in the json spec"
+      ],
+      "response": []
+    },
+    "cat.plugins": {
+      "request": [
+        "Request: query parameter 'bytes' does not exist in the json spec",
+        "Request: query parameter 'time' does not exist in the json spec"
+      ],
+      "response": []
+    },
+    "cat.repositories": {
+      "request": [
+        "Request: query parameter 'bytes' does not exist in the json spec",
+        "Request: query parameter 'time' does not exist in the json spec"
+      ],
+      "response": []
+    },
+    "cat.segments": {
+      "request": [
+        "Request: query parameter 'time' does not exist in the json spec"
+      ],
+      "response": []
+    },
+    "cat.snapshots": {
+      "request": [
+        "Request: query parameter 'bytes' does not exist in the json spec"
+      ],
+      "response": []
+    },
+    "cat.tasks": {
+      "request": [
+        "Request: query parameter 'bytes' does not exist in the json spec"
+      ],
+      "response": []
+    },
+    "cat.templates": {
+      "request": [
+        "Request: query parameter 'bytes' does not exist in the json spec",
+        "Request: query parameter 'time' does not exist in the json spec"
+      ],
+      "response": []
+    },
+    "cat.thread_pool": {
+      "request": [
+        "Request: query parameter 'bytes' does not exist in the json spec"
+      ],
+      "response": []
+    },
+    "cat.transforms": {
+      "request": [
+        "Request: query parameter 'bytes' does not exist in the json spec"
+      ],
+      "response": []
+    }
+  },
   "generalErrors": [
     "Dangling type '_global.scripts_painless_execute:PainlessExecutionPosition'",
     "Dangling type '_global.scripts_painless_execute:PainlessScript'",
diff --git a/output/typescript/types.ts b/output/typescript/types.ts
index bd4cd435ba..cf716fe7e2 100644
--- a/output/typescript/types.ts
+++ b/output/typescript/types.ts
@@ -7339,7 +7339,6 @@ export interface CatAllocationAllocationRecord {
 
 export interface CatAllocationRequest extends CatCatRequestBase {
   node_id?: NodeIds
-  bytes?: Bytes
   h?: CatCatAllocationColumns
   s?: Names
   local?: boolean
@@ -7404,7 +7403,6 @@ export interface CatFielddataFielddataRecord {
 
 export interface CatFielddataRequest extends CatCatRequestBase {
   fields?: Fields
-  bytes?: Bytes
   h?: CatCatFieldDataColumns
   s?: Names
 }
@@ -7465,7 +7463,6 @@ export interface CatHealthHealthRecord {
 }
 
 export interface CatHealthRequest extends CatCatRequestBase {
-  time?: TimeUnit
   ts?: boolean
   h?: CatCatHealthColumns
   s?: Names
@@ -7772,12 +7769,10 @@ export interface CatIndicesIndicesRecord {
 
 export interface CatIndicesRequest extends CatCatRequestBase {
   index?: Indices
-  bytes?: Bytes
   expand_wildcards?: ExpandWildcards
   health?: HealthStatus
   include_unloaded_segments?: boolean
   pri?: boolean
-  time?: TimeUnit
   master_timeout?: Duration
   h?: CatCatIndicesColumns
   s?: Names
@@ -7850,10 +7845,8 @@ export interface CatMlDataFrameAnalyticsDataFrameAnalyticsRecord {
 export interface CatMlDataFrameAnalyticsRequest extends CatCatRequestBase {
   id?: Id
   allow_no_match?: boolean
-  bytes?: Bytes
   h?: CatCatDfaColumns
   s?: CatCatDfaColumns
-  time?: TimeUnit
 }
 
 export type CatMlDataFrameAnalyticsResponse = CatMlDataFrameAnalyticsDataFrameAnalyticsRecord[]
@@ -7898,7 +7891,6 @@ export interface CatMlDatafeedsRequest extends CatCatRequestBase {
   allow_no_match?: boolean
   h?: CatCatDatafeedColumns
   s?: CatCatDatafeedColumns
-  time?: TimeUnit
 }
 
 export type CatMlDatafeedsResponse = CatMlDatafeedsDatafeedsRecord[]
@@ -8083,10 +8075,8 @@ export interface CatMlJobsJobsRecord {
 export interface CatMlJobsRequest extends CatCatRequestBase {
   job_id?: Id
   allow_no_match?: boolean
-  bytes?: Bytes
   h?: CatCatAnomalyDetectorColumns
   s?: CatCatAnomalyDetectorColumns
-  time?: TimeUnit
 }
 
 export type CatMlJobsResponse = CatMlJobsJobsRecord[]
@@ -8094,12 +8084,10 @@ export type CatMlJobsResponse = CatMlJobsJobsRecord[]
 export interface CatMlTrainedModelsRequest extends CatCatRequestBase {
   model_id?: Id
   allow_no_match?: boolean
-  bytes?: Bytes
   h?: CatCatTrainedModelsColumns
   s?: CatCatTrainedModelsColumns
   from?: integer
   size?: integer
-  time?: TimeUnit
 }
 
 export type CatMlTrainedModelsResponse = CatMlTrainedModelsTrainedModelsRecord[]
@@ -8446,13 +8434,11 @@ export interface CatNodesNodesRecord {
 }
 
 export interface CatNodesRequest extends CatCatRequestBase {
-  bytes?: Bytes
   full_id?: boolean | string
   include_unloaded_segments?: boolean
   h?: CatCatNodeColumns
   s?: Names
   master_timeout?: Duration
-  time?: TimeUnit
 }
 
 export type CatNodesResponse = CatNodesNodesRecord[]
@@ -8473,7 +8459,6 @@ export interface CatPendingTasksRequest extends CatCatRequestBase {
   s?: Names
   local?: boolean
   master_timeout?: Duration
-  time?: TimeUnit
 }
 
 export type CatPendingTasksResponse = CatPendingTasksPendingTasksRecord[]
@@ -8563,11 +8548,9 @@ export interface CatRecoveryRecoveryRecord {
 export interface CatRecoveryRequest extends CatCatRequestBase {
   index?: Indices
   active_only?: boolean
-  bytes?: Bytes
   detailed?: boolean
   h?: CatCatRecoveryColumns
   s?: Names
-  time?: TimeUnit
 }
 
 export type CatRecoveryResponse = CatRecoveryRecoveryRecord[]
@@ -8590,7 +8573,6 @@ export type CatRepositoriesResponse = CatRepositoriesRepositoriesRecord[]
 
 export interface CatSegmentsRequest extends CatCatRequestBase {
   index?: Indices
-  bytes?: Bytes
   h?: CatCatSegmentsColumns
   s?: Names
   local?: boolean
@@ -8643,11 +8625,9 @@ export interface CatSegmentsSegmentsRecord {
 
 export interface CatShardsRequest extends CatCatRequestBase {
   index?: Indices
-  bytes?: Bytes
   h?: CatCatShardColumns
   s?: Names
   master_timeout?: Duration
-  time?: TimeUnit
 }
 
 export type CatShardsResponse = CatShardsShardsRecord[]
@@ -8873,7 +8853,6 @@ export interface CatSnapshotsRequest extends CatCatRequestBase {
   h?: CatCatSnapshotsColumns
   s?: Names
   master_timeout?: Duration
-  time?: TimeUnit
 }
 
 export type CatSnapshotsResponse = CatSnapshotsSnapshotsRecord[]
@@ -8919,7 +8898,6 @@ export interface CatTasksRequest extends CatCatRequestBase {
   parent_task_id?: string
   h?: CatCatTasksColumns
   s?: Names
-  time?: TimeUnit
   timeout?: Duration
   wait_for_completion?: boolean
 }
@@ -8989,7 +8967,6 @@ export interface CatThreadPoolRequest extends CatCatRequestBase {
   thread_pool_patterns?: Names
   h?: CatCatThreadPoolColumns
   s?: Names
-  time?: TimeUnit
   local?: boolean
   master_timeout?: Duration
 }
@@ -9045,7 +9022,6 @@ export interface CatTransformsRequest extends CatCatRequestBase {
   from?: integer
   h?: CatCatTransformColumns
   s?: CatCatTransformColumns
-  time?: TimeUnit
   size?: integer
 }
 
@@ -21013,8 +20989,8 @@ export type ShutdownType = 'restart' | 'remove' | 'replace'
 
 export interface ShutdownDeleteNodeRequest extends RequestBase {
   node_id: NodeId
-  master_timeout?: TimeUnit
-  timeout?: TimeUnit
+  master_timeout?: Duration
+  timeout?: Duration
 }
 
 export type ShutdownDeleteNodeResponse = AcknowledgedResponseBase
@@ -21040,7 +21016,7 @@ export interface ShutdownGetNodePluginsStatus {
 
 export interface ShutdownGetNodeRequest extends RequestBase {
   node_id?: NodeIds
-  master_timeout?: TimeUnit
+  master_timeout?: Duration
 }
 
 export interface ShutdownGetNodeResponse {
@@ -21057,8 +21033,8 @@ export type ShutdownGetNodeShutdownType = 'remove' | 'restart'
 
 export interface ShutdownPutNodeRequest extends RequestBase {
   node_id: NodeId
-  master_timeout?: TimeUnit
-  timeout?: TimeUnit
+  master_timeout?: Duration
+  timeout?: Duration
   body?: {
     type: ShutdownType
     reason: string
@@ -23758,5 +23734,7 @@ export interface SpecUtilsCommonCatQueryParameters {
   format?: string
   help?: boolean
   v?: boolean
+  bytes?: Bytes
+  time?: TimeUnit
 }
 
diff --git a/specification/_spec_utils/behaviors.ts b/specification/_spec_utils/behaviors.ts
index 2ca26df4db..d6542e6c41 100644
--- a/specification/_spec_utils/behaviors.ts
+++ b/specification/_spec_utils/behaviors.ts
@@ -17,6 +17,9 @@
  * under the License.
  */
 
+import { Bytes } from '@_types/common'
+import { TimeUnit } from '@_types/Time'
+
 /**
  * In some places in the specification an object consists of the union of a set of known properties
  * and a set of runtime injected properties. Meaning that object should theoretically extend Dictionary but expose
@@ -97,6 +100,21 @@ export interface CommonCatQueryParameters {
    * @server_default false
    */
   v?: boolean
+  /**
+   * Sets the units for columns that contain a byte-size value.
+   * Note that byte-size value units work in terms of powers of 1024. For instance `1kb` means 1024 bytes, not 1000 bytes.
+   * If omitted, byte-size values are rendered with a suffix such as `kb`, `mb`, or `gb`, chosen such that the numeric value of the column is as small as possible whilst still being at least `1.0`.
+   * If given, byte-size values are rendered as an integer with no suffix, representing the value of the column in the chosen unit.
+   * Values that are not an exact multiple of the chosen unit are rounded down.
+   */
+  bytes?: Bytes
+  /**
+   * Sets the units for columns that contain a time duration.
+   * If omitted, time duration values are rendered with a suffix such as `ms`, `s`, `m` or `h`, chosen such that the numeric value of the column is as small as possible whilst still being at least `1.0`.
+   * If given, time duration values are rendered as an integer with no suffix.
+   * Values that are not an exact multiple of the chosen unit are rounded down.
+   */
+  time?: TimeUnit
 }
 
 /**
diff --git a/specification/cat/allocation/CatAllocationRequest.ts b/specification/cat/allocation/CatAllocationRequest.ts
index 0bec053b71..559ab8f238 100644
--- a/specification/cat/allocation/CatAllocationRequest.ts
+++ b/specification/cat/allocation/CatAllocationRequest.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Bytes, Names, NodeIds } from '@_types/common'
+import { Names, NodeIds } from '@_types/common'
 import { Duration } from '@_types/Time'
 import { CatAllocationColumns, CatRequestBase } from '@cat/_types/CatBase'
 
@@ -49,8 +49,6 @@ export interface Request extends CatRequestBase {
     node_id?: NodeIds
   }
   query_parameters: {
-    /** The unit used to display byte values. */
-    bytes?: Bytes
     /**
      * A comma-separated list of columns names to display. It supports simple wildcards.
      */
diff --git a/specification/cat/fielddata/CatFielddataRequest.ts b/specification/cat/fielddata/CatFielddataRequest.ts
index c88438f3a7..5cf2f58b39 100644
--- a/specification/cat/fielddata/CatFielddataRequest.ts
+++ b/specification/cat/fielddata/CatFielddataRequest.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Bytes, Fields, Names } from '@_types/common'
+import { Fields, Names } from '@_types/common'
 import { CatFieldDataColumns, CatRequestBase } from '@cat/_types/CatBase'
 
 /**
@@ -52,8 +52,6 @@ export interface Request extends CatRequestBase {
     fields?: Fields
   }
   query_parameters: {
-    /** The unit used to display byte values. */
-    bytes?: Bytes
     /** Comma-separated list of fields used to limit returned information. */
     fields?: Fields
     /**
diff --git a/specification/cat/health/CatHealthRequest.ts b/specification/cat/health/CatHealthRequest.ts
index 8d5b200b90..e2d25331ee 100644
--- a/specification/cat/health/CatHealthRequest.ts
+++ b/specification/cat/health/CatHealthRequest.ts
@@ -18,7 +18,6 @@
  */
 
 import { Names } from '@_types/common'
-import { TimeUnit } from '@_types/Time'
 import { CatHealthColumns, CatRequestBase } from '@cat/_types/CatBase'
 
 /**
@@ -47,10 +46,6 @@ export interface Request extends CatRequestBase {
     }
   ]
   query_parameters: {
-    /**
-     * The unit used to display time values.
-     */
-    time?: TimeUnit
     /**
      * If true, returns `HH:MM:SS` and Unix epoch timestamps.
      * @server_default true
diff --git a/specification/cat/indices/CatIndicesRequest.ts b/specification/cat/indices/CatIndicesRequest.ts
index 3604be33da..f0f181d1b2 100644
--- a/specification/cat/indices/CatIndicesRequest.ts
+++ b/specification/cat/indices/CatIndicesRequest.ts
@@ -17,14 +17,8 @@
  * under the License.
  */
 
-import {
-  Bytes,
-  ExpandWildcards,
-  HealthStatus,
-  Indices,
-  Names
-} from '@_types/common'
-import { Duration, TimeUnit } from '@_types/Time'
+import { ExpandWildcards, HealthStatus, Indices, Names } from '@_types/common'
+import { Duration } from '@_types/Time'
 import { CatIndicesColumns, CatRequestBase } from '@cat/_types/CatBase'
 
 /**
@@ -70,8 +64,6 @@ export interface Request extends CatRequestBase {
     index?: Indices
   }
   query_parameters: {
-    /** The unit used to display byte values. */
-    bytes?: Bytes
     /**
      * The type of index that wildcard patterns can match.
      */
@@ -88,8 +80,6 @@ export interface Request extends CatRequestBase {
      * @server_default false
      */
     pri?: boolean
-    /** The unit used to display time values. */
-    time?: TimeUnit
     /**
      * Period to wait for a connection to the master node.
      * @server_default 30s
diff --git a/specification/cat/ml_data_frame_analytics/CatDataFrameAnalyticsRequest.ts b/specification/cat/ml_data_frame_analytics/CatDataFrameAnalyticsRequest.ts
index 0493849437..fd2183fa6e 100644
--- a/specification/cat/ml_data_frame_analytics/CatDataFrameAnalyticsRequest.ts
+++ b/specification/cat/ml_data_frame_analytics/CatDataFrameAnalyticsRequest.ts
@@ -17,8 +17,7 @@
  * under the License.
  */
 
-import { Bytes, Id } from '@_types/common'
-import { TimeUnit } from '@_types/Time'
+import { Id } from '@_types/common'
 import { CatDfaColumns, CatRequestBase } from '@cat/_types/CatBase'
 
 /**
@@ -52,7 +51,6 @@ export interface Request extends CatRequestBase {
   }
   query_parameters: {
     allow_no_match?: boolean
-    bytes?: Bytes
     /**
      * Comma-separated list of column names to display.
      * @server_default create_time,id,state,type
@@ -62,9 +60,5 @@ export interface Request extends CatRequestBase {
      * response.
      */
     s?: CatDfaColumns
-    /**
-     * Unit used to display time values.
-     */
-    time?: TimeUnit
   }
 }
diff --git a/specification/cat/ml_datafeeds/CatDatafeedsRequest.ts b/specification/cat/ml_datafeeds/CatDatafeedsRequest.ts
index a52925c415..c7628c2aa8 100644
--- a/specification/cat/ml_datafeeds/CatDatafeedsRequest.ts
+++ b/specification/cat/ml_datafeeds/CatDatafeedsRequest.ts
@@ -18,7 +18,6 @@
  */
 
 import { Id } from '@_types/common'
-import { TimeUnit } from '@_types/Time'
 import { CatDatafeedColumns, CatRequestBase } from '@cat/_types/CatBase'
 
 /**
@@ -77,9 +76,5 @@ export interface Request extends CatRequestBase {
     h?: CatDatafeedColumns
     /** Comma-separated list of column names or column aliases used to sort the response. */
     s?: CatDatafeedColumns
-    /**
-     * The unit used to display time values.
-     */
-    time?: TimeUnit
   }
 }
diff --git a/specification/cat/ml_jobs/CatJobsRequest.ts b/specification/cat/ml_jobs/CatJobsRequest.ts
index e9c0eb1344..34e4d543fc 100644
--- a/specification/cat/ml_jobs/CatJobsRequest.ts
+++ b/specification/cat/ml_jobs/CatJobsRequest.ts
@@ -17,8 +17,7 @@
  * under the License.
  */
 
-import { Bytes, Id } from '@_types/common'
-import { TimeUnit } from '@_types/Time'
+import { Id } from '@_types/common'
 import { CatAnomalyDetectorColumns, CatRequestBase } from '@cat/_types/CatBase'
 
 /**
@@ -70,10 +69,6 @@ export interface Request extends CatRequestBase {
      * @server_default true
      */
     allow_no_match?: boolean
-    /**
-     * The unit used to display byte values.
-     */
-    bytes?: Bytes
     /**
      * Comma-separated list of column names to display.
      * @server_default buckets.count,data.processed_records,forecasts.total,id,model.bytes,model.memory_status,state
@@ -81,9 +76,5 @@ export interface Request extends CatRequestBase {
     h?: CatAnomalyDetectorColumns
     /** Comma-separated list of column names or column aliases used to sort the response. */
     s?: CatAnomalyDetectorColumns
-    /**
-     * The unit used to display time values.
-     */
-    time?: TimeUnit
   }
 }
diff --git a/specification/cat/ml_trained_models/CatTrainedModelsRequest.ts b/specification/cat/ml_trained_models/CatTrainedModelsRequest.ts
index 1d6b2635ea..a91198199e 100644
--- a/specification/cat/ml_trained_models/CatTrainedModelsRequest.ts
+++ b/specification/cat/ml_trained_models/CatTrainedModelsRequest.ts
@@ -17,9 +17,8 @@
  * under the License.
  */
 
-import { Bytes, Id } from '@_types/common'
+import { Id } from '@_types/common'
 import { integer } from '@_types/Numeric'
-import { TimeUnit } from '@_types/Time'
 import { CatRequestBase, CatTrainedModelsColumns } from '@cat/_types/CatBase'
 
 /**
@@ -62,8 +61,6 @@ export interface Request extends CatRequestBase {
      * @server_default true
      */
     allow_no_match?: boolean
-    /** The unit used to display byte values. */
-    bytes?: Bytes
     /** A comma-separated list of column names to display. */
     h?: CatTrainedModelsColumns
     /** A comma-separated list of column names or aliases used to sort the response. */
@@ -72,9 +69,5 @@ export interface Request extends CatRequestBase {
     from?: integer
     /** The maximum number of transforms to display. */
     size?: integer
-    /**
-     * Unit used to display time values.
-     */
-    time?: TimeUnit
   }
 }
diff --git a/specification/cat/nodes/CatNodesRequest.ts b/specification/cat/nodes/CatNodesRequest.ts
index 4118521222..86a1905270 100644
--- a/specification/cat/nodes/CatNodesRequest.ts
+++ b/specification/cat/nodes/CatNodesRequest.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { Bytes, Names } from '@_types/common'
-import { Duration, TimeUnit } from '@_types/Time'
+import { Names } from '@_types/common'
+import { Duration } from '@_types/Time'
 import { CatNodeColumns, CatRequestBase } from '@cat/_types/CatBase'
 
 /**
@@ -40,10 +40,6 @@ export interface Request extends CatRequestBase {
     }
   ]
   query_parameters: {
-    /**
-     * The unit used to display byte values.
-     */
-    bytes?: Bytes
     /**
      * If `true`, return the full node ID. If `false`, return the shortened node ID.
      * @server_default false
@@ -71,9 +67,5 @@ export interface Request extends CatRequestBase {
      * @server_default 30s
      */
     master_timeout?: Duration
-    /**
-     * The unit used to display time values.
-     */
-    time?: TimeUnit
   }
 }
diff --git a/specification/cat/pending_tasks/CatPendingTasksRequest.ts b/specification/cat/pending_tasks/CatPendingTasksRequest.ts
index b49dd64921..80eb0494b7 100644
--- a/specification/cat/pending_tasks/CatPendingTasksRequest.ts
+++ b/specification/cat/pending_tasks/CatPendingTasksRequest.ts
@@ -18,7 +18,7 @@
  */
 
 import { Names } from '@_types/common'
-import { Duration, TimeUnit } from '@_types/Time'
+import { Duration } from '@_types/Time'
 import { CatPendingTasksColumns, CatRequestBase } from '@cat/_types/CatBase'
 
 /**
@@ -63,9 +63,5 @@ export interface Request extends CatRequestBase {
      * @server_default 30s
      */
     master_timeout?: Duration
-    /**
-     * Unit used to display time values.
-     */
-    time?: TimeUnit
   }
 }
diff --git a/specification/cat/recovery/CatRecoveryRequest.ts b/specification/cat/recovery/CatRecoveryRequest.ts
index 6ee0ebb8c5..0ffa203307 100644
--- a/specification/cat/recovery/CatRecoveryRequest.ts
+++ b/specification/cat/recovery/CatRecoveryRequest.ts
@@ -17,8 +17,7 @@
  * under the License.
  */
 
-import { Bytes, Indices, Names } from '@_types/common'
-import { TimeUnit } from '@_types/Time'
+import { Indices, Names } from '@_types/common'
 import { CatRecoveryColumns, CatRequestBase } from '@cat/_types/CatBase'
 
 /**
@@ -59,10 +58,6 @@ export interface Request extends CatRequestBase {
      * @server_default false
      */
     active_only?: boolean
-    /**
-     * The unit used to display byte values.
-     */
-    bytes?: Bytes
     /**
      * If `true`, the response includes detailed information about shard recoveries.
      * @server_default false
@@ -84,9 +79,5 @@ export interface Request extends CatRequestBase {
      * or `:desc` as a suffix to the column name.
      */
     s?: Names
-    /**
-     * The unit used to display time values.
-     */
-    time?: TimeUnit
   }
 }
diff --git a/specification/cat/segments/CatSegmentsRequest.ts b/specification/cat/segments/CatSegmentsRequest.ts
index 9bdb64e5c0..d8d18f0858 100644
--- a/specification/cat/segments/CatSegmentsRequest.ts
+++ b/specification/cat/segments/CatSegmentsRequest.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Bytes, Indices, Names } from '@_types/common'
+import { Indices, Names } from '@_types/common'
 import { Duration } from '@_types/Time'
 import { CatRequestBase, CatSegmentsColumns } from '@cat/_types/CatBase'
 
@@ -54,10 +54,6 @@ export interface Request extends CatRequestBase {
     index?: Indices
   }
   query_parameters: {
-    /**
-     * The unit used to display byte values.
-     */
-    bytes?: Bytes
     /**
      * A comma-separated list of columns names to display.
      * It supports simple wildcards.
diff --git a/specification/cat/shards/CatShardsRequest.ts b/specification/cat/shards/CatShardsRequest.ts
index dd3aa69801..2aef08af36 100644
--- a/specification/cat/shards/CatShardsRequest.ts
+++ b/specification/cat/shards/CatShardsRequest.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { Bytes, Indices, Names } from '@_types/common'
-import { Duration, TimeUnit } from '@_types/Time'
+import { Indices, Names } from '@_types/common'
+import { Duration } from '@_types/Time'
 import { CatRequestBase, CatShardColumns } from '@cat/_types/CatBase'
 
 /**
@@ -54,10 +54,6 @@ export interface Request extends CatRequestBase {
     index?: Indices
   }
   query_parameters: {
-    /**
-     * The unit used to display byte values.
-     */
-    bytes?: Bytes
     /**
      * List of columns to appear in the response. Supports simple wildcards.
      */
@@ -73,9 +69,5 @@ export interface Request extends CatRequestBase {
      * @server_default 30s
      */
     master_timeout?: Duration
-    /**
-     * The unit used to display time values.
-     */
-    time?: TimeUnit
   }
 }
diff --git a/specification/cat/snapshots/CatSnapshotsRequest.ts b/specification/cat/snapshots/CatSnapshotsRequest.ts
index 7d0461353e..28f230f617 100644
--- a/specification/cat/snapshots/CatSnapshotsRequest.ts
+++ b/specification/cat/snapshots/CatSnapshotsRequest.ts
@@ -18,7 +18,7 @@
  */
 
 import { Names } from '@_types/common'
-import { Duration, TimeUnit } from '@_types/Time'
+import { Duration } from '@_types/Time'
 import { CatRequestBase, CatSnapshotsColumns } from '@cat/_types/CatBase'
 
 /**
@@ -76,9 +76,5 @@ export interface Request extends CatRequestBase {
      * @server_default 30s
      */
     master_timeout?: Duration
-    /**
-     * Unit used to display time values.
-     */
-    time?: TimeUnit
   }
 }
diff --git a/specification/cat/tasks/CatTasksRequest.ts b/specification/cat/tasks/CatTasksRequest.ts
index b9ef1df77f..e956aed1d0 100644
--- a/specification/cat/tasks/CatTasksRequest.ts
+++ b/specification/cat/tasks/CatTasksRequest.ts
@@ -18,7 +18,7 @@
  */
 
 import { Names } from '@_types/common'
-import { Duration, TimeUnit } from '@_types/Time'
+import { Duration } from '@_types/Time'
 import { CatRequestBase, CatTasksColumns } from '@cat/_types/CatBase'
 
 /**
@@ -63,10 +63,6 @@ export interface Request extends CatRequestBase {
      * or `:desc` as a suffix to the column name.
      */
     s?: Names
-    /**
-     * Unit used to display time values.
-     */
-    time?: TimeUnit
     /**
      * Period to wait for a response.
      * If no response is received before the timeout expires, the request fails and returns an error.
diff --git a/specification/cat/thread_pool/CatThreadPoolRequest.ts b/specification/cat/thread_pool/CatThreadPoolRequest.ts
index 6acf6b5f3d..f83d447f53 100644
--- a/specification/cat/thread_pool/CatThreadPoolRequest.ts
+++ b/specification/cat/thread_pool/CatThreadPoolRequest.ts
@@ -18,7 +18,7 @@
  */
 
 import { Names } from '@_types/common'
-import { Duration, TimeUnit } from '@_types/Time'
+import { Duration } from '@_types/Time'
 import { CatRequestBase, CatThreadPoolColumns } from '@cat/_types/CatBase'
 
 /**
@@ -62,10 +62,6 @@ export interface Request extends CatRequestBase {
      * or `:desc` as a suffix to the column name.
      */
     s?: Names
-    /**
-     * The unit used to display time values.
-     */
-    time?: TimeUnit
     /**
      * If `true`, the request computes the list of selected nodes from the
      * local cluster state. If `false` the list of selected nodes are computed
diff --git a/specification/cat/transforms/CatTransformsRequest.ts b/specification/cat/transforms/CatTransformsRequest.ts
index f4e9bcbdfb..5d8b01947c 100644
--- a/specification/cat/transforms/CatTransformsRequest.ts
+++ b/specification/cat/transforms/CatTransformsRequest.ts
@@ -19,7 +19,6 @@
 
 import { Id } from '@_types/common'
 import { integer } from '@_types/Numeric'
-import { TimeUnit } from '@_types/Time'
 import { CatRequestBase, CatTransformColumns } from '@cat/_types/CatBase'
 
 /**
@@ -76,10 +75,6 @@ export interface Request extends CatRequestBase {
     /** Comma-separated list of column names or column aliases used to sort the response.
      */
     s?: CatTransformColumns
-    /**
-     * The unit used to display time values.
-     */
-    time?: TimeUnit
     /**
      * The maximum number of transforms to obtain.
      * @server_default 100
diff --git a/specification/shutdown/delete_node/ShutdownDeleteNodeRequest.ts b/specification/shutdown/delete_node/ShutdownDeleteNodeRequest.ts
index 5dbe6477d3..13f07de469 100644
--- a/specification/shutdown/delete_node/ShutdownDeleteNodeRequest.ts
+++ b/specification/shutdown/delete_node/ShutdownDeleteNodeRequest.ts
@@ -19,7 +19,7 @@
 
 import { RequestBase } from '@_types/Base'
 import { NodeId } from '@_types/common'
-import { TimeUnit } from '@_types/Time'
+import { Duration } from '@_types/Time'
 
 /**
  * Cancel node shutdown preparations.
@@ -51,11 +51,11 @@ export interface Request extends RequestBase {
      * Period to wait for a connection to the master node. If no response is received before the timeout expires, the request fails and returns an error.
      * @server_default 30s
      */
-    master_timeout?: TimeUnit
+    master_timeout?: Duration
     /**
      * Period to wait for a response. If no response is received before the timeout expires, the request fails and returns an error.
      * @server_default 30s
      */
-    timeout?: TimeUnit
+    timeout?: Duration
   }
 }
diff --git a/specification/shutdown/get_node/ShutdownGetNodeRequest.ts b/specification/shutdown/get_node/ShutdownGetNodeRequest.ts
index b4d8fda4b3..9c19f823c4 100644
--- a/specification/shutdown/get_node/ShutdownGetNodeRequest.ts
+++ b/specification/shutdown/get_node/ShutdownGetNodeRequest.ts
@@ -19,7 +19,7 @@
 
 import { RequestBase } from '@_types/Base'
 import { NodeIds } from '@_types/common'
-import { TimeUnit } from '@_types/Time'
+import { Duration } from '@_types/Time'
 
 /**
  * Get the shutdown status.
@@ -54,6 +54,6 @@ export interface Request extends RequestBase {
      * Period to wait for a connection to the master node. If no response is received before the timeout expires, the request fails and returns an error.
      * @server_default 30s
      */
-    master_timeout?: TimeUnit
+    master_timeout?: Duration
   }
 }
diff --git a/specification/shutdown/put_node/ShutdownPutNodeRequest.ts b/specification/shutdown/put_node/ShutdownPutNodeRequest.ts
index d8641e37b0..501755ccfb 100644
--- a/specification/shutdown/put_node/ShutdownPutNodeRequest.ts
+++ b/specification/shutdown/put_node/ShutdownPutNodeRequest.ts
@@ -19,7 +19,7 @@
 
 import { RequestBase } from '@_types/Base'
 import { NodeId } from '@_types/common'
-import { TimeUnit } from '@_types/Time'
+import { Duration } from '@_types/Time'
 import { Type } from '../_types/types'
 
 /**
@@ -66,13 +66,13 @@ export interface Request extends RequestBase {
      * If no response is received before the timeout expires, the request fails and returns an error.
      * @server_default 30s
      */
-    master_timeout?: TimeUnit
+    master_timeout?: Duration
     /**
      * The period to wait for a response.
      * If no response is received before the timeout expires, the request fails and returns an error.
      * @server_default 30s
      */
-    timeout?: TimeUnit
+    timeout?: Duration
   }
   body: {
     /**